[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Use contents instead of args for brace commands i
From: |
Patrice Dumas |
Subject: |
branch master updated: Use contents instead of args for brace commands in Texinfo tree |
Date: |
Tue, 24 Dec 2024 09:33:44 -0500 |
This is an automated email from the git hooks/post-receive script.
pertusus pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new 6ad7393ed2 Use contents instead of args for brace commands in Texinfo
tree
6ad7393ed2 is described below
commit 6ad7393ed21dc4ce27d9c97e0bc80a65d7a5c2a6
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Nov 11 11:46:13 2024 +0100
Use contents instead of args for brace commands in Texinfo tree
* tp/Texinfo/ParserNonXS.pm (_handle_comma): rename $brace_command as
$command_element.
* tp/Texinfo/Common.pm (get_label_element), tp/Texinfo/ParserNonXS.pm
(_end_line_starting_block, _new_value_element, _handle_open_brace)
(_handle_close_brace, _handle_comma, _process_remaining_on_line),
tp/Texinfo/Translations.pm (_substitute_element_array),
tp/Texinfo/XS/main/build_perl_info.c (element_to_perl_hash),
tp/Texinfo/XS/main/translations.c (substitute_element_array),
tp/Texinfo/XS/main/utils.c (get_label_element),
tp/Texinfo/XS/parsetexi/end_line.c (end_line_starting_block),
tp/Texinfo/XS/parsetexi/parser.c (new_value_element)
(process_remaining_on_line), tp/Texinfo/XS/parsetexi/separator.c
(handle_open_brace, handle_close_brace, handle_comma): use contents
instead of args for brace command arguments in Texinfo tree.
* tp/Texinfo/Structuring.pm (check_nodes_are_referenced),
tp/Texinfo/Transformations.pm (fill_gaps_in_sectioning)
(_reference_to_arg, _protect_hashchar_at_line_beginning),
tp/Texinfo/ManipulateTree.pm (_new_asis_command_with_text)
(_protect_text, protect_first_parenthesis),
tp/Texinfo/XS/main/manipulate_tree.c (new_asis_command_with_text)
(protect_text), tp/Texinfo/XS/structuring_transfo/structuring.c
(check_nodes_are_referenced, associate_internal_references),
tp/Texinfo/XS/structuring_transfo/transformations.c
(protect_first_parenthesis, fill_gaps_in_sectioning)
(reference_to_arg_internal)
(protect_hashchar_at_line_beginning_internal): update structuring and
transformations for change of args to contents for brace commands.
* tp/Texinfo/Convert/Converter.pm (table_item_content_tree),
tp/Texinfo/Convert/DocBook.pm (conversion_output_begin, _index_entry)
(_convert), tp/Texinfo/Convert/HTML.pm (_internal_command_tree)
(_convert_explained_command, _convert_listoffloats_command)
(_convert_float_command, _convert_xref_commands)
(_convert_printindex_command, _default_format_single_footnote)
(_prepare_converted_output_info, _convert), tp/Texinfo/Convert/Info.pm
(format_ref, format_image), tp/Texinfo/Convert/LaTeX.pm (_title)
(_begin_document, _index_entry, _convert),
tp/Texinfo/Convert/NodeNameNormalization.pm (_convert),
tp/Texinfo/Convert/Plaintext.pm (%ignored_commands, process_footnotes)
(process_printindex, format_ref, image_formatted_text, format_image)
(_convert), tp/Texinfo/Convert/Texinfo.pm (_convert_to_texinfo)
(_expand_cmd_args_to_texi), tp/Texinfo/Convert/TexinfoMarkup.pm
(_convert), tp/Texinfo/Convert/Text.pm (_convert),
tp/Texinfo/Convert/Utils.pm (definition_category_tree)
(find_innermost_accent_contents), tp/Texinfo/Indices.pm
(_idx_leading_text_or_command), tp/Texinfo/ManipulateTree.pm
(_new_asis_command_with_text, _protect_text)
(protect_first_parenthesis), tp/Texinfo/XS/convert/convert_html.c
(html_prepare_converted_output_info, html_convert_tree_append)
(html_node_redirections), tp/Texinfo/XS/convert/converter.c
(table_item_content_tree), tp/Texinfo/XS/convert/format_html.c
(html_internal_command_tree, html_default_format_single_footnote)
(html_convert_explained_command, html_convert_xref_command)
(html_convert_float_command, html_convert_listoffloats_command)
(html_convert_printindex_command),
tp/Texinfo/XS/main/convert_to_texinfo.c (expand_cmd_args_to_texi)
(convert_to_texinfo_internal), tp/Texinfo/XS/main/convert_to_text.c
(convert_to_text_internal), tp/Texinfo/XS/main/convert_utils.c
(find_innermost_accent_contents),
tp/Texinfo/XS/main/manipulate_indices.c (idx_leading_text_or_command),
tp/Texinfo/XS/main/node_name_normalization.c
(convert_to_normalized_internal), tp/ext/latex2html.pm (l2h_process),
tp/ext/tex4ht.pm (tex4ht_prepare): update conversion for change of
args to contents for brace commands. call get_label_element more.
* tp/Texinfo/Convert/DocBook.pm (_convert),
tp/Texinfo/Convert/LaTeX.pm (_convert),
tp/Texinfo/XS/main/convert_to_text.c (convert_to_text_internal),
tp/Texinfo/XS/main/node_name_normalization.c
(convert_to_normalized_internal): return right after formatting brace
commands.
* tp/init/documentation_examples.pm
(my_test_documentation_convert_xref_commands), tp/t/01use.t,
tp/t/init/footnote_mark_in_inline_content.pm
(_texi2any_test_format_single_footnote_in_inline_content): update
tests init files and manually written tree.
* tp/t/09indices.t: change code order.
---
ChangeLog | 86 +
tp/Texinfo/Common.pm | 5 +-
tp/Texinfo/Convert/Converter.pm | 2 +-
tp/Texinfo/Convert/DocBook.pm | 114 +-
tp/Texinfo/Convert/HTML.pm | 64 +-
tp/Texinfo/Convert/Info.pm | 26 +-
tp/Texinfo/Convert/LaTeX.pm | 181 +-
tp/Texinfo/Convert/NodeNameNormalization.pm | 18 +-
tp/Texinfo/Convert/Plaintext.pm | 147 +-
tp/Texinfo/Convert/Texinfo.pm | 46 +-
tp/Texinfo/Convert/TexinfoMarkup.pm | 56 +-
tp/Texinfo/Convert/TexinfoXML.pm | 3 +
tp/Texinfo/Convert/Text.pm | 52 +-
tp/Texinfo/Convert/Utils.pm | 6 +-
tp/Texinfo/Indices.pm | 5 +-
tp/Texinfo/ManipulateTree.pm | 14 +-
tp/Texinfo/ParserNonXS.pm | 68 +-
tp/Texinfo/Structuring.pm | 8 +-
tp/Texinfo/Transformations.pm | 12 +-
tp/Texinfo/Translations.pm | 2 +-
tp/Texinfo/XS/convert/convert_html.c | 52 +-
tp/Texinfo/XS/convert/converter.c | 2 +-
tp/Texinfo/XS/convert/format_html.c | 45 +-
tp/Texinfo/XS/main/build_perl_info.c | 2 +-
tp/Texinfo/XS/main/convert_to_texinfo.c | 56 +-
tp/Texinfo/XS/main/convert_to_text.c | 44 +-
tp/Texinfo/XS/main/convert_utils.c | 6 +-
tp/Texinfo/XS/main/manipulate_indices.c | 4 +-
tp/Texinfo/XS/main/manipulate_tree.c | 6 +-
tp/Texinfo/XS/main/node_name_normalization.c | 19 +-
tp/Texinfo/XS/main/translations.c | 2 +-
tp/Texinfo/XS/main/utils.c | 5 +-
tp/Texinfo/XS/parsetexi/end_line.c | 2 +-
tp/Texinfo/XS/parsetexi/parser.c | 4 +-
tp/Texinfo/XS/parsetexi/separator.c | 114 +-
tp/Texinfo/XS/structuring_transfo/structuring.c | 15 +-
.../XS/structuring_transfo/transformations.c | 12 +-
tp/ext/latex2html.pm | 2 +-
tp/ext/tex4ht.pm | 2 +-
tp/init/documentation_examples.pm | 2 +-
tp/t/01use.t | 4 +-
tp/t/09indices.t | 2 +-
tp/t/init/footnote_mark_in_inline_content.pm | 2 +-
tp/t/results/alias/alias_of_definfoenclose.pl | 4 +-
...lias_of_definfoenclose_before_definfoenclose.pl | 4 +-
tp/t/results/alias/alias_zero.pl | 4 +-
tp/t/results/alias/bad_line.pl | 4 +-
tp/t/results/alias/recursive_alias.pl | 4 +-
tp/t/results/alias/simple.pl | 8 +-
tp/t/results/alias/texinfo_command_alias.pl | 4 +-
.../alias/texinfo_command_alias_indirect_before.pl | 4 +-
tp/t/results/columnfractions/wrong_command.pl | 4 +-
tp/t/results/conditionals/empty_set_in_ifset.pl | 6 +-
tp/t/results/conditionals/end_ifset_in_format.pl | 4 +-
tp/t/results/conditionals/ifset_in_command.pl | 4 +-
.../conditionals/inlinefmtifelse_nesting.pl | 8 +-
.../conditionals/inlineiffmtifelse_not_closed.pl | 4 +-
.../inlineiffmtifelse_not_closed_three_arg.pl | 4 +-
.../inlineiffmtifelse_not_closed_two_arg.pl | 4 +-
.../conditionals/inlineifset_false_not_closed.pl | 4 +-
tp/t/results/conditionals/value_on_ifset.pl | 6 +-
tp/t/results/converters_tests/accent_with_text.pl | 28 +-
.../results/converters_tests/at_commands_in_raw.pl | 42 +-
tp/t/results/converters_tests/combined_fonts.pl | 180 +-
tp/t/results/converters_tests/commands_in_sc.pl | 92 +-
.../commands_in_settitle_with_title.pl | 52 +-
tp/t/results/converters_tests/commands_in_var.pl | 92 +-
tp/t/results/converters_tests/complex_nestings.pl | 8 +-
.../conversion_with_undef_customization.pl | 16 +-
.../converters_tests/definition_commands.pl | 1474 ++++++------
tp/t/results/converters_tests/empty_accent.pl | 4 +-
.../results/converters_tests/footnote_no_number.pl | 8 +-
.../footnote_no_number_separate.pl | 8 +-
tp/t/results/converters_tests/form_feeds.pl | 46 +-
.../converters_tests/frenchspacing_and_code.pl | 40 +-
tp/t/results/converters_tests/image_extension.pl | 4 +-
tp/t/results/converters_tests/image_formatting.pl | 176 +-
tp/t/results/converters_tests/image_with_spaces.pl | Bin 4149 -> 4157 bytes
tp/t/results/converters_tests/inline.pl | 60 +-
tp/t/results/converters_tests/inline_expand_tex.pl | 56 +-
tp/t/results/converters_tests/inlinefmtifelse.pl | 40 +-
.../inlinefmtifelse_with_commands.pl | 48 +-
tp/t/results/converters_tests/inlinefmtspaces.pl | 16 +-
.../results/converters_tests/inlineifsetifclear.pl | 16 +-
.../converters_tests/inlineifsetifclearspaces.pl | 16 +-
tp/t/results/converters_tests/inlinerawspaces.pl | 16 +-
tp/t/results/converters_tests/link.pl | 36 +-
.../converters_tests/multitable_prototypes.pl | 12 +-
.../converters_tests/normal_font_in_monospace.pl | 20 +-
.../results/converters_tests/raw_block_commands.pl | 8 +-
.../raw_block_commands_expand_tex.pl | 8 +-
.../converters_tests/ref_error_formatting.pl | 334 +--
tp/t/results/converters_tests/ref_in_sectioning.pl | 124 +-
.../reference_for_formatting_customizations.pl | 12 +-
.../references_to_top_no_top_output.pl | 72 +-
tp/t/results/converters_tests/refs_formatting.pl | 348 +--
.../some_at_commands_in_ref_nodes.pl | 300 +--
.../converters_tests/spaces_in_empty_node_names.pl | 40 +-
.../converters_tests/spaces_in_node_names.pl | 46 +-
.../test_formatting_customizations.pl | 12 +-
.../converters_tests/things_before_setfilename.pl | 52 +-
.../things_before_setfilename_no_element.pl | 52 +-
tp/t/results/converters_tests/top_in_ref.pl | 348 +--
tp/t/results/converters_tests/unknown_value.pl | 6 +-
.../various_itemize_command_as_argument.pl | 4 +-
.../various_vtable_command_as_argument.pl | 4 +-
tp/t/results/coverage/accent_and_dash.pl | 4 +-
tp/t/results/coverage/accent_no_closed.pl | 4 +-
tp/t/results/coverage/accent_no_closed_comment.pl | 4 +-
tp/t/results/coverage/accent_no_closed_newline.pl | 4 +-
.../results/coverage/accent_no_closed_paragraph.pl | 4 +-
tp/t/results/coverage/accents_errors.pl | 16 +-
.../coverage/arg_in_brace_no_arg_command.pl | 4 +-
tp/t/results/coverage/block_commands.pl | 4 +-
tp/t/results/coverage/cartouche.pl | 4 +-
.../coverage/cartouche_title_and_content.pl | 4 +-
tp/t/results/coverage/center.pl | 4 +-
tp/t/results/coverage/command_in_end.pl | 28 +-
.../command_in_end_expanded_raw_command_after.pl | 4 +-
...mand_in_end_expanded_raw_command_empty_after.pl | 4 +-
.../command_in_end_expanded_raw_in_command.pl | 4 +-
..._in_end_expanded_raw_one_char_before_command.pl | 4 +-
..._in_end_expanded_raw_one_char_not_in_command.pl | 4 +-
..._in_end_expanded_raw_two_char_before_command.pl | 4 +-
..._in_end_expanded_raw_two_char_not_in_command.pl | 4 +-
.../command_in_end_ignored_raw_command_after.pl | 4 +-
tp/t/results/coverage/commands.pl | 52 +-
tp/t/results/coverage/commands_in_math.pl | 356 +--
tp/t/results/coverage/comment_on_cartouche_line.pl | 4 +-
tp/t/results/coverage/def.pl | 40 +-
tp/t/results/coverage/displaymath.pl | 16 +-
tp/t/results/coverage/empty_w.pl | 8 +-
.../end_bad_end_argument_and_superfluous_arg.pl | 4 +-
tp/t/results/coverage/exdent_and_formats.pl | 4 +-
tp/t/results/coverage/hyphenation.pl | 4 +-
tp/t/results/coverage/indicateurl_end_lines.pl | 8 +-
tp/t/results/coverage/invalid_U.pl | 36 +-
.../results/coverage/lettered_accent_and_spaces.pl | 32 +-
tp/t/results/coverage/math.pl | 36 +-
tp/t/results/coverage/not_i_j_in_dotless.pl | 12 +-
.../coverage/punctuation_in_line_commands.pl | 12 +-
tp/t/results/coverage/quotation_author.pl | 4 +-
.../coverage/spaces_after_braced_command.pl | 16 +-
tp/t/results/coverage/test_errormsg.pl | 16 +-
tp/t/results/coverage/test_tie.pl | 4 +-
tp/t/results/coverage/test_today.pl | 4 +-
tp/t/results/coverage/titlefont_in_center.pl | 4 +-
tp/t/results/coverage/unknown_accents.pl | 100 +-
tp/t/results/coverage_braces/abbr_acronym.pl | 56 +-
tp/t/results/coverage_braces/anchor_not_closed.pl | 4 +-
.../coverage_braces/brace_opened_no_command.pl | 4 +-
tp/t/results/coverage_braces/caption_not_closed.pl | 4 +-
tp/t/results/coverage_braces/code_not_closed.pl | 4 +-
tp/t/results/coverage_braces/command_in_U.pl | 8 +-
tp/t/results/coverage_braces/command_in_dotless.pl | 8 +-
.../coverage_braces/contain_plain_text_nestings.pl | 72 +-
.../definfoenclose_texinfo_commands.pl | 12 +-
.../results/coverage_braces/email_possibilities.pl | 12 +-
tp/t/results/coverage_braces/empty_commands.pl | 36 +-
tp/t/results/coverage_braces/empty_images.pl | 16 +-
.../coverage_braces/empty_line_in_anchor.pl | 4 +-
.../empty_line_in_braces_in_math.pl | 4 +-
.../empty_line_in_braces_in_math_at_begin_line.pl | 4 +-
.../results/coverage_braces/empty_line_in_email.pl | 4 +-
tp/t/results/coverage_braces/empty_line_in_math.pl | 4 +-
tp/t/results/coverage_braces/empty_ref.pl | 16 +-
.../coverage_braces/empty_second_email_argument.pl | 4 +-
tp/t/results/coverage_braces/end_line_in_anchor.pl | 4 +-
tp/t/results/coverage_braces/footnote.pl | 8 +-
.../footnote_ending_on_empty_line.pl | 4 +-
.../footnote_ending_on_empty_line_spaces.pl | 4 +-
.../footnote_in_command_not_closed.pl | 8 +-
tp/t/results/coverage_braces/footnote_no_node.pl | 4 +-
.../results/coverage_braces/footnote_not_closed.pl | 4 +-
.../format_on_first_footnote_line.pl | 8 +-
.../results/coverage_braces/heading_in_footnote.pl | 4 +-
.../coverage_braces/inforef_too_much_args.pl | 6 +-
tp/t/results/coverage_braces/kbd.pl | 28 +-
.../math_bracketed_inside_not_closed.pl | 4 +-
.../coverage_braces/math_bracketed_not_closed.pl | 4 +-
.../math_bracketed_not_closed_next_line.pl | 4 +-
.../math_leading_trailing_spaces.pl | 4 +-
tp/t/results/coverage_braces/math_not_closed.pl | 4 +-
tp/t/results/coverage_braces/nested.pl | 8 +-
tp/t/results/coverage_braces/nested_args.pl | 26 +-
tp/t/results/coverage_braces/nested_in_sc.pl | 40 +-
.../coverage_braces/no_brace_space_end_line.pl | 4 +-
.../one_argument_leading_trailing_spaces.pl | 60 +-
tp/t/results/coverage_braces/recursive_acronym.pl | 8 +-
.../recursive_acronym_definition.pl | 12 +-
tp/t/results/coverage_braces/ref_empty_node.pl | 16 +-
.../coverage_braces/ref_in_style_command.pl | 12 +-
tp/t/results/coverage_braces/simple.pl | 4 +-
.../coverage_braces/space_command_in_image.pl | 8 +-
tp/t/results/coverage_braces/space_in_anchor.pl | 4 +-
tp/t/results/coverage_braces/space_in_footnote.pl | 4 +-
tp/t/results/coverage_braces/space_in_image.pl | 8 +-
tp/t/results/coverage_braces/test_image.pl | 204 +-
tp/t/results/coverage_braces/test_w.pl | 76 +-
tp/t/results/coverage_braces/too_much_args.pl | 4 +-
.../coverage_braces/two_footnotes_in_nodes.pl | 16 +-
.../two_footnotes_in_nodes_separate.pl | 16 +-
.../two_footnotes_in_nodes_separate_no_header.pl | 16 +-
tp/t/results/coverage_braces/unmatched_brace.pl | 8 +-
tp/t/results/coverage_braces/uref_in_ref.pl | 24 +-
tp/t/results/coverage_braces/uref_url.pl | 36 +-
.../uref_with_commands_characters.pl | 16 +-
tp/t/results/coverage_braces/verb_in_xref.pl | 14 +-
tp/t/results/coverage_braces/w_end_sentence.pl | 4 +-
tp/t/results/def/all_commands_delimiters.pl | 830 +++----
.../def/all_commands_delimiters_printindex.pl | 830 +++----
tp/t/results/def/ampchar.pl | 8 +-
tp/t/results/def/code_in_def.pl | 8 +-
tp/t/results/def/def_defx_mismatch.pl | 8 +-
tp/t/results/def/def_groupings_args.pl | 32 +-
tp/t/results/def/deftypeline.pl | 12 +-
tp/t/results/def/defx_after_comment.pl | 10 +-
tp/t/results/def/defx_after_comment_in_example.pl | 10 +-
tp/t/results/def/defx_after_empty_line.pl | 10 +-
.../def/defx_after_empty_line_in_example.pl | 10 +-
tp/t/results/def/defx_after_paragraph_end.pl | 10 +-
.../def/defx_after_preformatted_with_text.pl | 10 +-
tp/t/results/def/defx_after_text.pl | 10 +-
tp/t/results/def/defx_in_example.pl | 10 +-
tp/t/results/def/empty_def_arguments.pl | 18 +-
tp/t/results/def/empty_deftypeop_name.pl | 12 +-
.../def/end_of_lines_protected_in_footnote.pl | 4 +-
tp/t/results/def/inter_item_commands_in_def.pl | 30 +-
.../def/inter_item_commands_in_def_in_example.pl | 30 +-
tp/t/results/def/ref_in_def.pl | 80 +-
tp/t/results/def/text_block_before_defline.pl | 4 +-
.../docbook_tests/between_node_and_section.pl | 4 +-
tp/t/results/float/anchor_in_caption.pl | 8 +-
tp/t/results/float/cindex_in_caption.pl | 6 +-
tp/t/results/float/complex_float.pl | 240 +-
tp/t/results/float/empty_caption.pl | 16 +-
.../float/empty_listoffloats_with_floats.pl | 8 +-
tp/t/results/float/float_copying.pl | 22 +-
tp/t/results/float/float_in_block_commands.pl | 12 +-
tp/t/results/float/float_type_with_tieaccent.pl | 32 +-
tp/t/results/float/float_with_at_commands.pl | 36 +-
tp/t/results/float/footnote_in_caption.pl | 8 +-
.../results/float/footnote_in_caption_and_error.pl | 8 +-
tp/t/results/float/listoffloats_with_commands.pl | 8 +-
.../float/numbering_captions_listoffloats.pl | 218 +-
tp/t/results/float/ref_to_float.pl | 12 +-
tp/t/results/float/simple.pl | 4 +-
.../float/special_characters_in_float_type.pl | 20 +-
tp/t/results/formats_encodings/accent.pl | 296 +--
.../formats_encodings/accent_argument_non_ascii.pl | 8 +-
.../formats_encodings/accent_enable_encoding.pl | 296 +--
tp/t/results/formats_encodings/accentenc.pl | 296 +--
.../formats_encodings/accentenc_enable_encoding.pl | 296 +--
.../formats_encodings/at_commands_in_refs.pl | 2528 ++++++++++----------
.../at_commands_in_refs_latin1.pl | 2528 ++++++++++----------
.../formats_encodings/at_commands_in_refs_utf8.pl | 2528 ++++++++++----------
.../char_latin1_latin1_in_refs.pl | 30 +-
.../char_latin2_latin2_in_refs.pl | 6 +-
.../char_us_ascii_latin1_in_refs.pl | 30 +-
.../formats_encodings/char_utf8_latin1_in_refs.pl | 30 +-
.../documentencoding_utf8_and_insertions.pl | 16 +-
.../dotless_argument_non_ascii.pl | 8 +-
.../formats_encodings/japanese_shift_jis.pl | 12 +-
.../manual_simple_latin1_with_error.pl | 6 +-
.../manual_simple_utf8_with_error.pl | 6 +-
.../multiple_include_encodings.pl | 6 +-
.../no_documentencoding_and_insertions.pl | 16 +-
.../formats_encodings/verb_delimiter_not_ascii.pl | 4 +-
tp/t/results/formats_encodings/weird_accents.pl | 56 +-
.../weird_accents_disable_encoding.pl | 56 +-
tp/t/results/heading/heading_in_copying.pl | 8 +-
tp/t/results/heading/heading_in_example.pl | 4 +-
tp/t/results/heading/heading_in_quotation.pl | 4 +-
tp/t/results/html_tests/U_in_index.pl | 12 +-
.../html_tests/acronym_in_node_and_section.pl | 16 +-
tp/t/results/html_tests/anchor_on_vtable_item.pl | 14 +-
.../html_tests/base_for_css_info_in_init_test.pl | 16 +-
tp/t/results/html_tests/check_htmlxref.pl | 20 +-
.../html_tests/check_htmlxref_ignore_ref_top_up.pl | 20 +-
tp/t/results/html_tests/check_htmlxref_menu.pl | 20 +-
.../html_tests/check_htmlxref_no_use_nodes.pl | 20 +-
.../html_tests/command_in_node_redirection.pl | 8 +-
.../command_in_node_redirection_multiple.pl | 36 +-
.../command_in_node_redirection_other_command.pl | 12 +-
.../command_in_node_redirection_same_command.pl | 12 +-
.../command_in_node_redirection_two_commands.pl | 16 +-
tp/t/results/html_tests/commands_in_abbr.pl | 16 +-
tp/t/results/html_tests/commands_in_alt.pl | 16 +-
tp/t/results/html_tests/commands_in_email.pl | 12 +-
.../html_tests/css_in_node_redirection_page.pl | 8 +-
tp/t/results/html_tests/documentdescription.pl | 36 +-
...sive_self_section_reference_node_no_use_node.pl | 12 +-
tp/t/results/html_tests/empty_titlefont.pl | 4 +-
tp/t/results/html_tests/end_of_line_in_uref.pl | 4 +-
.../file_name_case_insensitive_conflict_node.pl | 16 +-
...se_insensitive_conflict_node_no_redirections.pl | 16 +-
..._name_case_insensitive_conflict_redirections.pl | 28 +-
.../html_tests/file_name_conflict_with_Top.pl | 4 +-
.../html_tests/file_name_conflict_with_section.pl | 4 +-
.../file_name_conflict_with_user_defined.pl | 4 +-
.../html_tests/filenameconflictwithnonsplit.pl | 4 +-
.../filenameconflictwithspecialelement.pl | 8 +-
tp/t/results/html_tests/float_copying.pl | 46 +-
...otnotestyle_separate_html_text_no_monolithic.pl | 4 +-
.../html_tests/footnotestyle_separate_late.pl | 8 +-
tp/t/results/html_tests/fractions_rounding.pl | 16 +-
.../html_tests/headings_after_lone_nodes.pl | 4 +-
tp/t/results/html_tests/image_link_prefix.pl | 4 +-
tp/t/results/html_tests/inline_in_node.pl | 24 +-
tp/t/results/html_tests/itemize_arguments.pl | 388 +--
.../itemize_arguments_enable_encoding.pl | 388 +--
tp/t/results/html_tests/itemize_tieaccent.pl | 88 +-
tp/t/results/html_tests/letter_command_in_index.pl | 12 +-
tp/t/results/html_tests/mathjax_with_texinfo.pl | 32 +-
.../mathjax_with_texinfo_enable_encoding.pl | 32 +-
.../html_tests/mathjax_with_texinfo_html_file.pl | 32 +-
.../html_tests/mathjax_with_texinfo_html_text.pl | 32 +-
.../mathjax_with_texinfo_no_convert_to_latex.pl | 32 +-
tp/t/results/html_tests/no_use_iso.pl | 4 +-
tp/t/results/html_tests/node_footnote_end.pl | 64 +-
tp/t/results/html_tests/node_footnote_separated.pl | 64 +-
tp/t/results/html_tests/node_footnote_use_node.pl | 64 +-
.../html_tests/node_footnote_use_node_separate.pl | 64 +-
.../html_tests/nodedescription_description.pl | 16 +-
.../nodedescription_description_no_use_nodes.pl | 16 +-
tp/t/results/html_tests/redirection_same_labels.pl | 32 +-
tp/t/results/html_tests/ref_in_preformatted.pl | 8 +-
.../html_tests/sectioning_check_menu_structure.pl | 12 +-
tp/t/results/html_tests/shorttitlepage.pl | 16 +-
.../html_tests/spaces_in_line_break_in_verb_w.pl | 8 +-
tp/t/results/html_tests/test_accents_sc_default.pl | 200 +-
.../html_tests/test_accents_sc_default_latin1.pl | 200 +-
.../html_tests/test_accents_sc_default_usascii.pl | 204 +-
.../html_tests/test_accents_sc_enable_encoding.pl | 200 +-
.../test_accents_sc_enable_encoding_latin1.pl | 200 +-
...st_accents_sc_enable_encoding_to_utf8_latin1.pl | 200 +-
...t_accents_sc_enable_encoding_to_utf8_usascii.pl | 204 +-
.../test_accents_sc_enable_encoding_usascii.pl | 204 +-
.../html_tests/test_accents_sc_to_utf8_latin1.pl | 200 +-
.../test_accents_sc_use_numeric_entity.pl | 200 +-
.../html_tests/test_xrefautomaticsectiontitle.pl | 12 +-
.../test_xrefautomaticsectiontitle_off_first.pl | 12 +-
.../tex_expanded_in_caption_multiple_time.pl | 4 +-
tp/t/results/html_tests/text_css_info_in_init.pl | 16 +-
tp/t/results/html_tests/titles.pl | 16 +-
.../html_tests/transliterated_names_conflicts.pl | 4 +-
tp/t/results/html_tests/uref_accented_letter.pl | 12 +-
.../html_tests/uref_accented_letter_ascii.pl | 12 +-
.../html_tests/uref_accented_letter_latin1.pl | 12 +-
tp/t/results/html_tests/utf8_default.pl | 4 +-
tp/t/results/html_tests/utf8_enable_encoding.pl | 4 +-
.../html_tests/utf8_enable_encoding_no_use_iso.pl | 4 +-
.../utf8_enable_encoding_use_numeric_entity.pl | 4 +-
tp/t/results/html_tests/utf8_use_numeric_entity.pl | 4 +-
tp/t/results/html_tests/xml_protected_in_verb.pl | 4 +-
tp/t/results/htmlxref/htmlxref.pl | 102 +-
.../htmlxref/htmlxref_no_urlprefix_first.pl | 8 +-
tp/t/results/htmlxref/htmlxref_nodes.pl | 102 +-
tp/t/results/htmlxref/htmlxref_only_mono.pl | 102 +-
tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl | 102 +-
tp/t/results/htmlxref/htmlxref_only_split.pl | 102 +-
tp/t/results/htmlxref/htmlxref_only_split_nodes.pl | 102 +-
tp/t/results/include/cpp_lines.pl | 60 +-
tp/t/results/include/value_expansion_in_include.pl | 48 +-
tp/t/results/indices/def_syn_indices.pl | 16 +-
tp/t/results/indices/double_seeentry_seealso.pl | 32 +-
tp/t/results/indices/empty_string_index_entry.pl | 28 +-
tp/t/results/indices/encoding_index_ascii.pl | 124 +-
.../encoding_index_ascii_enable_encoding.pl | 124 +-
tp/t/results/indices/encoding_index_latin1.pl | 108 +-
.../encoding_index_latin1_enable_encoding.pl | 108 +-
tp/t/results/indices/encoding_index_utf8.pl | 108 +-
.../indices/encoding_index_utf8_enable_encoding.pl | 108 +-
.../indices/encoding_index_utf8_no_use_unicode.pl | 108 +-
tp/t/results/indices/explicit_sort_key.pl | 48 +-
tp/t/results/indices/ftable_vtable.pl | 4 +-
.../indices/ignored_sort_char_empty_entries.pl | 4 +-
tp/t/results/indices/image_lines_count.pl | Bin 5648 -> 5652 bytes
tp/t/results/indices/image_text_lines_count.pl | Bin 6051 -> 6055 bytes
tp/t/results/indices/index_entry_in_footnote.pl | Bin 7020 -> 7028 bytes
.../index_entry_in_footnote_different_node_end.pl | 8 +-
.../indices/index_entry_in_footnote_sections.pl | 6 +-
.../index_entry_in_footnote_sections_separate.pl | 6 +-
.../indices/index_entry_in_footnote_separate.pl | 8 +-
tp/t/results/indices/index_special_region.pl | 48 +-
.../index_special_region_no_insertcopying.pl | 48 +-
...egion_no_insertcopying_no_titlepage_no_nodes.pl | 48 +-
...l_region_no_insertcopying_titlepage_no_nodes.pl | 48 +-
...copying_titlepage_no_nodes_footnotes_default.pl | 48 +-
.../index_special_region_no_titlepage_no_nodes.pl | 48 +-
.../index_special_region_titlepage_no_nodes.pl | 48 +-
..._region_titlepage_no_nodes_footnotes_default.pl | 48 +-
.../multiple_index_text_sortas_seeentry_seealso.pl | 20 +-
...rintindex_index_entry_in_copying_in_footnote.pl | 4 +-
.../indices/same_index_entry_merged_indices.pl | 4 +-
tp/t/results/indices/same_only_seealso_seeentry.pl | 24 +-
tp/t/results/indices/same_seealso_seeentry.pl | 24 +-
tp/t/results/indices/seealso_duplicate.pl | 24 +-
tp/t/results/indices/seeentry.pl | 16 +-
tp/t/results/indices/sorted_subentries.pl | 20 +-
tp/t/results/indices/subentry_and_sortas.pl | 16 +-
tp/t/results/indices/subentry_and_sortas_spaces.pl | 16 +-
tp/t/results/indices/transparent_sort_chars.pl | 8 +-
tp/t/results/indices/w_lines_count.pl | Bin 9362 -> 9378 bytes
tp/t/results/info_tests/anchor_and_spaces.pl | 12 +-
tp/t/results/info_tests/anchor_in_command.pl | 20 +-
tp/t/results/info_tests/before_node_and_section.pl | 24 +-
tp/t/results/info_tests/center_flush.pl | 12 +-
.../info_tests/colons_in_index_entries_and_node.pl | 16 +-
.../colons_in_index_entries_and_node_no_quoting.pl | 16 +-
tp/t/results/info_tests/del_quote_linebreaking.pl | 36 +-
tp/t/results/info_tests/direntry_dircategory.pl | 8 +-
.../direntry_dircategory_and_commands.pl | 8 +-
tp/t/results/info_tests/empty_arguments.pl | 12 +-
tp/t/results/info_tests/empty_caption.pl | 4 +-
.../end_of_line_command_in_node_lines.pl | 38 +-
tp/t/results/info_tests/error_in_footnote.pl | 16 +-
tp/t/results/info_tests/file_only_png.pl | Bin 3512 -> 3520 bytes
tp/t/results/info_tests/float_long_captions.pl | 8 +-
tp/t/results/info_tests/image_and_punctuation.pl | Bin 7083 -> 7107 bytes
.../info_tests/image_and_spaces_formatting.pl | 100 +-
tp/t/results/info_tests/image_extension.pl | Bin 4465 -> 4477 bytes
tp/t/results/info_tests/image_in_paragraph.pl | Bin 2995 -> 2999 bytes
tp/t/results/info_tests/image_not_found.pl | 4 +-
tp/t/results/info_tests/image_quotes.pl | Bin 2586 -> 2590 bytes
tp/t/results/info_tests/image_text_encoded.pl | 4 +-
.../info_tests/image_text_file_only_and_alt.pl | Bin 2710 -> 2714 bytes
.../info_tests/invalid_node_name_no_warning.pl | 66 +-
.../info_tests/invalid_node_name_warning.pl | 66 +-
.../info_tests/multiline_image_and_align.pl | 64 +-
.../multitable_anchor_and_index_entry.pl | 20 +-
.../info_tests/nested_footnotes_separate.pl | 8 +-
.../info_tests/nested_multitable_anchor_index.pl | 20 +-
tp/t/results/info_tests/note_in_strong.pl | 24 +-
.../info_tests/note_in_strong_end_of_line.pl | 8 +-
tp/t/results/info_tests/novalidate_empty_refs.pl | 20 +-
.../info_tests/one_node_counted_elements.pl | 10 +-
tp/t/results/info_tests/pxref_test.pl | 32 +-
tp/t/results/info_tests/quote_node_names_info.pl | 132 +-
tp/t/results/info_tests/ref_tests.pl | 64 +-
.../similar_external_and_internal_node.pl | 40 +-
tp/t/results/info_tests/space_in_setfilename.pl | 4 +-
tp/t/results/info_tests/test_index.pl | 24 +-
tp/t/results/info_tests/top_node_normalization.pl | 12 +-
tp/t/results/info_tests/xref_quote_long_item.pl | 26 +-
tp/t/results/info_tests/xref_test.pl | 44 +-
.../init_files_tests/customize_special_element.pl | 4 +-
.../init_files_tests/customize_translations.pl | 12 +-
.../init_files_tests/documentation_examples.pl | 114 +-
.../documentation_examples_texi2html.pl | 114 +-
.../init_files_tests/modified_translation.pl | 12 +-
.../init_files_tests/sc_formatting_with_css.pl | 12 +-
...est_format_single_footnote_in_inline_content.pl | 20 +-
tp/t/results/invalid_nestings/accents.pl | 28 +-
tp/t/results/invalid_nestings/bad_style_nesting.pl | 4 +-
tp/t/results/invalid_nestings/bad_tab_nesting.pl | 4 +-
.../invalid_nestings/cartouche_in_style_command.pl | 4 +-
tp/t/results/invalid_nestings/center.pl | 32 +-
.../invalid_nestings/def_in_style_command.pl | 4 +-
.../invalid_nestings/enumerate_in_style_command.pl | 4 +-
.../invalid_nestings/example_in_style_command.pl | 4 +-
.../invalid_nestings/float_in_style_command.pl | 8 +-
.../flushright_in_style_command.pl | 4 +-
tp/t/results/invalid_nestings/footnote_in_ref.pl | 8 +-
.../invalid_nestings/heading_commands_in_center.pl | 4 +-
.../heading_commands_in_documentlanguage.pl | 4 +-
.../heading_separator_in_accent_command.pl | 8 +-
tp/t/results/invalid_nestings/ignore_in_xref.pl | 6 +-
tp/t/results/invalid_nestings/in_errormsg.pl | 22 +-
tp/t/results/invalid_nestings/in_table.pl | 28 +-
tp/t/results/invalid_nestings/item_in_ref.pl | 4 +-
.../invalid_nestings/menu_in_style_command.pl | 4 +-
.../multitable_in_style_command.pl | 4 +-
.../invalid_nestings/on_block_command_line.pl | 24 +-
tp/t/results/invalid_nestings/on_def_line.pl | 32 +-
.../invalid_nestings/on_index_entry_line.pl | 12 +-
tp/t/results/invalid_nestings/on_itemize_line.pl | 12 +-
tp/t/results/invalid_nestings/on_node_line.pl | 22 +-
tp/t/results/invalid_nestings/on_section_line.pl | 12 +-
.../results/invalid_nestings/on_subheading_line.pl | 12 +-
tp/t/results/invalid_nestings/quotation_in_ref.pl | 4 +-
.../invalid_nestings/quotation_in_style_command.pl | 4 +-
tp/t/results/invalid_nestings/ref_in_ref.pl | 12 +-
.../invalid_nestings/ref_to_top_in_anchor.pl | 10 +-
.../invalid_nestings/section_in_footnote.pl | 4 +-
tp/t/results/invalid_nestings/section_in_math.pl | 8 +-
.../invalid_nestings/section_on_itemize_line.pl | 8 +-
.../invalid_nestings/section_on_multitable_line.pl | 4 +-
.../style_not_closed_before_first_node.pl | 4 +-
.../style_not_closed_in_block_command.pl | 4 +-
.../style_not_closed_in_table_line.pl | 4 +-
.../style_not_closed_no_newline_root_commands.pl | 8 +-
.../style_not_closed_root_commands.pl | 8 +-
tp/t/results/invalid_nestings/table_in_code.pl | 4 +-
.../thischapter_in_footnote_in_evenfooting.pl | 12 +-
.../thischapter_in_math_in_evenfooting.pl | 4 +-
.../unclosed_verb_end_of_line_on_misc_line.pl | 4 +-
.../invalid_nestings/unclosed_verb_on_misc_line.pl | 4 +-
.../unclosed_verb_on_section_line.pl | 4 +-
tp/t/results/invalid_nestings/verbatim_in_ref.pl | 4 +-
tp/t/results/itemize/accent_argument.pl | 12 +-
tp/t/results/itemize/bad_enumerate_arguments.pl | 4 +-
tp/t/results/itemize/empty_accent_argument.pl | 4 +-
tp/t/results/itemize/itemize_in_example.pl | 4 +-
.../itemize/itemize_line_commands_with_brace.pl | 8 +-
tp/t/results/itemize/w_argument.pl | 12 +-
tp/t/results/languages/command_translated.pl | 12 +-
tp/t/results/languages/documentlanguage.pl | 6 +-
tp/t/results/languages/documentlanguage_option.pl | 6 +-
tp/t/results/languages/documentlanguage_unknown.pl | 6 +-
.../results/languages/multiple_documentlanguage.pl | 12 +-
tp/t/results/languages/multiple_in_preamble.pl | 8 +-
.../languages/multiple_in_preamble_before_node.pl | 8 +-
tp/t/results/languages/multiple_lang_chapters.pl | 18 +-
.../languages/multiple_lang_chapters_latex.pl | 18 +-
.../languages/multiple_lang_chapters_texi2html.pl | 18 +-
tp/t/results/languages/unknown_language.pl | 12 +-
tp/t/results/latex_tests/anchor_before_top.pl | 10 +-
tp/t/results/latex_tests/anchor_in_copying.pl | 10 +-
.../anchor_in_copying_insertcopying_chap.pl | 16 +-
.../anchor_in_copying_insertcopying_titlepage.pl | 20 +-
...chor_in_copying_insertcopying_titlepage_chap.pl | 16 +-
.../anchor_links_xref_xrefautomaticsectiontitle.pl | 64 +-
tp/t/results/latex_tests/backslash_math.pl | 8 +-
tp/t/results/latex_tests/brace_in_index.pl | 12 +-
.../custom_heading_with_include_in_command.pl | 4 +-
tp/t/results/latex_tests/custom_headings.pl | 4 +-
.../latex_tests/custom_headings_and_comments.pl | 4 +-
.../latex_tests/error_in_sectioning_command.pl | 20 +-
tp/t/results/latex_tests/float_and_refs.pl | 114 +-
tp/t/results/latex_tests/indices.pl | 72 +-
.../latex_tests/indices_disable_encoding.pl | 72 +-
.../informative_commands_in_top_node.pl | 4 +-
tp/t/results/latex_tests/node_before_top.pl | 6 +-
tp/t/results/latex_tests/titlepage_no_title.pl | 4 +-
.../titlepage_with_commands_classical.pl | 4 +-
.../latex_tests/top_no_sectioning_command.pl | 6 +-
tp/t/results/latex_tests/verb.pl | 16 +-
tp/t/results/layout/no_monolithic.pl | 4 +-
tp/t/results/layout/no_monolithic_only_toc_out.pl | 4 +-
tp/t/results/linemacro/api_doc_with_linemacro.pl | 80 +-
tp/t/results/linemacro/brace_command_not_closed.pl | 4 +-
.../linemacro/call_macro_in_linemacro_body.pl | 8 +-
.../linemacro/call_macro_in_linemacro_call.pl | 4 +-
.../linemacro/comment_at_end_of_linemacro_call.pl | 4 +-
.../results/linemacro/comment_in_linemacro_call.pl | 4 +-
.../comment_in_one_argument_linemacro_call.pl | 4 +-
.../linemacro/newline_and_continuation_in_brace.pl | 10 +-
tp/t/results/linemacro/paragraph_no_paragraph.pl | 12 +-
.../linemacro/spaces_after_command_in_call.pl | 12 +-
...paces_after_macro_linemacro_commands_in_call.pl | 10 +-
.../spaces_after_unknown_command_in_call.pl | 4 +-
tp/t/results/linemacro/text_arguments.pl | 8 +-
tp/t/results/linemacro/verb_in_linemacro_call.pl | 8 +-
tp/t/results/linemacro/verb_not_closed.pl | 4 +-
.../verb_with_arobase_in_linemacro_call.pl | 4 +-
.../linemacro/verb_with_brace_in_linemacro_call.pl | 4 +-
tp/t/results/macro/bib_example.pl | 32 +-
...losing_brace_in_macro_call_in_ignored_inline.pl | 8 +-
tp/t/results/macro/complex_argument.pl | 8 +-
.../macro/cpp_directives_line_value_macro.pl | 6 +-
tp/t/results/macro/expand_two_same.pl | 8 +-
tp/t/results/macro/glossary.pl | 16 +-
tp/t/results/macro/ignored_macro_definition.pl | 4 +-
tp/t/results/macro/implicit_quoting_one_arg.pl | 4 +-
tp/t/results/macro/include_after_empty_line_arg.pl | 4 +-
.../macro/macro_alias_definfoenclose_defindex.pl | 24 +-
.../macro/macro_call_in_ignored_inlinefmtifelse.pl | 4 +-
.../macro/macro_call_in_inlinefmtifelse_format.pl | 4 +-
tp/t/results/macro/macro_call_in_node_manual.pl | 4 +-
.../macro/macro_end_call_in_ignored_inlinefmt.pl | 4 +-
.../macro_end_call_in_ignored_inlinefmtifelse.pl | 4 +-
...cro_end_call_in_ignored_inlinefmtifelse_else.pl | 4 +-
.../macro/macro_end_call_in_ignored_inlineraw.pl | 4 +-
tp/t/results/macro/macro_expansion.pl | 4 +-
.../macro_expansion_in_multitable_prototype.pl | 8 +-
tp/t/results/macro/macro_for_verb.pl | 4 +-
tp/t/results/macro/macro_in_accent.pl | 20 +-
tp/t/results/macro/macro_in_brace_command.pl | 4 +-
tp/t/results/macro/macro_in_index_commands.pl | 16 +-
.../macro/macro_in_menu_comment_like_entry.pl | 4 +-
tp/t/results/macro/macro_in_misc_commands.pl | 28 +-
.../macro_inlineifcond_end_in_empty_ignored.pl | 8 +-
.../macro/macro_inlineifcond_end_in_empty_set.pl | 8 +-
tp/t/results/macro/macro_name_with_hyphen.pl | 4 +-
.../macro/macro_replaced_by_definfoenclose.pl | 4 +-
tp/t/results/macro/protect_in_body.pl | 12 +-
tp/t/results/macro/protect_in_body_line_arg.pl | 12 +-
tp/t/results/macro/protect_in_body_one_arg.pl | 12 +-
tp/t/results/macro/redefine_texinfo_macro.pl | 4 +-
.../macro/verb_with_arobase_in_macro_call.pl | 8 +-
.../results/macro/verb_with_brace_in_macro_call.pl | 4 +-
tp/t/results/menu/bad_beginning.pl | 4 +-
.../menu/commands_in_nodedescriptionblock.pl | 50 +-
tp/t/results/menu/formats_in_menu.pl | 4 +-
tp/t/results/menu/inlineraw_in_menu_description.pl | 4 +-
tp/t/results/menu/invalid_info_menu_entry.pl | 20 +-
tp/t/results/menu/menu_entry_no_entry.pl | 8 +-
tp/t/results/menu/menu_pointing_to_anchor.pl | 4 +-
tp/t/results/menu/nodedescription_descriptions.pl | 16 +-
.../menu/nodedescriptionblock_descriptions.pl | 16 +-
tp/t/results/menu/sc_in_menu.pl | 52 +-
tp/t/results/menu/verb_in_menu_description.pl | 4 +-
tp/t/results/misc_commands/clickstyle.pl | 8 +-
.../codequoteundirected_codequotebacktick.pl | 396 +--
.../misc_commands/command_in_heading_footing.pl | 4 +-
.../command_not_closed_in_documentencoding.pl | 11 +-
.../command_not_closed_on_center_line.pl | 4 +-
tp/t/results/misc_commands/definfoenclose.pl | 16 +-
.../misc_commands/definfoenclose_nestings.pl | 20 +-
.../misc_commands/definfoenclose_with_empty_arg.pl | 4 +-
.../results/misc_commands/empty_center_with_arg.pl | 4 +-
tp/t/results/misc_commands/footnote_in_center.pl | 6 +-
.../misc_commands/heading_command_in_commands.pl | 4 +-
.../incorrect_allowcodebreaks_argument.pl | 4 +-
.../indent_in_command_in_paragraph.pl | 12 +-
.../indent_with_command_after_without_space.pl | 4 +-
.../indent_with_text_after_without_space.pl | 6 +-
tp/t/results/misc_commands/invalid_clickstyle.pl | 12 +-
.../misc_commands/invalid_documentencoding.pl | 16 +-
tp/t/results/misc_commands/kbdinputstyle.pl | 192 +-
.../misc_commands/kbdinputstyle_in_table.pl | 24 +-
tp/t/results/misc_commands/nodedescription.pl | 4 +-
tp/t/results/misc_commands/ref_in_center.pl | 10 +-
tp/t/results/misc_commands/setfilename.pl | 4 +-
tp/t/results/misc_commands/test_allowcodebreaks.pl | 248 +-
tp/t/results/moresectioning/anchor_in_footnote.pl | 14 +-
.../moresectioning/anchor_in_footnote_separate.pl | 14 +-
.../anchor_in_footnote_separate_split_node.pl | 14 +-
.../anchor_in_footnote_split_node.pl | 14 +-
.../moresectioning/character_and_spaces_in_refs.pl | 56 +-
.../character_and_spaces_in_refs_out.pl | 56 +-
.../equivalent_nodes_defined_linked.pl | 28 +-
tp/t/results/moresectioning/no_element.pl | 36 +-
.../moresectioning/nodes_before_after_top_xref.pl | 24 +-
...nodes_no_section_footnote_no_top_node_output.pl | 4 +-
.../non_automatic_internal_top_node_up.pl | 24 +-
.../non_automatic_top_node_up_and_url.pl | 24 +-
.../moresectioning/placed_things_before_element.pl | 48 +-
.../placed_things_before_element_no_use_node.pl | 48 +-
.../moresectioning/placed_things_before_node.pl | 48 +-
.../moresectioning/special_spaces_in_nodes.pl | 6 +-
tp/t/results/multitable/empty_headitem.pl | 8 +-
tp/t/results/multitable/prototype_no_brace.pl | 4 +-
tp/t/results/multitable/ref_in_multitable.pl | 40 +-
tp/t/results/multitable/w_in_multitable.pl | 4 +-
tp/t/results/paragraph/close_paragraph_command.pl | 4 +-
tp/t/results/paragraph/commands_in_flushright.pl | 4 +-
tp/t/results/paragraph/double_style_paragraph.pl | 8 +-
tp/t/results/paragraph/image_in_paragraph.pl | 4 +-
.../indent_before_macro_definition_and_other.pl | 8 +-
tp/t/results/paragraph/no_paragraph_commands.pl | 8 +-
tp/t/results/paragraph/paragraph_command.pl | 24 +-
.../paragraph/paragraph_in_style_command.pl | 8 +-
tp/t/results/paragraph/sole_image.pl | 4 +-
.../plaintext_tests/U_with_utf8_enable_encoding.pl | 4 +-
.../plaintext_tests/accent_command_punctuation.pl | 4 +-
.../accents_in_var_enable_encoding.pl | 16 +-
.../after_punctuation_character_in_command.pl | 4 +-
.../plaintext_tests/anchor_and_empty_lines.pl | 4 +-
.../at_commands_glued_in_example.pl | 42 +-
.../at_commands_glued_in_paragraph.pl | 42 +-
.../plaintext_tests/before_accent_punctuation.pl | 4 +-
.../characters_and_commands_in_var.pl | 48 +-
.../code_commands_and_punctuation.pl | 8 +-
.../command_brace_no_arg_punctuation.pl | 16 +-
.../plaintext_tests/commands_and_punctuation.pl | 8 +-
tp/t/results/plaintext_tests/east_asian_in_w.pl | 4 +-
tp/t/results/plaintext_tests/japanese_utf8.pl | 12 +-
.../plaintext_tests/lone_braces_in_inlineraw.pl | 4 +-
.../plaintext_tests/long_uref_after_item.pl | 4 +-
.../plaintext_tests/multiline_image_and_align.pl | 32 +-
.../plaintext_tests/multiline_verb_after_space.pl | 4 +-
.../plaintext_tests/nested_code_commands.pl | 188 +-
.../plaintext_tests/no_empty_line_after_section.pl | 4 +-
.../plaintext_tests/protect_spaces_on_line.pl | 16 +-
.../plaintext_tests/punctuation_abbr_acronym.pl | 32 +-
.../punctuation_and_code_style_commands.pl | 60 +-
.../punctuation_and_code_style_commands_utf8.pl | 60 +-
.../plaintext_tests/punctuation_and_footnotes.pl | 48 +-
.../punctuation_and_footnotes_frenchspacing.pl | 48 +-
.../punctuation_and_upper_case_commands.pl | 120 +-
.../punctuation_and_upper_case_commands_utf8.pl | 120 +-
.../plaintext_tests/punctuation_at_end_command.pl | 40 +-
.../plaintext_tests/punctuation_commands.pl | 16 +-
.../punctuation_commands_frenchspacing.pl | 16 +-
.../plaintext_tests/punctuation_in_command.pl | 36 +-
.../punctuation_in_command_end_line.pl | 40 +-
tp/t/results/plaintext_tests/punctuation_in_sc.pl | 8 +-
.../punctuation_sc_accents_ascii_glyph.pl | 200 +-
.../punctuation_sc_accents_ascii_glyph_latin1.pl | 200 +-
.../punctuation_sc_accents_ascii_glyph_usascii.pl | 204 +-
.../punctuation_sc_accents_default.pl | 200 +-
.../punctuation_sc_accents_default_latin1.pl | 200 +-
.../punctuation_sc_accents_default_usascii.pl | 204 +-
.../punctuation_sc_accents_disable_encoding.pl | 200 +-
...nctuation_sc_accents_disable_encoding_latin1.pl | 200 +-
...ctuation_sc_accents_disable_encoding_usascii.pl | 204 +-
...uation_sc_accents_to_utf8_ascii_glyph_latin1.pl | 200 +-
...ation_sc_accents_to_utf8_ascii_glyph_usascii.pl | 204 +-
.../punctuation_sc_accents_to_utf8_latin1.pl | 200 +-
.../punctuation_sc_accents_to_utf8_usascii.pl | 204 +-
tp/t/results/plaintext_tests/quote_node_names.pl | 132 +-
.../sc_with_utf8_enable_encoding.pl | 4 +-
.../split_punctuation_detection_in_commands.pl | 20 +-
.../plaintext_tests/star_at_command_formatting.pl | 48 +-
tp/t/results/plaintext_tests/transparent_text.pl | 8 +-
tp/t/results/preformatted/caption_in_example.pl | 4 +-
.../preformatted/empty_line_style_command.pl | 4 +-
.../preformatted/example_at_commands_arguments.pl | 24 +-
.../example_invalid_at_commands_arguments.pl | 10 +-
tp/t/results/preformatted/titlefont_in_example.pl | 4 +-
tp/t/results/quotation/empty_quotation.pl | 4 +-
.../quotation/footnote_in_quotation_with_arg.pl | 4 +-
...pty_line_in_command_in_expanded_not_expanded.pl | 8 +-
tp/t/results/raw/inline_in_example.pl | 20 +-
tp/t/results/raw/inline_missing_first_arg.pl | 8 +-
tp/t/results/raw/inlinefmt.pl | 16 +-
tp/t/results/raw/inlinefmt_with_empty_line.pl | 16 +-
tp/t/results/raw/inlineraw.pl | 16 +-
tp/t/results/raw/inlineraw_not_closed.pl | 4 +-
tp/t/results/raw/inlineraw_with_empty_line.pl | 16 +-
tp/t/results/raw/raw_expanded_in_style.pl | 4 +-
tp/t/results/raw/raw_in_style.pl | 4 +-
.../raw/second_level_lone_braces_in_html.pl | 8 +-
tp/t/results/raw/verbatim_in_brace_command.pl | 4 +-
tp/t/results/regions/anchor_in_copying.pl | 10 +-
.../regions/anchor_in_copying_in_footnote.pl | 14 +-
tp/t/results/regions/anchor_in_titlepage.pl | 10 +-
.../regions/anchor_in_titlepage_titlepage.pl | 10 +-
tp/t/results/regions/ref_in_copying.pl | 6 +-
.../regions/ref_in_copying_insert_in_chapter.pl | 6 +-
tp/t/results/regions/today_in_copying.pl | 4 +-
tp/t/results/sectioning/anchor_zero.pl | 10 +-
tp/t/results/sectioning/at_commands_in_node.pl | 40 +-
.../results/sectioning/double_node_anchor_float.pl | 8 +-
...double_recursive_self_section_node_reference.pl | 12 +-
...sive_self_section_node_reference_no_use_node.pl | 12 +-
.../double_recursive_self_section_reference.pl | 12 +-
tp/t/results/sectioning/double_top.pl | 4 +-
tp/t/results/sectioning/email_in_node.pl | 12 +-
tp/t/results/sectioning/empty_anchor.pl | 8 +-
.../sectioning/empty_nodes_with_commands.pl | 4 +-
tp/t/results/sectioning/empty_ref_arg.pl | 24 +-
tp/t/results/sectioning/empty_refs.pl | 16 +-
tp/t/results/sectioning/equivalent_labels.pl | 12 +-
tp/t/results/sectioning/equivalent_nodes.pl | 18 +-
.../sectioning/equivalent_nodes_novalidate.pl | 18 +-
.../results/sectioning/no_argument_and_contents.pl | 4 +-
tp/t/results/sectioning/node_line_arguments.pl | 12 +-
tp/t/results/sectioning/node_nested_parentheses.pl | 8 +-
tp/t/results/sectioning/node_referenced_in_ref.pl | 6 +-
tp/t/results/sectioning/nodename_parentheses.pl | 18 +-
tp/t/results/sectioning/novalidate.pl | 6 +-
.../one_node_explicit_directions_anchor.pl | 10 +-
..._node_explicit_directions_anchor_no_use_node.pl | 10 +-
.../sectioning/protected_node_parentheses.pl | 28 +-
.../sectioning/recursive_self_section_reference.pl | 6 +-
tp/t/results/sectioning/ref_to_top.pl | 6 +-
tp/t/results/sectioning/ref_to_unknown_node.pl | 6 +-
.../reference_to_only_special_spaces_node.pl | 28 +-
.../transliterated_split_equivalent_nodes.pl | 20 +-
.../sectioning/unnumbered_before_top_node.pl | 4 +-
.../insert_nodes_for_sectioning_commands.pl | 26 +-
.../transformations/protect_colon_source_mark.pl | 6 +-
.../transformations/protect_comma_source_mark.pl | 36 +-
...st_parenthesis_after_parenthesis_source_mark.pl | 10 +-
.../protect_first_parenthesis_source_mark.pl | 10 +-
...otect_hashchar_at_line_beginning_source_mark.pl | 26 +-
...ct_node_after_label_source_mark_in_protected.pl | 18 +-
tp/t/results/value/bad_syntax.pl | 6 +-
.../value/begin_like_comment_on_set_line.pl | 12 +-
.../closing_brace_in_value_in_ignored_inline.pl | 14 +-
tp/t/results/value/comment_on_clear_line.pl | 24 +-
tp/t/results/value/comment_on_set_line.pl | 24 +-
tp/t/results/value/empty_set.pl | 6 +-
tp/t/results/value/empty_value_in_line.pl | 6 +-
tp/t/results/value/ignored_value_definition.pl | 10 +-
tp/t/results/value/not_only_characters.pl | 6 +-
tp/t/results/value/recursive_expansion_in_set.pl | 600 ++---
tp/t/results/value/set_flag_command_equivalent.pl | 6 +-
tp/t/results/value/set_form_feed.pl | 22 +-
tp/t/results/value/simple.pl | 10 +-
tp/t/results/value/spaces_before_value.pl | 4 +-
tp/t/results/value/unknown_value_after_spaces.pl | 6 +-
tp/t/results/value/value_after_accent.pl | 20 +-
tp/t/results/value/value_after_brace_command.pl | 48 +-
tp/t/results/value/value_in_index_commands.pl | 82 +-
.../value/value_in_invalid_documentencoding.pl | 6 +-
tp/t/results/value/value_in_misc_commands.pl | 286 +--
tp/t/results/value/value_in_node.pl | 30 +-
tp/t/results/value/value_node_directions.pl | 30 +-
tp/t/results/value/value_zero.pl | 6 +-
.../value_and_macro/comma_value_in_macro_arg.pl | 14 +-
tp/t/results/value_and_macro/macro_in_value.pl | 6 +-
.../results/value_and_macro/value_in_macro_body.pl | 10 +-
tp/t/results/verb/comments.pl | 8 +-
tp/t/results/verb/end_of_line.pl | 4 +-
tp/t/results/verb/multiline.pl | 4 +-
tp/t/results/verb/nested.pl | 8 +-
tp/t/results/verb/simple.pl | 4 +-
.../verb/verb_and_char_end_of_line_not_closed.pl | 4 +-
.../results/verb/verb_at_end_of_line_not_closed.pl | 4 +-
tp/t/results/verb/verb_not_closed.pl | 4 +-
tp/t/results/verb/verb_not_closed_with_char.pl | 4 +-
.../brace_commands_spaces_end_of_lines.pl | 24 +-
tp/t/results/xml_tests/commands_and_spaces.pl | 32 +-
.../xml_tests/comments_on_block_command_lines.pl | 8 +-
tp/t/results/xml_tests/image_inline_or_not.pl | 108 +-
tp/t/results/xml_tests/inline_commands.pl | 32 +-
.../xml_tests/inlineifset_empty_second_arg.pl | 8 +-
tp/t/results/xtable/accent_on_table_line.pl | 20 +-
812 files changed, 18440 insertions(+), 18212 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3821995d75..650953b054 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,89 @@
+2024-11-11 Patrice Dumas <pertusus@free.fr>
+
+ Use contents instead of args for brace commands in Texinfo tree
+
+ * tp/Texinfo/ParserNonXS.pm (_handle_comma): rename $brace_command as
+ $command_element.
+
+ * tp/Texinfo/Common.pm (get_label_element), tp/Texinfo/ParserNonXS.pm
+ (_end_line_starting_block, _new_value_element, _handle_open_brace)
+ (_handle_close_brace, _handle_comma, _process_remaining_on_line),
+ tp/Texinfo/Translations.pm (_substitute_element_array),
+ tp/Texinfo/XS/main/build_perl_info.c (element_to_perl_hash),
+ tp/Texinfo/XS/main/translations.c (substitute_element_array),
+ tp/Texinfo/XS/main/utils.c (get_label_element),
+ tp/Texinfo/XS/parsetexi/end_line.c (end_line_starting_block),
+ tp/Texinfo/XS/parsetexi/parser.c (new_value_element)
+ (process_remaining_on_line), tp/Texinfo/XS/parsetexi/separator.c
+ (handle_open_brace, handle_close_brace, handle_comma): use contents
+ instead of args for brace command arguments in Texinfo tree.
+
+ * tp/Texinfo/Structuring.pm (check_nodes_are_referenced),
+ tp/Texinfo/Transformations.pm (fill_gaps_in_sectioning)
+ (_reference_to_arg, _protect_hashchar_at_line_beginning),
+ tp/Texinfo/ManipulateTree.pm (_new_asis_command_with_text)
+ (_protect_text, protect_first_parenthesis),
+ tp/Texinfo/XS/main/manipulate_tree.c (new_asis_command_with_text)
+ (protect_text), tp/Texinfo/XS/structuring_transfo/structuring.c
+ (check_nodes_are_referenced, associate_internal_references),
+ tp/Texinfo/XS/structuring_transfo/transformations.c
+ (protect_first_parenthesis, fill_gaps_in_sectioning)
+ (reference_to_arg_internal)
+ (protect_hashchar_at_line_beginning_internal): update structuring and
+ transformations for change of args to contents for brace commands.
+
+ * tp/Texinfo/Convert/Converter.pm (table_item_content_tree),
+ tp/Texinfo/Convert/DocBook.pm (conversion_output_begin, _index_entry)
+ (_convert), tp/Texinfo/Convert/HTML.pm (_internal_command_tree)
+ (_convert_explained_command, _convert_listoffloats_command)
+ (_convert_float_command, _convert_xref_commands)
+ (_convert_printindex_command, _default_format_single_footnote)
+ (_prepare_converted_output_info, _convert), tp/Texinfo/Convert/Info.pm
+ (format_ref, format_image), tp/Texinfo/Convert/LaTeX.pm (_title)
+ (_begin_document, _index_entry, _convert),
+ tp/Texinfo/Convert/NodeNameNormalization.pm (_convert),
+ tp/Texinfo/Convert/Plaintext.pm (%ignored_commands, process_footnotes)
+ (process_printindex, format_ref, image_formatted_text, format_image)
+ (_convert), tp/Texinfo/Convert/Texinfo.pm (_convert_to_texinfo)
+ (_expand_cmd_args_to_texi), tp/Texinfo/Convert/TexinfoMarkup.pm
+ (_convert), tp/Texinfo/Convert/Text.pm (_convert),
+ tp/Texinfo/Convert/Utils.pm (definition_category_tree)
+ (find_innermost_accent_contents), tp/Texinfo/Indices.pm
+ (_idx_leading_text_or_command), tp/Texinfo/ManipulateTree.pm
+ (_new_asis_command_with_text, _protect_text)
+ (protect_first_parenthesis), tp/Texinfo/XS/convert/convert_html.c
+ (html_prepare_converted_output_info, html_convert_tree_append)
+ (html_node_redirections), tp/Texinfo/XS/convert/converter.c
+ (table_item_content_tree), tp/Texinfo/XS/convert/format_html.c
+ (html_internal_command_tree, html_default_format_single_footnote)
+ (html_convert_explained_command, html_convert_xref_command)
+ (html_convert_float_command, html_convert_listoffloats_command)
+ (html_convert_printindex_command),
+ tp/Texinfo/XS/main/convert_to_texinfo.c (expand_cmd_args_to_texi)
+ (convert_to_texinfo_internal), tp/Texinfo/XS/main/convert_to_text.c
+ (convert_to_text_internal), tp/Texinfo/XS/main/convert_utils.c
+ (find_innermost_accent_contents),
+ tp/Texinfo/XS/main/manipulate_indices.c (idx_leading_text_or_command),
+ tp/Texinfo/XS/main/node_name_normalization.c
+ (convert_to_normalized_internal), tp/ext/latex2html.pm (l2h_process),
+ tp/ext/tex4ht.pm (tex4ht_prepare): update conversion for change of
+ args to contents for brace commands. call get_label_element more.
+
+ * tp/Texinfo/Convert/DocBook.pm (_convert),
+ tp/Texinfo/Convert/LaTeX.pm (_convert),
+ tp/Texinfo/XS/main/convert_to_text.c (convert_to_text_internal),
+ tp/Texinfo/XS/main/node_name_normalization.c
+ (convert_to_normalized_internal): return right after formatting brace
+ commands.
+
+ * tp/init/documentation_examples.pm
+ (my_test_documentation_convert_xref_commands), tp/t/01use.t,
+ tp/t/init/footnote_mark_in_inline_content.pm
+ (_texi2any_test_format_single_footnote_in_inline_content): update
+ tests init files and manually written tree.
+
+ * tp/t/09indices.t: change code order.
+
2024-11-10 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/ParserNonXS.pm (_expand_macro_arguments)
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index 5f87a87f6b..51f42ea791 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -1726,9 +1726,12 @@ sub get_label_element($)
{
my $current = shift;
return undef if (!defined($current->{'cmdname'}));
- if (($current->{'cmdname'} eq 'node' or $current->{'cmdname'} eq 'anchor')
+ if ($current->{'cmdname'} eq 'node'
and $current->{'args'} and scalar(@{$current->{'args'}})) {
return $current->{'args'}->[0];
+ } elsif ($current->{'cmdname'} eq 'anchor'
+ and $current->{'contents'} and scalar(@{$current->{'contents'}})) {
+ return $current->{'contents'}->[0];
} elsif ($current->{'cmdname'} eq 'float'
and $current->{'args'} and scalar(@{$current->{'args'}}) >= 2) {
return $current->{'args'}->[1];
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index a57fc4fa36..840366b91d 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -1547,7 +1547,7 @@ sub table_item_content_tree($$)
'contents' => [$element->{'args'}->[0]],
'parent' => $command,};
}
- $command->{'args'} = [$arg];
+ $command->{'contents'} = [$arg];
return $command;
}
return undef;
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index 21ed7fc321..b4ca450317 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -410,7 +410,7 @@ sub conversion_output_begin($;$$)
my $fulltitle_command;
if ($global_commands) {
- foreach my $title_cmdname ('title', 'shorttitlepage', 'titlefont') {
+ foreach my $title_cmdname ('title', 'shorttitlepage') {
if ($global_commands->{$title_cmdname}) {
my $command = $global_commands->{$title_cmdname};
next if (!$command->{'args'}
@@ -419,6 +419,13 @@ sub conversion_output_begin($;$$)
last;
}
}
+ if (!defined($fulltitle_command)) {
+ my $command = $global_commands->{'titlefont'};
+ if ($command and $command->{'contents'}
+ and $command->{'contents'}->[0]->{'contents'}) {
+ $fulltitle_command = $command;
+ }
+ }
}
# get informations from the @titlepage. Since the fulltitle is gathered
@@ -648,13 +655,13 @@ sub _index_entry($$)
$result .= "<see>";
# args is set as the extra information is added when closing braces
$result .= _convert($self, $index_entry->{'entry_element'}
- ->{'extra'}->{'seeentry'}->{'args'}->[0]);
+ ->{'extra'}->{'seeentry'}->{'contents'}->[0]);
$result .= "</see>";
}
if ($index_entry->{'entry_element'}->{'extra'}->{'seealso'}) {
$result .= "<seealso>";
$result .= _convert($self, $index_entry->{'entry_element'}
- ->{'extra'}->{'seealso'}->{'args'}->[0]);
+ ->{'extra'}->{'seealso'}->{'contents'}->[0]);
$result .= "</seealso>";
}
@@ -1106,14 +1113,15 @@ sub _convert($$;$)
}
} elsif ($element->{'type'}
and $element->{'type'} eq 'definfoenclose_command') {
- if ($element->{'args'}) {
- my $arg_text = _convert($self, $element->{'args'}->[0]);
+ if ($element->{'contents'}) {
+ my $arg_text = _convert($self, $element->{'contents'}->[0]);
$result .= $arg_text;
}
+ return $result;
- } elsif ($element->{'args'}
+ } elsif ($element->{'contents'}
and exists($Texinfo::Commands::brace_commands{$cmdname})) {
- #Texinfo::Common::debug_list(" brace command with args",
$element->{'args'});
+ #Texinfo::Common::debug_list(" brace command with args",
$element->{'contents'});
if ($style_commands_formatting{$cmdname}) {
if ($Texinfo::Commands::brace_commands{$cmdname} eq 'context') {
_new_document_context($self);
@@ -1140,7 +1148,7 @@ sub _convert($$;$)
my ($style, $attribute_text)
= _parse_attribute($formatting->{'attribute'});
- my $result = _convert($self, $element->{'args'}->[0]);
+ my $result = _convert($self, $element->{'contents'}->[0]);
if ($style ne '' and (!$self->{'document_context'}->[-1]->{'inline'}
or $inline_elements{$style})) {
$result = "<$style${attribute_text}>$result</$style>";
@@ -1170,8 +1178,8 @@ sub _convert($$;$)
} elsif ($cmdname eq 'anchor') {
return _output_anchor($element);
} elsif ($Texinfo::Commands::ref_commands{$cmdname}) {
- if ($element->{'args'}) {
- my $args_nr = scalar(@{$element->{'args'}});
+ if ($element->{'contents'}) {
+ my $args_nr = scalar(@{$element->{'contents'}});
my $command_name;
my $book_element;
my ($section_name, $node_name);
@@ -1184,27 +1192,27 @@ sub _convert($$;$)
$command_name = 'ref';
} else {
if ($args_nr >= 5
- and $element->{'args'}->[4]->{'contents'}) {
- $book_element = $element->{'args'}->[4];
+ and $element->{'contents'}->[4]->{'contents'}) {
+ $book_element = $element->{'contents'}->[4];
}
if ($args_nr >= 3
- and $element->{'args'}->[2]->{'contents'}) {
- my $section_arg = $element->{'args'}->[2];
+ and $element->{'contents'}->[2]->{'contents'}) {
+ my $section_arg = $element->{'contents'}->[2];
$section_name = _convert($self, $section_arg);
}
$command_name = $cmdname;
}
my $manual_file_element;
if ($args_nr >= $manual_file_index+1
- and $element->{'args'}->[$manual_file_index]->{'contents'}) {
- $manual_file_element = $element->{'args'}->[$manual_file_index];
+ and $element->{'contents'}->[$manual_file_index]->{'contents'}) {
+ $manual_file_element =
$element->{'contents'}->[$manual_file_index];
}
if (! defined($section_name) and $args_nr >= 2
- and $element->{'args'}->[1]->{'contents'}) {
- my $section_arg = $element->{'args'}->[1];
+ and $element->{'contents'}->[1]->{'contents'}) {
+ my $section_arg = $element->{'contents'}->[1];
$section_name = _convert($self, $section_arg);
- } elsif ($element->{'args'}->[0]->{'contents'}) {
- my $node_arg = $element->{'args'}->[0];
+ } elsif ($element->{'contents'}->[0]->{'contents'}) {
+ my $node_arg = $element->{'contents'}->[0];
push @{$self->{'document_context'}->[-1]->{'upper_case'}}, 0;
$node_name = _convert($self, $node_arg);
pop @{$self->{'document_context'}->[-1]->{'upper_case'}};
@@ -1330,7 +1338,7 @@ sub _convert($$;$)
$result = '';
} else {
my $linkend = '';
- my $node_arg = $element->{'args'}->[0];
+ my $node_arg = $element->{'contents'}->[0];
if ($node_arg and $node_arg->{'extra'}
and defined($node_arg->{'extra'}->{'normalized'})
and !$node_arg->{'extra'}->{'manual_content'}) {
@@ -1363,14 +1371,14 @@ sub _convert($$;$)
return '';
}
} elsif ($cmdname eq 'image') {
- if ($element->{'args'}
- and $element->{'args'}->[0]->{'contents'}) {
+ if ($element->{'contents'}
+ and $element->{'contents'}->[0]->{'contents'}) {
Texinfo::Convert::Text::set_options_code(
$self->{'convert_text_options'});
Texinfo::Convert::Text::set_options_encoding_if_not_ascii($self,
$self->{'convert_text_options'});
my $basefile = Texinfo::Convert::Text::convert_to_text(
- $element->{'args'}->[0],
+ $element->{'contents'}->[0],
$self->{'convert_text_options'});
Texinfo::Convert::Text::reset_options_code(
$self->{'convert_text_options'});
@@ -1422,17 +1430,18 @@ sub _convert($$;$)
$result .= "</mediaobject></informalfigure>";
}
}
+ return $result;
} elsif ($cmdname eq 'email') {
- if ($element->{'args'}) {
+ if ($element->{'contents'}) {
my $name;
my $email;
my $email_text;
- if (scalar(@{$element->{'args'}}) >= 2
- and $element->{'args'}->[1]->{'contents'}) {
- $name = $element->{'args'}->[1];
+ if (scalar(@{$element->{'contents'}}) >= 2
+ and $element->{'contents'}->[1]->{'contents'}) {
+ $name = $element->{'contents'}->[1];
}
- if ($element->{'args'}->[0]->{'contents'}) {
- $email = $element->{'args'}->[0];
+ if ($element->{'contents'}->[0]->{'contents'}) {
+ $email = $element->{'contents'}->[0];
Texinfo::Convert::Text::set_options_code(
$self->{'convert_text_options'});
Texinfo::Convert::Text::set_options_encoding_if_not_ascii($self,
@@ -1462,11 +1471,11 @@ sub _convert($$;$)
}
} elsif ($cmdname eq 'uref' or $cmdname eq 'url') {
- if ($element->{'args'}) {
- my $args_nr = scalar(@{$element->{'args'}});
+ if ($element->{'contents'}) {
+ my $args_nr = scalar(@{$element->{'contents'}});
my ($url_text, $url_arg);
- if ($element->{'args'}->[0]->{'contents'}) {
- $url_arg = $element->{'args'}->[0];
+ if ($element->{'contents'}->[0]->{'contents'}) {
+ $url_arg = $element->{'contents'}->[0];
Texinfo::Convert::Text::set_options_code(
$self->{'convert_text_options'});
Texinfo::Convert::Text::set_options_encoding_if_not_ascii($self,
@@ -1483,13 +1492,13 @@ sub _convert($$;$)
}
my $replacement;
if ($args_nr >= 2
- and $element->{'args'}->[1]->{'contents'}) {
- $replacement = _convert($self, $element->{'args'}->[1]);
+ and $element->{'contents'}->[1]->{'contents'}) {
+ $replacement = _convert($self, $element->{'contents'}->[1]);
}
if (!defined($replacement) or $replacement eq '') {
if ($args_nr >= 3
- and $element->{'args'}->[2]->{'contents'}) {
- $replacement = _convert($self, $element->{'args'}->[2]);
+ and $element->{'contents'}->[2]->{'contents'}) {
+ $replacement = _convert($self, $element->{'contents'}->[2]);
}
}
if (!defined($replacement) or $replacement eq '') {
@@ -1503,10 +1512,10 @@ sub _convert($$;$)
}
} elsif ($cmdname eq 'abbr' or $cmdname eq 'acronym') {
- if ($element->{'args'}) {
+ if ($element->{'contents'}) {
my $argument;
- if ($element->{'args'}->[0]->{'contents'}) {
- my $arg_text = _convert($self, $element->{'args'}->[0]);
+ if ($element->{'contents'}->[0]->{'contents'}) {
+ my $arg_text = _convert($self, $element->{'contents'}->[0]);
if ($arg_text ne '') {
my $format_element;
if ($cmdname eq 'abbr') {
@@ -1517,17 +1526,17 @@ sub _convert($$;$)
$argument = "<$format_element>$arg_text</$format_element>";
}
}
- if (scalar(@{$element->{'args'}}) >= 2
- and $element->{'args'}->[1]->{'contents'}) {
+ if (scalar(@{$element->{'contents'}}) >= 2
+ and $element->{'contents'}->[1]->{'contents'}) {
if (defined($argument)) {
my $tree = $self->cdt('{abbr_or_acronym} ({explanation})',
{'abbr_or_acronym' => {'type' => '_converted',
'text' => $argument},
'explanation' =>
- $element->{'args'}->[1]});
+ $element->{'contents'}->[1]});
return _convert($self, $tree);
} else {
- return _convert($self, $element->{'args'}->[1]);
+ return _convert($self, $element->{'contents'}->[1]);
}
} elsif (defined($argument)) {
return $argument;
@@ -1536,10 +1545,11 @@ sub _convert($$;$)
return '';
} elsif ($cmdname eq 'U') {
- if ($element->{'args'}
- and $element->{'args'}->[0]->{'contents'}
- and $element->{'args'}->[0]->{'contents'}->[0]->{'text'}) {
- my $arg_text = $element->{'args'}->[0]->{'contents'}->[0]->{'text'};
+ if ($element->{'contents'}
+ and $element->{'contents'}->[0]->{'contents'}
+ and $element->{'contents'}->[0]->{'contents'}->[0]->{'text'}) {
+ my $arg_text
+ = $element->{'contents'}->[0]->{'contents'}->[0]->{'text'};
if (defined($arg_text)) {
my $result = "&#x$arg_text;";
@@ -1567,9 +1577,9 @@ sub _convert($$;$)
and !
$self->{'expanded_formats'}->{$element->{'extra'}->{'format'}}) {
$arg_index = 2;
}
- if (scalar(@{$element->{'args'}}) > $arg_index
- and $element->{'args'}->[$arg_index]->{'contents'}) {
- $result .= _convert($self, $element->{'args'}->[$arg_index]);
+ if (scalar(@{$element->{'contents'}}) > $arg_index
+ and $element->{'contents'}->[$arg_index]->{'contents'}) {
+ $result .= _convert($self, $element->{'contents'}->[$arg_index]);
}
if ($cmdname eq 'inlineraw') {
pop @{$self->{'document_context'}};
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index ce3dbbf43b..c125e47f9c 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -1280,8 +1280,14 @@ sub _internal_command_tree($$$)
or $command->{'cmdname'} eq 'anchor')) {
# to be a target, the node or anchor cannot be empty (nor expand to
# spaces only), so argument is necessarily set.
+ my $label_element;
+ if ($command->{'cmdname'} eq 'anchor') {
+ $label_element = $command->{'contents'}->[0];
+ } else {
+ $label_element = $command->{'args'}->[0];
+ }
$tree = {'type' => '_code',
- 'contents' => [$command->{'args'}->[0]]};
+ 'contents' => [$label_element]};
} elsif ($command->{'cmdname'} and ($command->{'cmdname'} eq 'float')) {
$tree = $self->float_type_number($command);
} elsif (!$command->{'args'}->[0]
@@ -3317,11 +3323,11 @@ sub _convert_explained_command($$$$)
my $explanation_string;
my $normalized_type = '';
- if ($command->{'args'}
- and $command->{'args'}->[0]->{'contents'}) {
+ if ($command->{'contents'}
+ and $command->{'contents'}->[0]->{'contents'}) {
$normalized_type
= Texinfo::Convert::NodeNameNormalization::convert_to_identifier(
- $command->{'args'}->[0]);
+ $command->{'contents'}->[0]);
}
if ($args and $args->[1] and defined($args->[1]->{'string'})
@@ -5277,7 +5283,7 @@ sub _convert_listoffloats_command($$$$)
$multiple_formatted .= '-'.($formatted_listoffloats_nr - 1);
}
$caption_text = $self->convert_tree_new_formatting_context(
- $caption_element->{'args'}->[0], $cmdname, $multiple_formatted);
+ $caption_element->{'contents'}->[0], $cmdname, $multiple_formatted);
push @caption_classes, "${caption_cmdname}-in-${cmdname}";
} else {
$caption_text = '';
@@ -5351,10 +5357,10 @@ sub _convert_float_command($$$$$)
$prepended_text = '';
}
my $caption_text = '';
- if ($caption_element and $caption_element->{'args'}->[0]
- and $caption_element->{'args'}->[0]->{'contents'}) {
+ if ($caption_element and $caption_element->{'contents'}->[0]
+ and $caption_element->{'contents'}->[0]->{'contents'}) {
$caption_text = $self->convert_tree_new_formatting_context(
- $caption_element->{'args'}->[0], 'float caption');
+ $caption_element->{'contents'}->[0], 'float caption');
}
return $prepended.$content.$caption_text;
}
@@ -5380,8 +5386,8 @@ sub _convert_float_command($$$$$)
# if not empty?
$prepended_text = $self->convert_tree_new_formatting_context(
{'cmdname' => 'strong',
- 'args' => [{'type' => 'brace_container',
- 'contents' => [$prepended]}]},
+ 'contents' => [{'type' => 'brace_container',
+ 'contents' => [$prepended]}]},
'float number type');
if ($caption_element) {
# register the converted prepended tree to be prepended to
@@ -5389,7 +5395,7 @@ sub _convert_float_command($$$$$)
$self->register_pending_formatted_inline_content($caption_command_name,
$prepended_text);
$caption_text = $self->convert_tree_new_formatting_context(
- $caption_element->{'args'}->[0], 'float caption');
+ $caption_element->{'contents'}->[0], 'float caption');
my $cancelled_prepended
=
$self->cancel_pending_formatted_inline_content($caption_command_name);
# unset if prepended text is in caption, i.e. is not cancelled
@@ -5401,7 +5407,7 @@ sub _convert_float_command($$$$$)
}
} elsif (defined($caption_element)) {
$caption_text = $self->convert_tree_new_formatting_context(
- $caption_element->{'args'}->[0], 'float caption');
+ $caption_element->{'contents'}->[0], 'float caption');
}
if (defined($caption_text) and $caption_text ne '') {
@@ -5815,7 +5821,7 @@ sub _convert_xref_commands($$$$)
if ($args->[4] and defined($args->[4]->{'normal'})
and $args->[4]->{'normal'} ne '');
- my $arg_node = $command->{'args'}->[0];
+ my $arg_node = $command->{'contents'}->[0];
# internal reference
if ($cmdname ne 'inforef' and !defined($book) and !defined($file)
@@ -6309,9 +6315,10 @@ sub _convert_printindex_command($$$$)
}
my $referred_tree = {};
$referred_tree->{'type'} = '_code' if ($in_code);
- if ($referred_entry->{'args'} and $referred_entry->{'args'}->[0]
- and $referred_entry->{'args'}->[0]->{'contents'}) {
- $referred_tree->{'contents'} = [$referred_entry->{'args'}->[0]];
+ if ($referred_entry->{'contents'}
+ and $referred_entry->{'contents'}->[0]
+ and $referred_entry->{'contents'}->[0]->{'contents'}) {
+ $referred_tree->{'contents'} = [$referred_entry->{'contents'}->[0]];
}
my $entry;
# for @seealso, to appear where chapter/node ususally appear
@@ -11449,7 +11456,7 @@ sub _default_format_single_footnote($$$$$$)
my $self = shift;
my ($command, $footid, $number_in_doc, $href, $mark) = @_;
my $footnote_text
- = $self->convert_tree_new_formatting_context($command->{'args'}->[0],
+ = $self->convert_tree_new_formatting_context($command->{'contents'}->[0],
"$command->{'cmdname'} $number_in_doc $footid");
chomp ($footnote_text);
$footnote_text .= "\n";
@@ -12605,8 +12612,9 @@ sub _prepare_converted_output_info($$$$)
}
}
if (!$fulltitle_tree and $global_commands->{'titlefont'}
- and $global_commands->{'titlefont'}->[0]->{'args'}
- and $global_commands->{'titlefont'}->[0]->{'args'}->[0]->{'contents'})
{
+ and $global_commands->{'titlefont'}->[0]->{'contents'}
+ and $global_commands->{'titlefont'}->[0]->{'contents'}->[0]
+ ->{'contents'}) {
$fulltitle_tree = $global_commands->{'titlefont'}->[0];
}
}
@@ -13544,8 +13552,8 @@ sub _convert($$;$)
$command_name, $element);
}
my $content_formatted = '';
- if ($element->{'contents'}) {
- if ($convert_to_latex and !$brace_commands{$command_name}) {
+ if ($element->{'contents'} and !$brace_commands{$command_name}) {
+ if ($convert_to_latex) {
# displaymath
$content_formatted
= Texinfo::Convert::LaTeX::convert_to_latex_math(undef,
@@ -13571,14 +13579,20 @@ sub _convert($$;$)
or $command_name eq 'smallquotation')
or $command_name eq 'float'
or $command_name eq 'cartouche') {
- if ($element->{'args'}) {
+ my $arguments_list;
+ if ($brace_commands{$command_name}) {
+ $arguments_list = $element->{'contents'};
+ } else {
+ $arguments_list = $element->{'args'};
+ }
+ if ($arguments_list) {
$args_formatted = [];
my @args_specification;
@args_specification = @{$html_default_commands_args{$command_name}}
if (defined($html_default_commands_args{$command_name}));
my $spec_nr = scalar(@args_specification);
my $arg_idx = -1;
- foreach my $arg (@{$element->{'args'}}) {
+ foreach my $arg (@{$arguments_list}) {
$arg_idx++;
my $arg_spec;
if ($arg_idx < $spec_nr) {
@@ -13716,8 +13730,8 @@ sub _convert($$;$)
my $content_formatted = '';
if ($type_name eq 'definfoenclose_command') {
- if ($element->{'args'}) {
- $content_formatted = $self->_convert($element->{'args'}->[0],
+ if ($element->{'contents'}) {
+ $content_formatted = $self->_convert($element->{'contents'}->[0],
"DEFINFOENCLOSE_ARG");
}
} elsif ($element->{'contents'}
diff --git a/tp/Texinfo/Convert/Info.pm b/tp/Texinfo/Convert/Info.pm
index b0d0f2395b..90279539b7 100644
--- a/tp/Texinfo/Convert/Info.pm
+++ b/tp/Texinfo/Convert/Info.pm
@@ -544,7 +544,7 @@ sub format_ref($$$$)
my $formatter = shift;
my @args;
- for my $arg (@{$element->{'args'}}) {
+ for my $arg (@{$element->{'contents'}}) {
if (defined $arg->{'contents'}) {
push @args, $arg;
} else {
@@ -553,7 +553,7 @@ sub format_ref($$$$)
}
$args[0] = {'text' => ''} if (!defined($args[0]));
- my $node_arg = $element->{'args'}->[0];
+ my $node_arg = $element->{'contents'}->[0];
# normalize node name, to get a ref with the right formatting
# NOTE as a consequence, the line numbers appearing in case of errors
@@ -963,23 +963,23 @@ sub format_image_element($$)
my $lines_count = 0;
- if ($element->{'args'}
- and $element->{'args'}->[0]->{'contents'}) {
+ if ($element->{'contents'}
+ and $element->{'contents'}->[0]->{'contents'}) {
Texinfo::Convert::Text::set_options_code(
$self->{'convert_text_options'});
my $basefile = Texinfo::Convert::Text::convert_to_text(
- $element->{'args'}->[0],
+ $element->{'contents'}->[0],
$self->{'convert_text_options'});
Texinfo::Convert::Text::reset_options_code(
$self->{'convert_text_options'});
- if (defined($element->{'args'}->[4])
- and $element->{'args'}->[4]->{'contents'}
- and @{$element->{'args'}->[4]->{'contents'}}) {
+ if (defined($element->{'contents'}->[4])
+ and $element->{'contents'}->[4]->{'contents'}
+ and @{$element->{'contents'}->[4]->{'contents'}}) {
Texinfo::Convert::Text::set_options_code(
$self->{'convert_text_options'});
my $extension = Texinfo::Convert::Text::convert_to_text(
- $element->{'args'}->[4],
+ $element->{'contents'}->[4],
$self->{'convert_text_options'});
Texinfo::Convert::Text::reset_options_code(
$self->{'convert_text_options'});
@@ -1004,11 +1004,11 @@ sub format_image_element($$)
# remove last end of line
chomp($text) if (defined($text));
my $alt;
- if (defined($element->{'args'}->[3])
- and $element->{'args'}->[3]->{'contents'}
- and @{$element->{'args'}->[3]->{'contents'}}) {
+ if (defined($element->{'contents'}->[3])
+ and $element->{'contents'}->[3]->{'contents'}
+ and @{$element->{'contents'}->[3]->{'contents'}}) {
$alt = Texinfo::Convert::Text::convert_to_text(
- $element->{'args'}->[3],
+ $element->{'contents'}->[3],
$self->{'convert_text_options'});
}
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 85d440b826..6cb6df0d25 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -1859,7 +1859,7 @@ sub _begin_document($)
$result .= "\\end{titlepage}\n";
} else {
my $element = $global_commands->{'shorttitlepage'};
- my $title_text = _title_font($self, $element);
+ my $title_text = _title($self, $element);
$result .= "\\begin{titlepage}\n";
$result .= "{\\raggedright $title_text}\n";
# first newpage ends the title page, phantom and second newpage
@@ -2315,7 +2315,7 @@ sub _close_preformatted_stack($$)
return $result;
}
-sub _title_font($$)
+sub _title($$)
{
my $self = shift;
my $element = shift;
@@ -2330,6 +2330,21 @@ sub _title_font($$)
return '';
}
+sub _title_font($$)
+{
+ my $self = shift;
+ my $element = shift;
+
+ if ($element->{'contents'} and $element->{'contents'}->[0]->{'contents'}) {
+ # in Texinfo TeX seems a bit smaller, but LARGE seems too small
+ my $result = "{\\huge \\bfseries ";
+ $result .= _convert($self, $element->{'contents'}->[0]);
+ $result .= '}';
+ return $result;
+ }
+ return '';
+}
+
sub _set_environment_options($$$)
{
my $self = shift;
@@ -2539,9 +2554,9 @@ sub _index_entry($$)
my $seeresult = '';
foreach my $seecommand (('seeentry', 'seealso')) {
if ($element->{'extra'}->{$seecommand}
- and $element->{'extra'}->{$seecommand}->{'args'}->[0]) {
+ and $element->{'extra'}->{$seecommand}->{'contents'}->[0]) {
my $seeconverted = _convert($self,
- $element->{'extra'}->{$seecommand}->{'args'}->[0]);
+ $element->{'extra'}->{$seecommand}->{'contents'}->[0]);
$seeresult = '|'.$LaTeX_see_index_commands_text{$seecommand}.'{'
.$seeconverted.'}';
last;
@@ -3015,14 +3030,14 @@ sub _convert($$)
if ($LaTeX_accent_commands{$command_format_context}->{$cmdname}) {
$result
.=
"\\$LaTeX_accent_commands{$command_format_context}->{$cmdname}\{";
- if ($element->{'args'}) {
- $accent_arg = _convert($self, $element->{'args'}->[0]);
+ if ($element->{'contents'}) {
+ $accent_arg = _convert($self, $element->{'contents'}->[0]);
}
$result .= $accent_arg;
$result .= '}';
} elsif ($cmdname eq 'dotless') {
- if ($element->{'args'}) {
- $accent_arg = _convert($self, $element->{'args'}->[0]);
+ if ($element->{'contents'}) {
+ $accent_arg = _convert($self, $element->{'contents'}->[0]);
}
if ($accent_arg eq 'i' or $accent_arg eq 'j') {
if ($command_format_context eq 'cmd_math') {
@@ -3042,10 +3057,10 @@ sub _convert($$)
$result
.=
"\\textsl{\\$LaTeX_accent_commands{'cmd_text'}->{$cmdname}\{";
# we do not want accents within to be math accents
- if ($element->{'args'}) {
+ if ($element->{'contents'}) {
push @{$self->{'formatting_context'}->[-1]->{'text_context'}},
'ctx_text';
- $accent_arg = _convert($self, $element->{'args'}->[0]);
+ $accent_arg = _convert($self, $element->{'contents'}->[0]);
my $old_context
= pop @{$self->{'formatting_context'}->[-1]->{'text_context'}};
}
@@ -3100,8 +3115,8 @@ sub _convert($$)
}
$result .= "$LaTeX_style_command\{";
}
- if ($element->{'args'}) {
- $result .= _convert($self, $element->{'args'}->[0]);
+ if ($element->{'contents'}) {
+ $result .= _convert($self, $element->{'contents'}->[0]);
}
if ($LaTeX_style_brace_commands{$command_format_context}
->{$formatted_cmdname}) {
@@ -3121,9 +3136,10 @@ sub _convert($$)
$result .= _convert_def_line($self, $element);
} elsif ($cmdname eq 'dmn') {
$result .= '\\thinspace ';
- if ($element->{'args'}) {
- $result .= _convert($self, $element->{'args'}->[0]);
+ if ($element->{'contents'}) {
+ $result .= _convert($self, $element->{'contents'}->[0]);
}
+ return $result;
} elsif ($cmdname eq 'verb') {
# NOTE \verb is forbidden in other macros in LaTeX. We do
# not enforce this constraint here, nor warn. Checking
@@ -3142,8 +3158,8 @@ sub _convert($$)
my @lines;
push @{$self->{'formatting_context'}->[-1]->{'text_context'}}, 'ctx_raw';
- if ($element->{'args'}) {
- $contents = _convert($self, $element->{'args'}->[0]);
+ if ($element->{'contents'}) {
+ $contents = _convert($self, $element->{'contents'}->[0]);
@lines = split /\n/, $contents, -1;
}
my $old_context
@@ -3169,8 +3185,8 @@ sub _convert($$)
$result .= join "\\\\\n", @lines_out;
return $result;
} elsif ($cmdname eq 'image') {
- if ($element->{'args'}
- and $element->{'args'}->[0]->{'contents'}) {
+ if ($element->{'contents'}
+ and $element->{'contents'}->[0]->{'contents'}) {
# distinguish text basefile used to find the file and
# converted basefile with special characters escaped
Texinfo::Convert::Text::set_options_code(
@@ -3178,7 +3194,7 @@ sub _convert($$)
Texinfo::Convert::Text::set_options_encoding_if_not_ascii($self,
$self->{'convert_text_options'});
my $basefile = Texinfo::Convert::Text::convert_to_text(
- $element->{'args'}->[0],
+ $element->{'contents'}->[0],
$self->{'convert_text_options'});
Texinfo::Convert::Text::reset_options_code(
$self->{'convert_text_options'});
@@ -3218,14 +3234,14 @@ sub _convert($$)
$converted_basefile =~ s/([%{}\\])/\\$1/g;
my $image_file = $converted_basefile;
my $width;
- if ((@{$element->{'args'}} >= 2)
- and defined($element->{'args'}->[1])
- and $element->{'args'}->[1]->{'contents'}
- and @{$element->{'args'}->[1]->{'contents'}}){
+ if ((@{$element->{'contents'}} >= 2)
+ and defined($element->{'contents'}->[1])
+ and $element->{'contents'}->[1]->{'contents'}
+ and @{$element->{'contents'}->[1]->{'contents'}}){
push @{$self->{'formatting_context'}->[-1]->{'text_context'}},
'ctx_raw';
$width = _convert($self, {'contents'
- => $element->{'args'}->[1]->{'contents'}});
+ => $element->{'contents'}->[1]->{'contents'}});
my $old_context
= pop @{$self->{'formatting_context'}->[-1]->{'text_context'}};
die if ($old_context ne 'ctx_raw');
@@ -3234,14 +3250,14 @@ sub _convert($$)
}
}
my $height;
- if ((@{$element->{'args'}} >= 3)
- and defined($element->{'args'}->[2])
- and $element->{'args'}->[2]->{'contents'}
- and @{$element->{'args'}->[2]->{'contents'}}) {
+ if ((@{$element->{'contents'}} >= 3)
+ and defined($element->{'contents'}->[2])
+ and $element->{'contents'}->[2]->{'contents'}
+ and @{$element->{'contents'}->[2]->{'contents'}}) {
push @{$self->{'formatting_context'}->[-1]->{'text_context'}},
'ctx_raw';
$height = _convert($self, {'contents'
- => $element->{'args'}->[2]->{'contents'}});
+ => $element->{'contents'}->[2]->{'contents'}});
my $old_context
= pop @{$self->{'formatting_context'}->[-1]->{'text_context'}};
die if ($old_context ne 'ctx_raw');
@@ -3267,18 +3283,18 @@ sub _convert($$)
}
return $result;
} elsif ($cmdname eq 'email') {
- if ($element->{'args'}) {
+ if ($element->{'contents'}) {
my $name;
my $converted_name;
my $email_arg;
my $email_text;
- if (scalar (@{$element->{'args'}}) == 2
- and $element->{'args'}->[1]->{'contents'}) {
- $name = $element->{'args'}->[1];
+ if (scalar (@{$element->{'contents'}}) == 2
+ and $element->{'contents'}->[1]->{'contents'}) {
+ $name = $element->{'contents'}->[1];
$converted_name = _convert($self, $name);
}
- if ($element->{'args'}->[0]->{'contents'}) {
- $email_arg = $element->{'args'}->[0];
+ if ($element->{'contents'}->[0]->{'contents'}) {
+ $email_arg = $element->{'contents'}->[0];
Texinfo::Convert::Text::set_options_code(
$self->{'convert_text_options'});
$email_text
@@ -3298,13 +3314,13 @@ sub _convert($$)
}
return $result;
} elsif ($cmdname eq 'uref' or $cmdname eq 'url') {
- if ($element->{'args'}) {
- if (scalar(@{$element->{'args'}}) == 3
- and $element->{'args'}->[2]->{'contents'}) {
+ if ($element->{'contents'}) {
+ if (scalar(@{$element->{'contents'}}) == 3
+ and $element->{'contents'}->[2]->{'contents'}) {
unshift @{$self->{'current_contents'}->[-1]},
- $element->{'args'}->[2];
- } elsif ($element->{'args'}->[0]->{'contents'}) {
- my $url_arg = $element->{'args'}->[0];
+ $element->{'contents'}->[2];
+ } elsif ($element->{'contents'}->[0]->{'contents'}) {
+ my $url_arg = $element->{'contents'}->[0];
Texinfo::Convert::Text::set_options_code(
$self->{'convert_text_options'});
my $url_text = $self->_protect_url(
@@ -3312,9 +3328,9 @@ sub _convert($$)
$self->{'convert_text_options'}));
Texinfo::Convert::Text::reset_options_code(
$self->{'convert_text_options'});
- if (scalar(@{$element->{'args'}}) == 2
- and $element->{'args'}->[1]->{'contents'}) {
- my $description_text = _convert($self, $element->{'args'}->[1]);
+ if (scalar(@{$element->{'contents'}}) == 2
+ and $element->{'contents'}->[1]->{'contents'}) {
+ my $description_text = _convert($self,
$element->{'contents'}->[1]);
my $text = $self->cdt_string('{text} ({url})',
{'text' => $description_text, 'url' =>
"\\nolinkurl{$url_text}"});
$result .= "\\href{$url_text}{$text}";
@@ -3323,42 +3339,42 @@ sub _convert($$)
$result .= "\\url{$url_text}";
return $result;
}
- } elsif (scalar(@{$element->{'args'}}) == 2
- and defined($element->{'args'}->[1])
- and $element->{'args'}->[1]->{'contents'}
- and @{$element->{'args'}->[1]->{'contents'}}) {
+ } elsif (scalar(@{$element->{'contents'}}) == 2
+ and defined($element->{'contents'}->[1])
+ and $element->{'contents'}->[1]->{'contents'}
+ and @{$element->{'contents'}->[1]->{'contents'}}) {
unshift @{$self->{'current_contents'}->[-1]},
- {'contents' => $element->{'args'}->[1]->{'contents'}};
+ {'contents' => $element->{'contents'}->[1]->{'contents'}};
}
}
return $result;
} elsif ($cmdname eq 'footnote') {
_push_new_context($self, 'footnote');
$result .= '\footnote{';
- if ($element->{'args'}) {
- $result .= $self->_convert($element->{'args'}->[0]);
+ if ($element->{'contents'}) {
+ $result .= $self->_convert($element->{'contents'}->[0]);
}
$result .= '}';
_pop_context($self);
return $result;
} elsif ($cmdname eq 'anchor') {
- if ($element->{'args'}) {
+ if ($element->{'contents'}) {
my $anchor_label
- = _tree_anchor_label($element->{'args'}->[0]->{'contents'});
+ = _tree_anchor_label($element->{'contents'}->[0]->{'contents'});
$result .= "\\label{$anchor_label}%\n";
}
return $result;
} elsif ($ref_commands{$cmdname}) {
- if ($element->{'args'} and scalar(@{$element->{'args'}})) {
+ if ($element->{'contents'} and scalar(@{$element->{'contents'}})) {
my @args;
- for my $arg (@{$element->{'args'}}) {
+ for my $arg (@{$element->{'contents'}}) {
if (defined $arg->{'contents'} and @{$arg->{'contents'}}) {
push @args, $arg;
} else {
push @args, undef;
}
}
- my $node_arg = $element->{'args'}->[0];
+ my $node_arg = $element->{'contents'}->[0];
if (($cmdname eq 'link' or $cmdname eq 'inforef')
and scalar(@args) == 3) {
$args[3] = $args[2]; # use as the manual argument
@@ -3629,26 +3645,26 @@ sub _convert($$)
}
return $result;
} elsif ($explained_commands{$cmdname}) {
- if ($element->{'args'}
- and $element->{'args'}->[0]->{'contents'}) {
+ if ($element->{'contents'}
+ and $element->{'contents'}->[0]->{'contents'}) {
# in abbr spaces never end a sentence.
my $argument;
if ($cmdname eq 'abbr') {
$argument = {'type' => '_dot_not_end_sentence',
- 'contents' => [$element->{'args'}->[0]]};
+ 'contents' => [$element->{'contents'}->[0]]};
} else {
# TODO in TeX, acronym is in a smaller font (1pt less).
- $argument = $element->{'args'}->[0];
+ $argument = $element->{'contents'}->[0];
}
- if (scalar (@{$element->{'args'}}) == 2
- and defined($element->{'args'}->[-1])
- and $element->{'args'}->[-1]->{'contents'}
- and @{$element->{'args'}->[-1]->{'contents'}}) {
+ if (scalar (@{$element->{'contents'}}) == 2
+ and defined($element->{'contents'}->[-1])
+ and $element->{'contents'}->[-1]->{'contents'}
+ and @{$element->{'contents'}->[-1]->{'contents'}}) {
my $prepended
= $self->cdt('{abbr_or_acronym} ({explanation})',
{'abbr_or_acronym' => $argument,
'explanation'
- => $element->{'args'}->[-1]});
+ => $element->{'contents'}->[-1]});
$result .= _convert($self, $prepended);
} else {
$result .= _convert($self, $argument);
@@ -3664,16 +3680,16 @@ sub _convert($$)
->{$element->{'extra'}->{'format'}})) {
$arg_index = 2;
}
- if (scalar(@{$element->{'args'}}) > $arg_index
- and defined($element->{'args'}->[$arg_index])
- and $element->{'args'}->[$arg_index]->{'contents'}
- and scalar(@{$element->{'args'}->[$arg_index]->{'contents'}})) {
+ if (scalar(@{$element->{'contents'}}) > $arg_index
+ and defined($element->{'contents'}->[$arg_index])
+ and $element->{'contents'}->[$arg_index]->{'contents'}
+ and scalar(@{$element->{'contents'}->[$arg_index]->{'contents'}})) {
if ($cmdname eq 'inlineraw') {
push @{$self->{'formatting_context'}->[-1]->{'text_context'}},
'ctx_raw';
}
$result .= _convert($self, {'contents'
- => $element->{'args'}->[$arg_index]->{'contents'}});
+ => $element->{'contents'}->[$arg_index]->{'contents'}});
if ($cmdname eq 'inlineraw') {
my $old_context
= pop @{$self->{'formatting_context'}->[-1]->{'text_context'}};
@@ -3686,9 +3702,9 @@ sub _convert($$)
if (not exists($block_commands{$cmdname})) {
push @{$self->{'formatting_context'}->[-1]->{'math_style'}},
'one-line';
if ($cmdname eq 'math') {
- if ($element->{'args'}) {
+ if ($element->{'contents'}) {
$result .= '$';
- $result .= _convert($self, $element->{'args'}->[0]);
+ $result .= _convert($self, $element->{'contents'}->[0]);
$result .= '$';
}
}
@@ -3729,9 +3745,9 @@ sub _convert($$)
}
}
my $caption_text = '';
- if ($element->{'args'}->[0]->{'contents'}) {
+ if ($element->{'contents'}->[0]->{'contents'}) {
_push_new_context($self, 'latex_caption');
- $caption_text = _convert($self, $element->{'args'}->[0]);
+ $caption_text = _convert($self, $element->{'contents'}->[0]);
_pop_context($self);
}
@@ -3752,9 +3768,10 @@ sub _convert($$)
}
if (defined($shortcaption)
- and $shortcaption->{'args'}->[0]->{'contents'}) {
+ and $shortcaption->{'contents'}->[0]->{'contents'}) {
_push_new_context($self, 'latex_shortcaption');
- my $shortcaption_text = _convert($self, $shortcaption->{'args'}->[0]);
+ my $shortcaption_text
+ = _convert($self, $shortcaption->{'contents'}->[0]);
_pop_context($self);
$result .= '['.$shortcaption_text.']';
}
@@ -3764,10 +3781,10 @@ sub _convert($$)
$result .= _title_font($self, $element);
return $result;
} elsif ($cmdname eq 'U') {
- if ($element->{'args'}
- and $element->{'args'}->[0]->{'contents'}
- and $element->{'args'}->[0]->{'contents'}->[0]->{'text'}) {
- my $arg_text = $element->{'args'}->[0]->{'contents'}->[0]->{'text'};
+ if ($element->{'contents'}
+ and $element->{'contents'}->[0]->{'contents'}
+ and $element->{'contents'}->[0]->{'contents'}->[0]->{'text'}) {
+ my $arg_text =
$element->{'contents'}->[0]->{'contents'}->[0]->{'text'};
if (defined($arg_text)) {
# Syntactic checks on the value were already done in Parser.pm,
@@ -3797,7 +3814,7 @@ sub _convert($$)
} elsif ($cmdname eq 'value') {
my $expansion = $self->cdt('@{No value for `{value}\'@}',
{'value'
- => $element->{'args'}->[0]});
+ => $element->{'contents'}->[0]});
$expansion = {'type' => 'paragraph',
'contents' => [$expansion]};
$result .= _convert($self, $expansion);
@@ -4149,7 +4166,7 @@ sub _convert($$)
}
return $result;
} elsif ($cmdname eq 'title') {
- my $title_text = _title_font($self, $element);
+ my $title_text = _title($self, $element);
# FIXME In Texinfo TeX the interline space seems more even
$result .= "{\\raggedright $title_text}\n";
# same formatting for the rule as in Texinfo TeX
diff --git a/tp/Texinfo/Convert/NodeNameNormalization.pm
b/tp/Texinfo/Convert/NodeNameNormalization.pm
index d8ad62ec12..f58212b3cb 100644
--- a/tp/Texinfo/Convert/NodeNameNormalization.pm
+++ b/tp/Texinfo/Convert/NodeNameNormalization.pm
@@ -294,8 +294,8 @@ sub _convert($)
return $result;
# commands with braces
} elsif ($accent_commands{$cmdname}) {
- return '' if (!$element->{'args'});
- my $accent_text = _convert($element->{'args'}->[0]);
+ return '' if (!$element->{'contents'});
+ my $accent_text = _convert($element->{'contents'}->[0]);
my $accented_char
= Texinfo::Convert::Unicode::unicode_accent($accent_text,
$element);
@@ -313,20 +313,20 @@ sub _convert($)
@args_try_order = (0, 1, 2, 4, 3);
}
foreach my $index (@args_try_order) {
- if (defined($element->{'args'}->[$index])) {
- my $text = _convert($element->{'args'}->[$index]);
+ if (defined($element->{'contents'}->[$index])) {
+ my $text = _convert($element->{'contents'}->[$index]);
return $text if (defined($text) and $text =~ /\S/);
}
}
return '';
# Here all the commands with args are processed, if they have
# 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_container'
- or $element->{'args'}->[0]->{'type'} eq 'brace_arg'))
+ } elsif ($element->{'contents'} and $element->{'contents'}->[0]
+ and (($element->{'contents'}->[0]->{'type'}
+ and ($element->{'contents'}->[0]->{'type'} eq
'brace_container'
+ or $element->{'contents'}->[0]->{'type'} eq 'brace_arg'))
or $cmdname eq 'math')) {
- return _convert($element->{'args'}->[0]);
+ return _convert($element->{'contents'}->[0]);
}
}
my $result = '';
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 2a6f3674bd..653bd3b191 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -199,7 +199,8 @@ foreach my $nobrace_command (keys(%nobrace_commands)) {
my %ignored_commands = (%ignored_line_commands, %ignored_nobrace_commands);
foreach my $ignored_brace_commands ('caption', 'shortcaption',
- 'hyphenation', 'sortas') {
+ 'hyphenation', 'sortas', 'errormsg',
+ 'seeentry', 'seealso') {
$ignored_commands{$ignored_brace_commands} = 1;
}
@@ -1316,7 +1317,7 @@ sub process_footnotes($;$)
'contents' => [$label_element,
{'text' => $footnote_anchor_postfix}]};
$self->add_location({'cmdname' => 'anchor',
- 'args' => [$footnote_anchor_arg],
+ 'contents' => [$footnote_anchor_arg],
'extra' => {'is_target' => 1,
'normalized'
=> $node_element->{'extra'}->{'normalized'}.$footnote_anchor_postfix},
@@ -1338,8 +1339,8 @@ sub process_footnotes($;$)
_stream_output($self, $footnote_text);
my $footnote_element = $footnote_info->{'footnote_element'};
- if ($footnote_element->{'args'}) {
- _convert($self, $footnote_element->{'args'}->[0]);
+ if ($footnote_element->{'contents'}) {
+ _convert($self, $footnote_element->{'contents'}->[0]);
}
_add_newline_if_needed($self);
@@ -1800,9 +1801,9 @@ sub process_printindex($$;$)
my $referred_tree = {};
$referred_tree->{'type'} = '_code'
if ($indices_information->{$entry_index_name}->{'in_code'});
- if ($referred_entry->{'args'} and $referred_entry->{'args'}->[0]
- and $referred_entry->{'args'}->[0]->{'contents'}) {
- $referred_tree->{'contents'} = [$referred_entry->{'args'}->[0]];
+ if ($referred_entry->{'contents'} and $referred_entry->{'contents'}->[0]
+ and $referred_entry->{'contents'}->[0]->{'contents'}) {
+ $referred_tree->{'contents'} = [$referred_entry->{'contents'}->[0]];
}
# indent with the same width as '* ', but do not use * such that the
@@ -1962,14 +1963,14 @@ sub format_ref($$$$)
my $formatter = shift;
my @args;
- for my $arg (@{$element->{'args'}}) {
+ for my $arg (@{$element->{'contents'}}) {
if (defined $arg->{'contents'}) {
push @args, $arg;
} else {
push @args, undef;
}
}
- my $node_arg = $element->{'args'}->[0];
+ my $node_arg = $element->{'contents'}->[0];
# normalize node name, to get a ref with the right formatting
# NOTE as a consequence, the line numbers appearing in case of errors
@@ -2210,10 +2211,10 @@ sub image_formatted_text($$$$)
my $result;
if (defined($text)) {
$result = $text;
- } elsif (scalar(@{$element->{'args'}}) >= 4
- and $element->{'args'}->[3]->{'contents'}) {
+ } elsif (scalar(@{$element->{'contents'}}) >= 4
+ and $element->{'contents'}->[3]->{'contents'}) {
$result = '[' .Texinfo::Convert::Text::convert_to_text(
- $element->{'args'}->[3], $self->{'convert_text_options'}) .']';
+ $element->{'contents'}->[3], $self->{'convert_text_options'}) .']';
} else {
$self->plaintext_line_warn($self, sprintf(__(
"could not find \@image file `%s.txt' nor alternate text"),
@@ -2227,12 +2228,12 @@ sub format_image_element($$)
{
my ($self, $element) = @_;
- if ($element->{'args'}
- and $element->{'args'}->[0]->{'contents'}) {
+ if ($element->{'contents'}
+ and $element->{'contents'}->[0]->{'contents'}) {
Texinfo::Convert::Text::set_options_code(
$self->{'convert_text_options'});
my $basefile = Texinfo::Convert::Text::convert_to_text(
- $element->{'args'}->[0],
+ $element->{'contents'}->[0],
$self->{'convert_text_options'});
Texinfo::Convert::Text::reset_options_code(
$self->{'convert_text_options'});
@@ -2971,12 +2972,13 @@ sub _convert($$)
add_next($formatter->{'container'}, $text_before, 1),
$formatter->{'container'})
if ($text_before ne '');
- if ($element->{'args'}) {
- _convert($self, $element->{'args'}->[0]);
+ if ($element->{'contents'}) {
+ _convert($self, $element->{'contents'}->[0]);
if ($cmdname eq 'strong'
- and $element->{'args'}->[0]->{'contents'}
- and defined($element->{'args'}->[0]->{'contents'}->[0]->{'text'})
- and $element->{'args'}->[0]->{'contents'}->[0]->{'text'}
+ and $element->{'contents'}->[0]->{'contents'}
+ and defined($element->{'contents'}->[0]->{'contents'}->[0]
+ ->{'text'})
+ and $element->{'contents'}->[0]->{'contents'}->[0]->{'text'}
=~ /^Note\s/i
and $self->format_warn_strong_note()) {
$self->plaintext_line_warn($self, __(
@@ -3027,16 +3029,16 @@ sub _convert($$)
}
return;
} elsif ($cmdname eq 'link') {
- if ($element->{'args'}) {
+ if ($element->{'contents'}) {
# Use arg 2 if present, otherwise use arg 1. Do not produce
# functional link in Info/plaintext output.
my $text_arg;
- if (scalar(@{$element->{'args'}}) >= 2
- and $element->{'args'}->[1]->{'contents'}) {
- $text_arg = $element->{'args'}->[1];
- } elsif ($element->{'args'}->[0]->{'contents'}) {
- $text_arg = $element->{'args'}->[0];
+ if (scalar(@{$element->{'contents'}}) >= 2
+ and $element->{'contents'}->[1]->{'contents'}) {
+ $text_arg = $element->{'contents'}->[1];
+ } elsif ($element->{'contents'}->[0]->{'contents'}) {
+ $text_arg = $element->{'contents'}->[0];
}
if (defined($text_arg)) {
_convert($self, $text_arg);
@@ -3046,7 +3048,7 @@ sub _convert($$)
} elsif ($ref_commands{$cmdname}) {
# no args may happen with bogus @-commands without argument, maybe only
# at the end of a document
- if ($element->{'args'}) {
+ if ($element->{'contents'}) {
$self->format_ref($cmdname, $element, $formatter);
}
return;
@@ -3112,15 +3114,15 @@ sub _convert($$)
}
return;
} elsif ($cmdname eq 'email') {
- if ($element->{'args'}) {
+ if ($element->{'contents'}) {
my $name;
my $email;
- if (scalar (@{$element->{'args'}}) >= 2
- and $element->{'args'}->[1]->{'contents'}) {
- $name = $element->{'args'}->[1];
+ if (scalar (@{$element->{'contents'}}) >= 2
+ and $element->{'contents'}->[1]->{'contents'}) {
+ $name = $element->{'contents'}->[1];
}
- if ($element->{'args'}->[0]->{'contents'}) {
- $email = $element->{'args'}->[0];
+ if ($element->{'contents'}->[0]->{'contents'}) {
+ $email = $element->{'contents'}->[0];
}
my $email_tree;
if ($name and $email) {
@@ -3139,28 +3141,28 @@ sub _convert($$)
return;
} elsif ($cmdname eq 'uref' or $cmdname eq 'url') {
my $inserted;
- if ($element->{'args'}) {
- if (scalar(@{$element->{'args'}}) == 3
- and $element->{'args'}->[2]->{'contents'}) {
+ if ($element->{'contents'}) {
+ if (scalar(@{$element->{'contents'}}) == 3
+ and $element->{'contents'}->[2]->{'contents'}) {
$inserted = {'type' => '_stop_upper_case',
- 'contents' => [$element->{'args'}->[2]]};
- } elsif ($element->{'args'}->[0]->{'contents'}) {
+ 'contents' => [$element->{'contents'}->[2]]};
+ } elsif ($element->{'contents'}->[0]->{'contents'}) {
# no mangling of --- and similar in url.
my $url = {'type' => '_stop_upper_case',
'contents' => [
{'type' => '_code',
- 'contents' => [$element->{'args'}->[0]]}]};
- if (scalar(@{$element->{'args'}}) == 2
- and $element->{'args'}->[1]->{'contents'}) {
+ 'contents' => [$element->{'contents'}->[0]]}]};
+ if (scalar(@{$element->{'contents'}}) == 2
+ and $element->{'contents'}->[1]->{'contents'}) {
$inserted = $self->cdt('{text} ({url})',
- {'text' => $element->{'args'}->[1],
+ {'text' => $element->{'contents'}->[1],
'url' => $url });
} else {
$inserted = $self->cdt('@t{<{url}>}', {'url' => $url});
}
- } elsif (scalar(@{$element->{'args'}}) == 2
- and $element->{'args'}->[1]->{'contents'}) {
- $inserted = $element->{'args'}->[1];
+ } elsif (scalar(@{$element->{'contents'}}) == 2
+ and $element->{'contents'}->[1]->{'contents'}) {
+ $inserted = $element->{'contents'}->[1];
}
}
if ($inserted) {
@@ -3191,7 +3193,7 @@ sub _convert($$)
_convert($self, {'contents' =>
[{'text' => ' ('},
{'cmdname' => 'pxref',
- 'args' => [
+ 'contents' => [
{'type' => 'brace_arg',
'contents' => [
$self->{'current_node'}->{'args'}->[0],
@@ -3210,21 +3212,21 @@ sub _convert($$)
_anchor($self, $element);
return;
} elsif ($explained_commands{$cmdname}) {
- if ($element->{'args'}
- and $element->{'args'}->[0]->{'contents'}) {
+ if ($element->{'contents'}
+ and $element->{'contents'}->[0]->{'contents'}) {
# in abbr spaces never end a sentence.
my $argument;
if ($cmdname eq 'abbr') {
$argument = {'type' => 'frenchspacing',
- 'contents' => [$element->{'args'}->[0]]};
+ 'contents' => [$element->{'contents'}->[0]]};
} else {
- $argument = $element->{'args'}->[0];
+ $argument = $element->{'contents'}->[0];
}
- if (scalar(@{$element->{'args'}}) >= 2
- and $element->{'args'}->[1]->{'contents'}) {
+ if (scalar(@{$element->{'contents'}}) >= 2
+ and $element->{'contents'}->[1]->{'contents'}) {
my $inserted = $self->cdt('{abbr_or_acronym} ({explanation})',
{'abbr_or_acronym' => $argument,
- 'explanation' => $element->{'args'}->[1]});
+ 'explanation' => $element->{'contents'}->[1]});
_convert($self, $inserted);
return;
} else {
@@ -3245,11 +3247,11 @@ sub _convert($$)
->{$element->{'extra'}->{'format'}})) {
$arg_index = 2;
}
- if (scalar(@{$element->{'args'}}) > $arg_index
- and defined($element->{'args'}->[$arg_index])
- and $element->{'args'}->[$arg_index]->{'contents'}
- and scalar(@{$element->{'args'}->[$arg_index]->{'contents'}})) {
- my $arg = $element->{'args'}->[$arg_index];
+ if (scalar(@{$element->{'contents'}}) > $arg_index
+ and defined($element->{'contents'}->[$arg_index])
+ and $element->{'contents'}->[$arg_index]->{'contents'}
+ and scalar(@{$element->{'contents'}->[$arg_index]->{'contents'}})) {
+ my $arg = $element->{'contents'}->[$arg_index];
my $argument;
if ($cmdname eq 'inlineraw') {
$argument = {'type' => '_stop_upper_case',
@@ -3263,7 +3265,7 @@ sub _convert($$)
return;
# condition should actually be that the $cmdname is inline
} elsif ($math_commands{$cmdname}) {
- if ($element->{'args'}) {
+ if ($element->{'contents'}) {
push @{$self->{'context'}}, $cmdname;
if ($self->{'elements_images'}
and $self->{'elements_images'}->{$element}) {
@@ -3282,7 +3284,7 @@ sub _convert($$)
}
_convert($self, {'type' => 'frenchspacing',
'contents' => [{'type' => '_code',
- 'contents' => [$element->{'args'}->[0]]}]});
+ 'contents' => [$element->{'contents'}->[0]]}]});
if ($self->{'elements_images'}
and $self->{'elements_images'}->{$element}) {
# flush @math, including spaces
@@ -3304,11 +3306,11 @@ sub _convert($$)
}
return;
} elsif ($cmdname eq 'titlefont') {
- if ($element->{'args'}) {
- my $result = _text_heading($self,
+ if ($element->{'contents'}) {
+ my $result = _text_heading($self,
{'extra' => {'section_level' => 0},
'cmdname' => 'titlefont'},
- $element->{'args'}->[0],
+ $element->{'contents'}->[0],
$self->get_conf('NUMBER_SECTIONS'),
($self->{'format_context'}->[-1]->{'indent_level'}) *$indent_length);
$result =~ s/\n$//; # final newline has its own tree element
@@ -3317,10 +3319,11 @@ sub _convert($$)
}
return;
} elsif ($cmdname eq 'U') {
- if ($element->{'args'}
- and $element->{'args'}->[0]->{'contents'}
- and $element->{'args'}->[0]->{'contents'}->[0]->{'text'}) {
- my $arg_text = $element->{'args'}->[0]->{'contents'}->[0]->{'text'};
+ if ($element->{'contents'}
+ and $element->{'contents'}->[0]->{'contents'}
+ and $element->{'contents'}->[0]->{'contents'}->[0]->{'text'}) {
+ my $arg_text
+ = $element->{'contents'}->[0]->{'contents'}->[0]->{'text'};
if (defined($arg_text)) {
# Syntactic checks on the value were already done in Parser.pm,
@@ -3348,7 +3351,7 @@ sub _convert($$)
return;
} elsif ($cmdname eq 'value') {
my $expansion = $self->cdt('@{No value for `{value}\'@}',
- {'value' => $element->{'args'}->[0]});
+ {'value' => $element->{'contents'}->[0]});
my $piece;
if ($formatter->{'_top_formatter'}) {
$piece = {'type' => 'paragraph',
@@ -3750,11 +3753,11 @@ sub _convert($$)
} elsif ($float->{'extra'}->{'caption'}) {
$caption = $float->{'extra'}->{'caption'};
}
- if ($caption and $caption->{'args'}
- and $caption->{'args'}->[0]->{'contents'}) {
+ if ($caption and $caption->{'contents'}
+ and $caption->{'contents'}->[0]->{'contents'}) {
push @{$self->{'context'}}, 'listoffloats';
$self->{'multiple_pass'} = 1;
- my $caption_arg = $caption->{'args'}->[0];
+ my $caption_arg = $caption->{'contents'}->[0];
# we do not want to start a new paragraph formatter so
# we iterate over the contents of a paragraph rather than
@@ -4350,7 +4353,7 @@ sub _convert($$)
}
if ($caption) {
$self->{'format_context'}->[-1]->{'paragraph_count'} = 0;
- my $tree = $caption->{'args'}->[0];
+ my $tree = $caption->{'contents'}->[0];
_convert($self, $tree);
}
}
diff --git a/tp/Texinfo/Convert/Texinfo.pm b/tp/Texinfo/Convert/Texinfo.pm
index a8d8b248ea..3488311dc7 100644
--- a/tp/Texinfo/Convert/Texinfo.pm
+++ b/tp/Texinfo/Convert/Texinfo.pm
@@ -204,6 +204,12 @@ sub _convert_to_texinfo($)
if ($element->{'cmdname'}
or ($element->{'type'} and $element->{'type'} eq 'def_line')) {
$result .= _expand_cmd_args_to_texi($element);
+ if ($element->{'cmdname'}
+ and (exists($brace_commands{$element->{'cmdname'}})
+ or ($element->{'type'}
+ and $element->{'type'} eq 'definfoenclose_command'))) {
+ return $result;
+ }
} else {
if ($element->{'type'}
and ($element->{'type'} eq 'bracketed_arg'
@@ -257,16 +263,6 @@ sub _expand_cmd_args_to_texi($) {
if $cmd->{'info'} and $cmd->{'info'}->{'spaces_before_argument'};
$result .= $cmd->{'info'}->{'arg_line'};
} elsif ($cmd->{'args'}) {
- my $braces;
- $braces = 1 if (scalar(@{$cmd->{'args'}})
- and ($cmd->{'args'}->[0]->{'type'}
- and ($cmd->{'args'}->[0]->{'type'} eq
'brace_container'
- or $cmd->{'args'}->[0]->{'type'} eq 'brace_arg'
- or $cmd->{'args'}->[0]->{'type'} eq
'brace_command_context')));
- $result .= '{' if ($braces);
- if ($cmdname eq 'verb') {
- $result .= $cmd->{'info'}->{'delimiter'};
- }
$result .= $cmd->{'info'}->{'spaces_before_argument'}->{'text'}
if ($cmd->{'info'} and $cmd->{'info'}->{'spaces_before_argument'});
my $with_commas = 0;
@@ -274,9 +270,7 @@ sub _expand_cmd_args_to_texi($) {
# block line commands with arguments not separated by commas
and not ($def_commands{$cmdname}
or $block_commands{$cmdname} eq 'multitable'))
- or $cmdname eq 'node'
- or exists($brace_commands{$cmdname})
- or ($cmd->{'type'} and $cmd->{'type'} eq 'definfoenclose_command')) {
+ or $cmdname eq 'node') {
$with_commas = 1;
}
my $arg_nr = 0;
@@ -288,6 +282,32 @@ sub _expand_cmd_args_to_texi($) {
}
$result .= _convert_to_texinfo($arg);
}
+ # TODO consider moving the braces command code to _convert_to_texinfo.
+ # Would require changing conditions on calling _expand_cmd_args_to_texi
+ # and adding commas for contents in _convert_to_texinfo
+ } elsif ($cmd->{'contents'}
+ and (exists($brace_commands{$cmdname})
+ or ($cmd->{'type'}
+ and $cmd->{'type'} eq 'definfoenclose_command'))) {
+ my $braces;
+ $braces = 1 if (scalar(@{$cmd->{'contents'}})
+ and ($cmd->{'contents'}->[0]->{'type'}
+ and ($cmd->{'contents'}->[0]->{'type'} eq
'brace_container'
+ or $cmd->{'contents'}->[0]->{'type'} eq
'brace_arg'
+ or $cmd->{'contents'}->[0]->{'type'} eq
'brace_command_context')));
+ $result .= '{' if ($braces);
+ if ($cmdname eq 'verb') {
+ $result .= $cmd->{'info'}->{'delimiter'};
+ }
+ $result .= $cmd->{'info'}->{'spaces_before_argument'}->{'text'}
+ if ($cmd->{'info'} and $cmd->{'info'}->{'spaces_before_argument'});
+ my $arg_nr = 0;
+ foreach my $arg (@{$cmd->{'contents'}}) {
+ next if ($arg->{'info'} and $arg->{'info'}->{'inserted'});
+ $result .= ',' if ($arg_nr);
+ $arg_nr++;
+ $result .= _convert_to_texinfo($arg);
+ }
if ($cmdname eq 'verb') {
$result .= $cmd->{'info'}->{'delimiter'};
}
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index 3eccc5d51e..fc39fb34cb 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -721,7 +721,7 @@ sub _convert($$;$)
}
if ($self->{'itemize_command_as_argument'}
and $element eq $self->{'itemize_command_as_argument'}
- and !$element->{'args'}) {
+ and !$element->{'contents'}) {
my $arguments = [['command', $element->{'cmdname'}]];
push @$arguments, ['automatic', 'on']
if ($element->{'info'} and $element->{'info'}->{'inserted'});
@@ -734,17 +734,17 @@ sub _convert($$;$)
} else {
my $attributes = [];
my $arg;
- if (!$element->{'args'}) {
+ if (!$element->{'contents'}) {
$arg = '';
} else {
- $arg = $self->_convert($element->{'args'}->[0]);
+ $arg = $self->_convert($element->{'contents'}->[0]);
if ($element->{'info'}
and $element->{'info'}->{'spaces_after_cmd_before_arg'}) {
push @$attributes, ['spacesaftercmd',
$element->{'info'}->{'spaces_after_cmd_before_arg'}->{'text'}];
}
- if ($element->{'args'}->[0]->{'type'} ne 'brace_container'
- and $element->{'args'}->[0]->{'type'} ne 'brace_arg') {
+ if ($element->{'contents'}->[0]->{'type'} ne 'brace_container'
+ and $element->{'contents'}->[0]->{'type'} ne 'brace_arg') {
push @$attributes, ['bracketed', 'off'];
}
}
@@ -925,9 +925,11 @@ sub _convert($$;$)
push @$attributes, ['automatic', 'on'];
if (defined($node_direction->{'extra'}->{'normalized'})) {
+ my $label_element
+ = Texinfo::Common::get_label_element($node_direction);
$node_name .= Texinfo::Common::normalize_top_node_name(
$self->_convert({'contents'
- =>
$node_direction->{'args'}->[0]->{'contents'}}));
+ => $label_element->{'contents'}}));
}
} else {
$node_name
@@ -1113,16 +1115,16 @@ sub _convert($$;$)
push @{$self->{'document_context'}->[-1]->{'monospace'}},
$in_monospace_not_normal
if (defined($in_monospace_not_normal));
- my $arg = $self->_convert($element->{'args'}->[0]);
+ my $arg = $self->_convert($element->{'contents'}->[0]);
pop @{$self->{'document_context'}->[-1]->{'monospace'}}
if (defined($in_monospace_not_normal));
my $command_result = $self->txi_markup_open_element('infoenclose',
[['command', $element->{'cmdname'}],
$self->_infoenclose_attribute($element)])
- .$arg.$self->_convert_comment_at_end($element->{'args'}->[0]).
+ .$arg.$self->_convert_comment_at_end($element->{'contents'}->[0]).
$self->txi_markup_close_element('infoenclose');
return $command_result;
- } elsif ($element->{'args'}
+ } elsif ($element->{'contents'}
and exists($brace_commands{$element->{'cmdname'}})) {
if ($Texinfo::Commands::inline_format_commands{$element->{'cmdname'}}
@@ -1133,12 +1135,12 @@ sub _convert($$;$)
$self->{'document_context'}->[-1]->{'raw'} = 1;
}
my $command_result = '';
- if (scalar(@{$element->{'args'}}) >= 2
- and defined($element->{'args'}->[1])
- and $element->{'args'}->[1]->{'contents'}
- and scalar(@{$element->{'args'}->[1]->{'contents'}})) {
+ if (scalar(@{$element->{'contents'}}) >= 2
+ and defined($element->{'contents'}->[1])
+ and $element->{'contents'}->[1]->{'contents'}
+ and scalar(@{$element->{'contents'}->[1]->{'contents'}})) {
$command_result = $self->_convert({'contents'
- => [$element->{'args'}->[1]]});
+ => [$element->{'contents'}->[1]]});
}
if ($element->{'cmdname'} eq 'inlineraw') {
pop @{$self->{'document_context'}};
@@ -1197,11 +1199,11 @@ sub _convert($$;$)
my $args_or_one_arg_cmd = '';
my $arg_index = 0;
foreach my $format_element (@format_elements) {
- if (defined($element->{'args'}->[$arg_index])) {
+ if (defined($element->{'contents'}->[$arg_index])) {
# Leading spaces are gathered here except for context brace_commands
# (gathered just above).
push @$attribute,
- _leading_spaces_arg($element->{'args'}->[$arg_index]);
+ _leading_spaces_arg($element->{'contents'}->[$arg_index]);
my $in_monospace_not_normal;
if (defined($default_args_code_style{$element->{'cmdname'}})
and
$default_args_code_style{$element->{'cmdname'}}->[$arg_index]) {
@@ -1213,16 +1215,16 @@ sub _convert($$;$)
push @{$self->{'document_context'}->[-1]->{'monospace'}},
$in_monospace_not_normal
if (defined($in_monospace_not_normal));
- my $arg = $self->_convert($element->{'args'}->[$arg_index]);
+ my $arg = $self->_convert($element->{'contents'}->[$arg_index]);
my $comment_at_end
- = $self->_convert_comment_at_end($element->{'args'}->[$arg_index]);
+ =
$self->_convert_comment_at_end($element->{'contents'}->[$arg_index]);
pop @{$self->{'document_context'}->[-1]->{'monospace'}}
if (defined($in_monospace_not_normal));
- if ($element->{'args'}->[$arg_index]->{'info'}
- and $element->{'args'}->[$arg_index]
+ if ($element->{'contents'}->[$arg_index]->{'info'}
+ and $element->{'contents'}->[$arg_index]
->{'info'}->{'spaces_after_argument'}) {
- $arg .= $element->{'args'}->[$arg_index]
+ $arg .= $element->{'contents'}->[$arg_index]
->{'info'}->{'spaces_after_argument'}->{'text'};
}
@@ -1268,9 +1270,9 @@ sub _convert($$;$)
push @$attribute, ['where', 'inline'];
}
} elsif ($Texinfo::Commands::ref_commands{$element->{'cmdname'}}) {
- if ($element->{'args'}) {
+ if ($element->{'contents'}) {
my $normalized;
- my $node_arg = $element->{'args'}->[0];
+ my $node_arg = $element->{'contents'}->[0];
if ($node_arg and $node_arg->{'extra'}
and $node_arg->{'extra'}->{'node_content'}) {
my $normalized;
@@ -1291,16 +1293,16 @@ sub _convert($$;$)
or $element->{'cmdname'} eq 'inforef') {
$manual_arg_index = 2;
}
- if (defined($element->{'args'}->[$manual_arg_index])
- and $element->{'args'}->[$manual_arg_index]->{'contents'}
- and @{$element->{'args'}->[$manual_arg_index]->{'contents'}}) {
+ if (defined($element->{'contents'}->[$manual_arg_index])
+ and $element->{'contents'}->[$manual_arg_index]->{'contents'}
+ and
@{$element->{'contents'}->[$manual_arg_index]->{'contents'}}) {
Texinfo::Convert::Text::set_options_code(
$self->{'convert_text_options'});
Texinfo::Convert::Text::set_options_encoding_if_not_ascii($self,
$self->{'convert_text_options'});
$manual = Texinfo::Convert::Text::convert_to_text(
- $element->{'args'}->[$manual_arg_index],
+ $element->{'contents'}->[$manual_arg_index],
$self->{'convert_text_options'});
Texinfo::Convert::Text::reset_options_encoding(
$self->{'convert_text_options'});
diff --git a/tp/Texinfo/Convert/TexinfoXML.pm b/tp/Texinfo/Convert/TexinfoXML.pm
index 8cf8df1fbb..f9fbc01986 100644
--- a/tp/Texinfo/Convert/TexinfoXML.pm
+++ b/tp/Texinfo/Convert/TexinfoXML.pm
@@ -25,6 +25,9 @@ package Texinfo::Convert::TexinfoXML;
use 5.006;
use strict;
+# check that autovivification do not happen incorrectly.
+#no autovivification qw(fetch delete exists store strict);
+
use Carp qw(cluck);
use Texinfo::Convert::TexinfoMarkup;
diff --git a/tp/Texinfo/Convert/Text.pm b/tp/Texinfo/Convert/Text.pm
index 22e0387394..063354c934 100644
--- a/tp/Texinfo/Convert/Text.pm
+++ b/tp/Texinfo/Convert/Text.pm
@@ -77,8 +77,10 @@ sub import {
}
-# this is in fact not needed for 'footnote', 'shortcaption', 'caption'
+# this may not be needed for 'footnote', 'shortcaption', 'caption'
# as they have no brace_container, see below.
+# FIXME check that the above sentence is still true now that the brace
+# commands have contents and not args
my %ignored_brace_commands;
foreach my $ignored_brace_command (#'xref','ref','pxref','inforef',
'anchor', 'sortas', 'seealso', 'seeentry',
@@ -587,38 +589,38 @@ sub _convert($$)
$options->{'set_case'});
return $result;
} elsif ($cmdname eq 'image') {
- if ($element->{'args'}) {
+ if ($element->{'contents'}) {
$options->{'_code_state'}++;
- my $text = _convert($options, $element->{'args'}->[0]);
+ my $text = _convert($options, $element->{'contents'}->[0]);
$options->{'_code_state'}--;
return $text;
} else {
return '';
}
} elsif ($cmdname eq 'email') {
- if ($element->{'args'}) {
+ if ($element->{'contents'}) {
my $text;
- $text = _convert($options, $element->{'args'}->[1])
- if (defined($element->{'args'}->[1]));
+ $text = _convert($options, $element->{'contents'}->[1])
+ if (defined($element->{'contents'}->[1]));
return $text if (defined($text) and ($text ne ''));
$options->{'_code_state'}++;
- my $mail = _convert($options, $element->{'args'}->[0]);
+ my $mail = _convert($options, $element->{'contents'}->[0]);
$options->{'_code_state'}--;
return $mail;
} else {
return '';
}
} elsif ($cmdname eq 'uref' or $cmdname eq 'url') {
- if ($element->{'args'}) {
+ if ($element->{'contents'}) {
my $replacement;
- $replacement = _convert($options, $element->{'args'}->[2])
- if (defined($element->{'args'}->[2]));
+ $replacement = _convert($options, $element->{'contents'}->[2])
+ if (defined($element->{'contents'}->[2]));
return $replacement if (defined($replacement) and $replacement ne '');
my $text;
- $text = _convert($options, $element->{'args'}->[1])
- if (defined($element->{'args'}->[1]));
+ $text = _convert($options, $element->{'contents'}->[1])
+ if (defined($element->{'contents'}->[1]));
$options->{'_code_state'}++;
- my $url = _convert($options, $element->{'args'}->[0]);
+ my $url = _convert($options, $element->{'contents'}->[0]);
$options->{'_code_state'}--;
if (defined($text) and $text ne '') {
return "$url ($text)";
@@ -631,12 +633,14 @@ sub _convert($$)
# if there is only one argument, it is processed below with the other
# brace commands
} elsif ($Texinfo::Commands::explained_commands{$cmdname}
- and $element->{'args'} and scalar(@{$element->{'args'}}) >= 2) {
- my $explanation = _convert($options, $element->{'args'}->[1]);
+ and $element->{'contents'}
+ and scalar(@{$element->{'contents'}}) >= 2) {
+ my $explanation = _convert($options, $element->{'contents'}->[1]);
if ($explanation ne '') {
- return _convert($options, $element->{'args'}->[0]) ." ($explanation)";
+ return _convert($options, $element->{'contents'}->[0])
+ ." ($explanation)";
} else {
- return _convert($options, $element->{'args'}->[0]);
+ return _convert($options, $element->{'contents'}->[0]);
}
} elsif ($Texinfo::Commands::brace_commands{$cmdname}
and $Texinfo::Commands::brace_commands{$cmdname} eq 'inline') {
@@ -653,17 +657,17 @@ sub _convert($$)
$arg_index = 2;
}
my $result = '';
- if (scalar(@{$element->{'args'}}) > $arg_index) {
- $result = _convert($options, $element->{'args'}->[$arg_index]);
+ if (scalar(@{$element->{'contents'}}) > $arg_index) {
+ $result = _convert($options, $element->{'contents'}->[$arg_index]);
}
if ($cmdname eq 'inlineraw') {
$options->{'_raw_state'}--;
}
return $result;
- } elsif ($element->{'args'}
- and (($element->{'args'}->[0]->{'type'}
- and ($element->{'args'}->[0]->{'type'} eq 'brace_container'
- or $element->{'args'}->[0]->{'type'} eq 'brace_arg'))
+ } elsif ($element->{'contents'}
+ and (($element->{'contents'}->[0]->{'type'}
+ and ($element->{'contents'}->[0]->{'type'} eq 'brace_container'
+ or $element->{'contents'}->[0]->{'type'} eq 'brace_arg'))
or ($Texinfo::Commands::math_commands{$cmdname}
and $Texinfo::Commands::brace_commands{$cmdname}))) {
my $result;
@@ -674,7 +678,7 @@ sub _convert($$)
$in_code = 1;
}
$options->{'_code_state'}++ if ($in_code);
- $result = _convert($options, $element->{'args'}->[0]);
+ $result = _convert($options, $element->{'contents'}->[0]);
$options->{'_code_state'}-- if ($in_code);
$options->{'set_case'}-- if ($cmdname eq 'sc');
return $result;
diff --git a/tp/Texinfo/Convert/Utils.pm b/tp/Texinfo/Convert/Utils.pm
index da0bc3e0d0..d561f94761 100644
--- a/tp/Texinfo/Convert/Utils.pm
+++ b/tp/Texinfo/Convert/Utils.pm
@@ -295,7 +295,7 @@ sub definition_category_tree($$)
my $brace_arg
= {'type' => 'brace_container', 'contents' => [$arg_class],
'parent' => $arg_class_code};
- $arg_class_code->{'args'} = [$brace_arg];
+ $arg_class_code->{'contents'} = [$brace_arg];
}
my $def_command = $current->{'extra'}->{'def_command'};
@@ -357,10 +357,10 @@ sub find_innermost_accent_contents($)
}
push @accent_commands, $current;
# A bogus accent, that may happen
- if (!$current->{'args'}) {
+ if (!$current->{'contents'}) {
return (undef, \@accent_commands);
}
- my $arg = $current->{'args'}->[0];
+ my $arg = $current->{'contents'}->[0];
if (!$arg->{'contents'}) {
return (undef, \@accent_commands);
}
diff --git a/tp/Texinfo/Indices.pm b/tp/Texinfo/Indices.pm
index 4ee88b1060..eb3d97c190 100644
--- a/tp/Texinfo/Indices.pm
+++ b/tp/Texinfo/Indices.pm
@@ -542,8 +542,9 @@ sub _idx_leading_text_or_command($$)
or $cmdname eq 'U') {
return (undef, $content);
} elsif ($brace_command_type ne 'inline') {
- if ($content->{'args'} and scalar(@{$content->{'args'}})) {
- return _idx_leading_text_or_command($content->{'args'}->[0],
+ if ($content->{'contents'}
+ and scalar(@{$content->{'contents'}})) {
+ return _idx_leading_text_or_command($content->{'contents'}->[0],
$ignore_chars);
}
} else {
diff --git a/tp/Texinfo/ManipulateTree.pm b/tp/Texinfo/ManipulateTree.pm
index aa51345bde..86f038a44a 100644
--- a/tp/Texinfo/ManipulateTree.pm
+++ b/tp/Texinfo/ManipulateTree.pm
@@ -420,13 +420,13 @@ sub _new_asis_command_with_text($$;$)
my $parent = shift;
my $text_type = shift;
my $new_command = {'cmdname' => 'asis', 'parent' => $parent };
- push @{$new_command->{'args'}}, {'type' => 'brace_container',
+ push @{$new_command->{'contents'}}, {'type' => 'brace_container',
'parent' => $new_command};
- push @{$new_command->{'args'}->[0]->{'contents'}}, {
+ push @{$new_command->{'contents'}->[0]->{'contents'}}, {
'text' => $text,
- 'parent' => $new_command->{'args'}->[0]};
+ 'parent' => $new_command->{'contents'}->[0]};
if (defined($text_type)) {
- $new_command->{'args'}->[0]->{'contents'}->[0]->{'type'} = $text_type;
+ $new_command->{'contents'}->[0]->{'contents'}->[0]->{'type'} = $text_type;
}
return $new_command;
}
@@ -469,7 +469,7 @@ sub _protect_text($$)
my $e = {'cmdname' => 'comma', 'parent' => $current->{'parent'}};
my $brace_container = {'type' => 'brace_container',
'parent' => $e};
- $e->{'args'} = [$brace_container];
+ $e->{'contents'} = [$brace_container];
$current_position = Texinfo::Common::relocate_source_marks(
$remaining_source_marks, $e,
$current_position, 1);
@@ -478,7 +478,7 @@ sub _protect_text($$)
} else {
my $new_asis = _new_asis_command_with_text($2, $current->{'parent'},
$current->{'type'});
- my $e = $new_asis->{'args'}->[0]->{'contents'}->[0];
+ my $e = $new_asis->{'contents'}->[0]->{'contents'}->[0];
$current_position = Texinfo::Common::relocate_source_marks(
$remaining_source_marks, $e,
$current_position, length($2));
@@ -559,7 +559,7 @@ sub protect_first_parenthesis($)
}
my $new_asis = _new_asis_command_with_text('(', $content->{'parent'},
$content->{'type'});
- my $e = $new_asis->{'args'}->[0]->{'contents'}->[0];
+ my $e = $new_asis->{'contents'}->[0]->{'contents'}->[0];
$current_position = Texinfo::Common::relocate_source_marks(
$remaining_source_marks, $e,
$current_position, length('('));
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 7f5c62c96a..1cacb503aa 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -1147,6 +1147,7 @@ sub _bug_message($$;$$)
}
# for debugging
+# TODO probably useless now that args are contents
sub _print_command_args_texi($)
{
my $current = shift;
@@ -4332,7 +4333,7 @@ sub _end_line_starting_block($$$)
# if the command as argument does not have braces but it is
# not a mark (noarg) command, warn
if (defined($command_as_argument)
- and !$command_as_argument->{'args'}
+ and !$command_as_argument->{'contents'}
and $brace_commands{$command_as_argument->{'cmdname'}} ne 'noarg') {
my $cmdname = $command_as_argument->{'cmdname'};
$self->_command_warn($current, __("\@%s expected braces"),
@@ -5162,11 +5163,11 @@ sub _new_value_element($$;$$)
my $spaces_element = shift;
my $value_elt = { 'cmdname' => $command,
- 'args' => [] };
+ 'contents' => [] };
$value_elt->{'parent'} = $current if (defined($current));
my $brace_container = {'type' => 'brace_container',
'contents' => [], 'parent' => $value_elt};
- push @{$value_elt->{'args'}}, $brace_container;
+ push @{$value_elt->{'contents'}}, $brace_container;
push @{$brace_container->{'contents'}}, {'text' => $flag,
'parent' => $brace_container};
if ($spaces_element) {
@@ -6233,7 +6234,7 @@ sub _handle_open_brace($$$$)
}
my $arg = {'parent' => $current};
- $current->{'args'} = [$arg];
+ $current->{'contents'} = [$arg];
$current = $arg;
push @{$self->{'nesting_context'}->{'basic_inline_stack'}}, $command
if ($self->{'basic_inline_commands'}
@@ -6455,7 +6456,7 @@ sub _handle_close_brace($$$)
} elsif ($ref_commands{$closed_cmdname}) {
my $ref = $brace_command;
my @args;
- for $a (@{$ref->{'args'}}) {
+ for $a (@{$ref->{'contents'}}) {
if ($a->{'contents'}) {
push @args, $a->{'contents'};
} else {
@@ -6474,7 +6475,7 @@ sub _handle_close_brace($$$)
"command \@%s missing a node or external manual argument"),
$closed_cmdname), $source_info);
} else {
- my $arg_label = $ref->{'args'}->[0];
+ my $arg_label = $ref->{'contents'}->[0];
my $ref_label_info
= Texinfo::Common::parse_node_manual($arg_label, 1);
if (defined($ref_label_info)) {
@@ -6515,7 +6516,7 @@ sub _handle_close_brace($$$)
}
} elsif ($closed_cmdname eq 'image') {
my $image = $brace_command;
- if (!$image->{'args'}->[0]->{'contents'}) {
+ if (!$image->{'contents'}->[0]->{'contents'}) {
$self->_line_error(
__("\@image missing filename argument"), $source_info);
}
@@ -6540,7 +6541,7 @@ sub _handle_close_brace($$$)
} elsif ($explained_commands{$closed_cmdname}
or ($brace_commands{$closed_cmdname}
and $brace_commands{$closed_cmdname} eq 'inline')) {
- if (!$brace_command->{'args'}->[0]->{'contents'}) {
+ if (!$brace_command->{'contents'}->[0]->{'contents'}) {
$self->_line_warn(
sprintf(__("\@%s missing first argument"),
$closed_cmdname), $source_info);
@@ -6665,15 +6666,15 @@ sub _handle_comma($$$$)
# and $type ne 'brace_arg'
# and $type ne 'block_line_arg'
# and $type ne 'line_arg');
- my $brace_command = $current->{'parent'};
+ my $command_element = $current->{'parent'};
- $brace_command->{'remaining_args'}--;
+ $command_element->{'remaining_args'}--;
- if ($brace_commands{$brace_command->{'cmdname'}}
- and $brace_commands{$brace_command->{'cmdname'}} eq 'inline') {
+ if ($brace_commands{$command_element->{'cmdname'}}
+ and $brace_commands{$command_element->{'cmdname'}} eq 'inline') {
my $expandp = 0;
- $brace_command->{'extra'} = {} if (!$brace_command->{'extra'});
- if (! $brace_command->{'extra'}->{'format'}) {
+ $command_element->{'extra'} = {} if (!$command_element->{'extra'});
+ if (! $command_element->{'extra'}->{'format'}) {
my $inline_type;
# get the first argument, which is also $current, which was before the
comma
# and put it in extra format
@@ -6687,33 +6688,33 @@ sub _handle_comma($$$$)
if ($self->{'conf'}->{'DEBUG'});
} else {
print STDERR "INLINE: $inline_type\n" if ($self->{'conf'}->{'DEBUG'});
- if ($inline_format_commands{$brace_command->{'cmdname'}}) {
+ if ($inline_format_commands{$command_element->{'cmdname'}}) {
if ($self->{'expanded_formats_hash'}->{$inline_type}) {
$expandp = 1;
- $brace_command->{'extra'}->{'expand_index'} = 1;
+ $command_element->{'extra'}->{'expand_index'} = 1;
} else {
$expandp = 0;
}
- } elsif (($brace_command->{'cmdname'} eq 'inlineifset'
+ } elsif (($command_element->{'cmdname'} eq 'inlineifset'
and exists($self->{'values'}->{$inline_type}))
- or ($brace_command->{'cmdname'} eq 'inlineifclear'
+ or ($command_element->{'cmdname'} eq 'inlineifclear'
and ! exists($self->{'values'}->{$inline_type}))) {
$expandp = 1;
- $brace_command->{'extra'}->{'expand_index'} = 1;
+ $command_element->{'extra'}->{'expand_index'} = 1;
} else {
$expandp = 0;
}
}
- $brace_command->{'extra'}->{'format'} = $inline_type;
+ $command_element->{'extra'}->{'format'} = $inline_type;
# Skip first argument for a false @inlinefmtifelse
- if (!$expandp and $brace_command->{'cmdname'} eq 'inlinefmtifelse') {
- $brace_command->{'extra'}->{'expand_index'} = 2;
+ if (!$expandp and $command_element->{'cmdname'} eq 'inlinefmtifelse') {
+ $command_element->{'extra'}->{'expand_index'} = 2;
my $elided_arg_elt = {'type' => 'elided_brace_command_arg',
'contents' => [],
- 'parent' => $brace_command,};
- push @{$brace_command->{'args'}}, $elided_arg_elt;
+ 'parent' => $command_element,};
+ push @{$command_element->{'contents'}}, $elided_arg_elt;
my $arg_text_e = {'type' => 'raw', 'text' => '',
'parent' => $elided_arg_elt};
push @{$elided_arg_elt->{'contents'}}, $arg_text_e;
@@ -6727,7 +6728,7 @@ sub _handle_comma($$$$)
my $delimiter = $2;
if ($delimiter eq ',') {
if ($brace_count == 1) {
- $brace_command->{'remaining_args'}--;
+ $command_element->{'remaining_args'}--;
last;
}
$arg_text_e->{'text'} .= $delimiter;
@@ -6762,7 +6763,7 @@ sub _handle_comma($$$$)
# when condition is false. Keep it.
$expandp = 1;
}
- } elsif ($brace_command->{'cmdname'} eq 'inlinefmtifelse') {
+ } elsif ($command_element->{'cmdname'} eq 'inlinefmtifelse') {
# Second part of @inlinefmtifelse (not counting the format) when
# condition is true. Discard second part.
$expandp = 0;
@@ -6772,8 +6773,8 @@ sub _handle_comma($$$$)
if (!$expandp) {
my $elided_arg_elt = {'type' => 'elided_brace_command_arg',
'contents' => [],
- 'parent' => $brace_command,};
- push @{$brace_command->{'args'}}, $elided_arg_elt;
+ 'parent' => $command_element,};
+ push @{$command_element->{'contents'}}, $elided_arg_elt;
my $arg_text_e = {'type' => 'raw', 'text' => '',
'parent' => $elided_arg_elt};
push @{$elided_arg_elt->{'contents'}}, $arg_text_e;
@@ -6811,8 +6812,13 @@ sub _handle_comma($$$$)
# goto funexit; # used in XS code
}
}
- my $new_arg = {'type' => $type, 'parent' => $brace_command, 'contents' =>
[]};
- push @{$brace_command->{'args'}}, $new_arg;
+ my $new_arg = {'type' => $type, 'parent' => $command_element,
+ 'contents' => []};
+ if ($brace_commands{$command_element->{'cmdname'}}) {
+ push @{$command_element->{'contents'}}, $new_arg;
+ } else {
+ push @{$command_element->{'args'}}, $new_arg;
+ }
# internal_spaces_before_argument is a transient internal type,
# which should end up in info spaces_before_argument.
my $space_before = {'type' => 'internal_spaces_before_argument',
@@ -7335,7 +7341,7 @@ sub _process_remaining_on_line($$$$)
if ($self->{'conf'}->{'DEBUG'});
my $following_arg = {'type' => 'following_arg',
'parent' => $current};
- $current->{'args'} = [ $following_arg ];
+ $current->{'contents'} = [ $following_arg ];
my $accent_arg = { 'text' => $arg_char, 'parent' => $following_arg };
$following_arg->{'contents'} = [ $accent_arg ];
diff --git a/tp/Texinfo/Structuring.pm b/tp/Texinfo/Structuring.pm
index 5a13911d8f..feef206072 100644
--- a/tp/Texinfo/Structuring.pm
+++ b/tp/Texinfo/Structuring.pm
@@ -542,9 +542,9 @@ sub check_nodes_are_referenced($)
# consider nodes in internal @*ref commands to be referenced
if (defined($refs)) {
foreach my $ref (@$refs) {
- if ($ref->{'args'} and scalar(@{$ref->{'args'}})
- and $ref->{'args'}->[0]->{'extra'}) {
- my $label_arg = $ref->{'args'}->[0];
+ if ($ref->{'contents'} and scalar(@{$ref->{'contents'}})
+ and $ref->{'contents'}->[0]->{'extra'}) {
+ my $label_arg = $ref->{'contents'}->[0];
my $label_normalized = $label_arg->{'extra'}->{'normalized'};
if ($label_normalized) {
my $node_target = $identifier_target->{$label_normalized};
@@ -1064,7 +1064,7 @@ sub associate_internal_references($)
if ($ref->{'type'} and $ref->{'type'} eq 'menu_entry_node') {
$label_element = $ref;
} else {
- $label_element = $ref->{'args'}->[0];
+ $label_element = $ref->{'contents'}->[0];
}
if ($label_element->{'extra'}
diff --git a/tp/Texinfo/Transformations.pm b/tp/Texinfo/Transformations.pm
index 90d2fb512e..a64867c58f 100644
--- a/tp/Texinfo/Transformations.pm
+++ b/tp/Texinfo/Transformations.pm
@@ -185,8 +185,8 @@ sub fill_gaps_in_sectioning($;$)
} else {
my $asis_command = {'cmdname' => 'asis',
'parent' => $line_arg};
- $asis_command->{'args'} = [{'type' => 'brace_container',
- 'parent' => $asis_command}];
+ $asis_command->{'contents'} = [{'type' => 'brace_container',
+ 'parent' => $asis_command}];
$line_content = $asis_command;
}
$line_arg->{'contents'} = [$line_content];
@@ -233,7 +233,7 @@ sub _reference_to_arg($$$)
if ($current->{'cmdname'} and
$Texinfo::Commands::ref_commands{$current->{'cmdname'}}
- and $current->{'args'}) {
+ and $current->{'contents'}) {
# remove from internal references
if ($document) {
@@ -249,8 +249,8 @@ sub _reference_to_arg($$$)
@args_try_order = (0, 1, 2, 4, 3);
}
foreach my $index (@args_try_order) {
- if (defined($current->{'args'}->[$index])) {
- my $arg = $current->{'args'}->[$index];
+ if (defined($current->{'contents'}->[$index])) {
+ my $arg = $current->{'contents'}->[$index];
# this will not detect if the arg expands as spaces only, like
# @asis{ }, @ , but it is not an issue or could even be considered
# as a feature.
@@ -903,7 +903,7 @@ sub _protect_hashchar_at_line_beginning($$$)
$e = {'cmdname' => 'hashchar', 'parent' => $parent};
my $arg = {'type' => 'brace_container', 'parent' => $e};
- $e->{'args'} = [$arg];
+ $e->{'contents'} = [$arg];
$current_position = Texinfo::Common::relocate_source_marks(
$remaining_source_marks, $e,
$current_position, 1);
diff --git a/tp/Texinfo/Translations.pm b/tp/Texinfo/Translations.pm
index 700ae1f13f..357face89d 100644
--- a/tp/Texinfo/Translations.pm
+++ b/tp/Texinfo/Translations.pm
@@ -365,7 +365,7 @@ sub _substitute_element_array($$) {
if (!defined($element->{'text'})) {
if ($element->{'cmdname'}
and $element->{'cmdname'} eq 'txiinternalvalue') {
- my $name = $element->{'args'}->[0]->{'contents'}->[0]->{'text'};
+ my $name = $element->{'contents'}->[0]->{'contents'}->[0]->{'text'};
if ($replaced_substrings->{$name}) {
$array->[$idx] = $replaced_substrings->{$name};
}
diff --git a/tp/Texinfo/XS/convert/convert_html.c
b/tp/Texinfo/XS/convert/convert_html.c
index 7ed4085b8f..c0a38c591f 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -904,9 +904,10 @@ html_prepare_converted_output_info (CONVERTER *self, const
char *output_file,
if (!fulltitle_tree
&& self->document->global_commands.titlefont.number > 0
- && self->document->global_commands.titlefont.list[0]->e.c->args.number > 0
- && self->document->global_commands.titlefont.list[0]->e.c->args.list[0]
- ->e.c->contents.number > 0)
+ && self->document->global_commands.titlefont.list[0]
+ ->e.c->contents.number > 0
+ && self->document->global_commands.titlefont.list[0]
+ ->e.c->contents.list[0]->e.c->contents.number > 0)
{
fulltitle_tree = self->document->global_commands.titlefont.list[0];
}
@@ -1277,12 +1278,12 @@ html_convert_tree_append (CONVERTER *self, const
ELEMENT *element,
text_init (&content_formatted);
text_append (&content_formatted, "");
- if (element->e.c->contents.number > 0)
+ if (element->e.c->contents.number > 0
+ && !(builtin_command_data[data_cmd].flags & CF_brace))
{
- if (convert_to_latex
- && !(builtin_command_data[data_cmd].flags & CF_brace))
- {
+ if (convert_to_latex)
+ { /* displaymath */
ELEMENT *tmp = new_element (ET_NONE);
char *latex_content;
@@ -1329,26 +1330,39 @@ html_convert_tree_append (CONVERTER *self, const
ELEMENT *element,
|| cmd == CM_float
|| cmd == CM_cartouche)
{
- if (element->e.c->args.number > 0)
+ const ELEMENT_LIST *arguments_list = 0;
+
+ if (builtin_command_data[data_cmd].flags & CF_brace)
+ {
+ if (element->e.c->contents.number > 0)
+ arguments_list = &element->e.c->contents;
+ }
+ else
+ {
+ if (element->e.c->args.number > 0)
+ arguments_list = &element->e.c->args;
+ }
+
+ if (arguments_list)
{
- TEXT formatted_arg;
size_t arg_idx;
+ TEXT formatted_arg;
text_init (&formatted_arg);
args_formatted = (HTML_ARGS_FORMATTED *)
malloc (sizeof (HTML_ARGS_FORMATTED));
- args_formatted->number = element->e.c->args.number;
+ args_formatted->number = arguments_list->number;
args_formatted->args = (HTML_ARG_FORMATTED *)
malloc (args_formatted->number * sizeof (HTML_ARG_FORMATTED));
memset (args_formatted->args, 0,
args_formatted->number * sizeof (HTML_ARG_FORMATTED));
- for (arg_idx = 0; arg_idx < element->e.c->args.number;
arg_idx++)
+ for (arg_idx = 0; arg_idx < arguments_list->number;
arg_idx++)
{
char *explanation;
unsigned long arg_flags = 0;
- const ELEMENT *arg = element->e.c->args.list[arg_idx];
+ const ELEMENT *arg = arguments_list->list[arg_idx];
HTML_ARG_FORMATTED *arg_formatted
= &args_formatted->args[arg_idx];
@@ -1583,9 +1597,9 @@ html_convert_tree_append (CONVERTER *self, const ELEMENT
*element,
if (type == ET_definfoenclose_command)
{
- if (element->e.c->args.number > 0)
+ if (element->e.c->contents.number > 0)
{
- html_convert_tree_append (self, element->e.c->args.list[0],
+ html_convert_tree_append (self, element->e.c->contents.list[0],
&content_formatted,
"DEFINFOENCLOSE_ARG");
}
@@ -2802,9 +2816,10 @@ html_node_redirections (CONVERTER *self,
{
const ELEMENT *conflicting_node
= file_source_info->element;
+ const ELEMENT *label_element
+ = get_label_element (conflicting_node);
char *node_texi
- = convert_contents_to_texinfo
- (conflicting_node->e.c->args.list[0]);
+ = convert_contents_to_texinfo (label_element);
pmessage_list_command_warn (&self->error_messages,
self->conf, conflicting_node, 1,
"conflict of redirection file with file based on node name",
@@ -2817,9 +2832,10 @@ html_node_redirections (CONVERTER *self,
{
const ELEMENT *conflicting_node
= file_source_info->element;
+ const ELEMENT *label_element
+ = get_label_element (conflicting_node);
char *node_texi
- = convert_contents_to_texinfo
- (conflicting_node->e.c->args.list[0]);
+ = convert_contents_to_texinfo (label_element);
message_list_command_warn (&self->error_messages,
self->conf, conflicting_node, 1,
"conflict with @%s `%s' redirection file",
diff --git a/tp/Texinfo/XS/convert/converter.c
b/tp/Texinfo/XS/convert/converter.c
index 333d93d04c..3613755303 100644
--- a/tp/Texinfo/XS/convert/converter.c
+++ b/tp/Texinfo/XS/convert/converter.c
@@ -1393,7 +1393,7 @@ table_item_content_tree (CONVERTER *self, const ELEMENT
*element)
arg = new_element_added (tree, ET_brace_container);
add_to_contents_as_array (arg, element->e.c->args.list[0]);
}
- add_to_element_args (command, arg);
+ add_to_element_contents (command, arg);
return tree;
}
return 0;
diff --git a/tp/Texinfo/XS/convert/format_html.c
b/tp/Texinfo/XS/convert/format_html.c
index cb58a4a3a2..e5134882b7 100644
--- a/tp/Texinfo/XS/convert/format_html.c
+++ b/tp/Texinfo/XS/convert/format_html.c
@@ -1786,7 +1786,12 @@ html_internal_command_tree (CONVERTER *self, const
ELEMENT *command,
|| command->e.c->cmd == CM_anchor)
{
ELEMENT *root_code = new_element_added (tree, ET__code);
- add_to_contents_as_array (root_code, command->e.c->args.list[0]);
+ ELEMENT *label_element;
+ if (command->e.c->cmd == CM_anchor)
+ label_element = command->e.c->contents.list[0];
+ else
+ label_element = command->e.c->args.list[0];
+ add_to_contents_as_array (root_code, label_element);
tree->tree = root_code;
add_tree_to_build (self, tree->tree);
}
@@ -3110,7 +3115,7 @@ html_default_format_single_footnote (CONVERTER *self,
const ELEMENT *element,
number_in_doc, footid);
footnote_text
= html_convert_tree_new_formatting_context (self,
- element->e.c->args.list[0],
+ element->e.c->contents.list[0],
context_str, 0, 0, 0);
free (context_str);
@@ -5969,10 +5974,10 @@ html_convert_explained_command (CONVERTER *self, const
enum command_id cmd,
EXPLAINED_COMMAND_TYPE_LIST *type_explanations
= &self->shared_conversion_state.explained_commands;
- if (element->e.c->args.number > 0
- && element->e.c->args.list[0]->e.c->contents.number > 0)
+ if (element->e.c->contents.number > 0
+ && element->e.c->contents.list[0]->e.c->contents.number > 0)
{
- normalized_type = convert_to_identifier (element->e.c->args.list[0]);
+ normalized_type = convert_to_identifier (element->e.c->contents.list[0]);
}
else
normalized_type = strdup ("");
@@ -7552,8 +7557,8 @@ html_convert_xref_command (CONVERTER *self, const enum
command_id cmd,
&& strlen (args_formatted->args[4].formatted[AFT_type_normal]))
book = args_formatted->args[4].formatted[AFT_type_normal];
- if (element->e.c->args.number > 0)
- arg_node = element->e.c->args.list[0];
+ if (element->e.c->contents.number > 0)
+ arg_node = element->e.c->contents.list[0];
/* check for internal reference */
if (cmd != CM_inforef && !book && !file && arg_node)
@@ -8393,12 +8398,13 @@ html_convert_float_command (CONVERTER *self, const enum
command_id cmd,
if (content)
text_append (result, content);
- if (caption_element && caption_element->e.c->args.number > 0
- && caption_element->e.c->args.list[0]->e.c->contents.number > 0)
+ if (caption_element && caption_element->e.c->contents.number > 0
+ && caption_element->e.c->contents.list[0]->e.c->contents.number > 0)
{
char *caption_text
= html_convert_tree_new_formatting_context (self,
- caption_element->e.c->args.list[0], "float caption", 0, 0, 0);
+ caption_element->e.c->contents.list[0],
+ "float caption", 0, 0, 0);
if (caption_text)
{
text_append (result, caption_text);
@@ -8432,7 +8438,7 @@ html_convert_float_command (CONVERTER *self, const enum
command_id cmd,
ELEMENT *strong_element
= new_command_element (ET_brace_command, CM_strong);
- add_to_element_args (strong_element, args);
+ add_to_element_contents (strong_element, args);
add_to_element_contents (args, prepended);
add_tree_to_build (self, strong_element);
@@ -8451,8 +8457,8 @@ html_convert_float_command (CONVERTER *self, const enum
command_id cmd,
html_register_pending_formatted_inline_content (self,
caption_command_name, prepended_text);
caption_text = html_convert_tree_new_formatting_context (self,
- caption_element->e.c->args.list[0], "float caption",
- 0, 0, 0);
+ caption_element->e.c->contents.list[0],
+ "float caption", 0, 0, 0);
if (prepended_text)
{
cancelled_prepended
@@ -8480,8 +8486,8 @@ html_convert_float_command (CONVERTER *self, const enum
command_id cmd,
else if (caption_element)
{
caption_text = html_convert_tree_new_formatting_context (self,
- caption_element->e.c->args.list[0], "float caption",
- 0, 0, 0);
+ caption_element->e.c->contents.list[0],
+ "float caption", 0, 0, 0);
}
if (caption_text && strlen (caption_text))
@@ -9513,7 +9519,7 @@ html_convert_listoffloats_command (CONVERTER *self, const
enum command_id cmd,
{
char *caption_text
= html_convert_tree_new_formatting_context (self,
- caption_element->e.c->args.list[0],
+ caption_element->e.c->contents.list[0],
builtin_command_name (cmd),
multiple_pass_str, 0, 0);
text_append (result, caption_text);
@@ -10057,11 +10063,12 @@ html_convert_printindex_command (CONVERTER *self,
const enum command_id cmd,
else
referred_tree = new_element (ET_NONE);
- if (referred_entry->e.c->args.number > 0
- && referred_entry->e.c->args.list[0]->e.c->contents.number >
0)
+ if (referred_entry->e.c->contents.number > 0
+ && referred_entry->e.c->contents.list[0]
+ ->e.c->contents.number > 0)
{
ELEMENT *referred_copy
- = copy_tree (referred_entry->e.c->args.list[0]);
+ = copy_tree (referred_entry->e.c->contents.list[0]);
add_to_contents_as_array (referred_tree, referred_copy);
}
diff --git a/tp/Texinfo/XS/main/build_perl_info.c
b/tp/Texinfo/XS/main/build_perl_info.c
index 9cc08570fa..01c7a881a3 100644
--- a/tp/Texinfo/XS/main/build_perl_info.c
+++ b/tp/Texinfo/XS/main/build_perl_info.c
@@ -804,7 +804,7 @@ element_to_perl_hash (ELEMENT *e, int avoid_recursion)
"arg_line", &info_hv);
} /* verb is a brace command type and so cannot be confused
with the preceding types */
- else if (e->e.c->cmd == CM_verb && e->e.c->args.number > 0)
+ else if (e->e.c->cmd == CM_verb && e->e.c->contents.number > 0)
store_info_string (e, e->e.c->string_info[sit_delimiter],
"delimiter", &info_hv);
}
diff --git a/tp/Texinfo/XS/main/convert_to_texinfo.c
b/tp/Texinfo/XS/main/convert_to_texinfo.c
index 7bea9a819a..6b8af001d7 100644
--- a/tp/Texinfo/XS/main/convert_to_texinfo.c
+++ b/tp/Texinfo/XS/main/convert_to_texinfo.c
@@ -83,30 +83,15 @@ expand_cmd_args_to_texi (const ELEMENT *e, TEXT *result)
else if (e->e.c->args.number > 0)
{
size_t i, arg_nr;
- int braces;
int with_commas = 0;
- braces = (e->e.c->args.list[0]->type == ET_brace_container
- || e->e.c->args.list[0]->type == ET_brace_arg
- || e->e.c->args.list[0]->type == ET_brace_command_context);
- if (braces)
- ADD("{");
-
- if (cmd == CM_verb)
- {
- const char *delimiter = e->e.c->string_info[sit_delimiter];
- ADD(delimiter);
- }
-
if (spc_before_arg)
ADD((char *)spc_before_arg->e.text->text);
if ((builtin_command_data[cmd].flags & CF_block
&& ! (builtin_command_data[cmd].flags & CF_def
|| cmd == CM_multitable))
- || cmd == CM_node
- || (builtin_command_data[cmd].flags & CF_brace)
- || (builtin_command_data[cmd].flags & CF_INFOENCLOSE))
+ || cmd == CM_node)
with_commas = 1;
arg_nr = 0;
@@ -124,6 +109,41 @@ expand_cmd_args_to_texi (const ELEMENT *e, TEXT *result)
}
convert_to_texinfo_internal (arg, result);
}
+ }
+ else if (e->e.c->contents.number > 0
+ && (builtin_command_data[cmd].flags & CF_brace
+ || builtin_command_data[cmd].flags & CF_INFOENCLOSE))
+ {
+ size_t i, arg_nr;
+ int braces;
+
+ braces = (e->e.c->contents.list[0]->type == ET_brace_container
+ || e->e.c->contents.list[0]->type == ET_brace_arg
+ || e->e.c->contents.list[0]->type == ET_brace_command_context);
+ if (braces)
+ ADD("{");
+
+ if (cmd == CM_verb)
+ {
+ const char *delimiter = e->e.c->string_info[sit_delimiter];
+ ADD(delimiter);
+ }
+
+ if (spc_before_arg)
+ ADD((char *)spc_before_arg->e.text->text);
+
+ arg_nr = 0;
+ for (i = 0; i < e->e.c->contents.number; i++)
+ {
+ ELEMENT *arg = e->e.c->contents.list[i];
+ if (arg->flags & EF_inserted)
+ continue;
+
+ if (arg_nr)
+ ADD(",");
+ arg_nr++;
+ convert_to_texinfo_internal (arg, result);
+ }
if (cmd == CM_verb)
{
@@ -158,7 +178,11 @@ convert_to_texinfo_internal (const ELEMENT *e, TEXT
*result)
if (e->e.c->cmd
|| e->type == ET_def_line)
{
+ enum command_id cmd = element_builtin_cmd (e);
expand_cmd_args_to_texi (e, result);
+ if (builtin_command_data[cmd].flags & CF_brace
+ || builtin_command_data[cmd].flags & CF_INFOENCLOSE)
+ return;
}
else
{
diff --git a/tp/Texinfo/XS/main/convert_to_text.c
b/tp/Texinfo/XS/main/convert_to_text.c
index c041399ccd..214daba296 100644
--- a/tp/Texinfo/XS/main/convert_to_text.c
+++ b/tp/Texinfo/XS/main/convert_to_text.c
@@ -620,6 +620,7 @@ convert_to_text_internal (const ELEMENT *element,
TEXT_OPTIONS *text_options,
&& !(builtin_command_data[data_cmd].flags & CF_def)
&& !(data_cmd == CM_sp
|| data_cmd == CM_verbatiminclude))
+ || data_cmd == CM_footnote
|| data_cmd == CM_seeentry
|| data_cmd == CM_seealso
|| element->type == ET_postamble_after_end
@@ -704,13 +705,14 @@ convert_to_text_internal (const ELEMENT *element,
TEXT_OPTIONS *text_options,
text_options->set_case);
ADD(text);
free (text);
+ return;
}
else if (data_cmd == CM_image)
{
- if (element->e.c->args.number > 0)
+ if (element->e.c->contents.number > 0)
{
text_options->code_state++;
- convert_to_text_internal (element->e.c->args.list[0],
+ convert_to_text_internal (element->e.c->contents.list[0],
text_options, result);
text_options->code_state--;
}
@@ -718,11 +720,11 @@ convert_to_text_internal (const ELEMENT *element,
TEXT_OPTIONS *text_options,
}
else if (data_cmd == CM_email)
{
- if (element->e.c->args.number >= 2)
+ if (element->e.c->contents.number >= 2)
{
TEXT replacement;
text_init (&replacement);
- convert_to_text_internal (element->e.c->args.list[1],
+ convert_to_text_internal (element->e.c->contents.list[1],
text_options, &replacement);
if (replacement.end > 0)
{
@@ -732,10 +734,10 @@ convert_to_text_internal (const ELEMENT *element,
TEXT_OPTIONS *text_options,
}
}
- if (element->e.c->args.number > 0)
+ if (element->e.c->contents.number > 0)
{
text_options->code_state++;
- convert_to_text_internal (element->e.c->args.list[0],
+ convert_to_text_internal (element->e.c->contents.list[0],
text_options, result);
text_options->code_state--;
}
@@ -744,15 +746,15 @@ convert_to_text_internal (const ELEMENT *element,
TEXT_OPTIONS *text_options,
}
else if (data_cmd == CM_uref || data_cmd == CM_url)
{
- if (element->e.c->args.number > 0)
+ if (element->e.c->contents.number > 0)
{
TEXT url_text;
- if (element->e.c->args.number >= 3)
+ if (element->e.c->contents.number >= 3)
{
TEXT replacement;
text_init (&replacement);
- convert_to_text_internal (element->e.c->args.list[2],
+ convert_to_text_internal (element->e.c->contents.list[2],
text_options, &replacement);
if (replacement.end > 0)
{
@@ -765,14 +767,14 @@ convert_to_text_internal (const ELEMENT *element,
TEXT_OPTIONS *text_options,
text_init (&url_text);
text_append (&url_text, "");
text_options->code_state++;
- convert_to_text_internal (element->e.c->args.list[0],
+ convert_to_text_internal (element->e.c->contents.list[0],
text_options, &url_text);
text_options->code_state--;
- if (element->e.c->args.number >= 2)
+ if (element->e.c->contents.number >= 2)
{
TEXT text;
text_init (&text);
- convert_to_text_internal (element->e.c->args.list[1],
+ convert_to_text_internal (element->e.c->contents.list[1],
text_options, &text);
if (text.end > 0)
{
@@ -792,14 +794,14 @@ convert_to_text_internal (const ELEMENT *element,
TEXT_OPTIONS *text_options,
return;
}
else if ((builtin_command_data[data_cmd].other_flags & CF_explained)
- && element->e.c->args.number >= 2)
+ && element->e.c->contents.number >= 2)
{
TEXT explanation;
text_init (&explanation);
- convert_to_text_internal (element->e.c->args.list[1],
+ convert_to_text_internal (element->e.c->contents.list[1],
text_options, &explanation);
- convert_to_text_internal (element->e.c->args.list[0],
+ convert_to_text_internal (element->e.c->contents.list[0],
text_options, result);
if (explanation.end > 0)
{
@@ -824,17 +826,17 @@ convert_to_text_internal (const ELEMENT *element,
TEXT_OPTIONS *text_options,
arg_index = 2;
}
- if (element->e.c->args.number > arg_index)
- convert_to_text_internal (element->e.c->args.list[arg_index],
+ if (element->e.c->contents.number > arg_index)
+ convert_to_text_internal (element->e.c->contents.list[arg_index],
text_options, result);
if (data_cmd == CM_inlineraw)
text_options->raw_state--;
return;
}
- else if (element->e.c->args.number > 0
- && (element->e.c->args.list[0]->type == ET_brace_container
- || element->e.c->args.list[0]->type == ET_brace_arg
+ else if (element->e.c->contents.number > 0
+ && (element->e.c->contents.list[0]->type == ET_brace_container
+ || element->e.c->contents.list[0]->type == ET_brace_arg
|| (builtin_command_data[data_cmd].flags & CF_brace
&& builtin_command_data[data_cmd].flags & CF_math)))
{
@@ -848,7 +850,7 @@ convert_to_text_internal (const ELEMENT *element,
TEXT_OPTIONS *text_options,
if (in_code)
text_options->code_state++;
- convert_to_text_internal (element->e.c->args.list[0],
+ convert_to_text_internal (element->e.c->contents.list[0],
text_options, result);
if (in_code)
text_options->code_state--;
diff --git a/tp/Texinfo/XS/main/convert_utils.c
b/tp/Texinfo/XS/main/convert_utils.c
index 45230d7f6e..3e1560b0bb 100644
--- a/tp/Texinfo/XS/main/convert_utils.c
+++ b/tp/Texinfo/XS/main/convert_utils.c
@@ -145,9 +145,9 @@ find_innermost_accent_contents (const ELEMENT *element)
push_stack_element (&accent_stack->stack, current);
/* A bogus accent, that may happen */
- if (current->e.c->args.number <= 0)
+ if (current->e.c->contents.number <= 0)
return accent_stack;
- arg = current->e.c->args.list[0];
+ arg = current->e.c->contents.list[0];
if (arg->e.c->contents.number <= 0)
return accent_stack;
for (i = 0; i < arg->e.c->contents.number; i++)
@@ -565,7 +565,7 @@ definition_category_tree (OPTIONS * options, const ELEMENT
*current)
ELEMENT *brace_container = new_element (ET_brace_container);
arg_class_code = new_command_element (ET_brace_command, CM_code);
add_to_element_contents (brace_container, class_copy);
- add_to_element_args (arg_class_code, brace_container);
+ add_to_element_contents (arg_class_code, brace_container);
}
*/
diff --git a/tp/Texinfo/XS/main/manipulate_indices.c
b/tp/Texinfo/XS/main/manipulate_indices.c
index f012e5a1f0..ce711ac680 100644
--- a/tp/Texinfo/XS/main/manipulate_indices.c
+++ b/tp/Texinfo/XS/main/manipulate_indices.c
@@ -1333,10 +1333,10 @@ idx_leading_text_or_command (ELEMENT *tree, const char
*ignore_chars)
}
else if (brace_command_type != BRACE_inline)
{
- if (content->e.c->args.number > 0)
+ if (content->e.c->contents.number > 0)
{
return idx_leading_text_or_command (
- content->e.c->args.list[0],
+ content->e.c->contents.list[0],
ignore_chars);
}
}
diff --git a/tp/Texinfo/XS/main/manipulate_tree.c
b/tp/Texinfo/XS/main/manipulate_tree.c
index 0369d2448f..4388cc960e 100644
--- a/tp/Texinfo/XS/main/manipulate_tree.c
+++ b/tp/Texinfo/XS/main/manipulate_tree.c
@@ -911,7 +911,7 @@ new_asis_command_with_text (const char *text, ELEMENT
*parent,
ELEMENT *brace_container = new_element (ET_brace_container);
ELEMENT *text_elt = new_text_element (type);
new_command->parent = parent;
- add_to_element_args (new_command, brace_container);
+ add_to_element_contents (new_command, brace_container);
text_append (text_elt->e.text, text);
add_to_element_contents (brace_container, text_elt);
return new_command;
@@ -988,7 +988,7 @@ protect_text (ELEMENT *current, const char *to_protect)
ELEMENT *brace_container
= new_element (ET_brace_container);
comma->parent = current->parent;
- add_to_element_args (comma, brace_container);
+ add_to_element_contents (comma, brace_container);
add_to_element_list (container, comma);
if (u8_text)
{
@@ -1018,7 +1018,7 @@ protect_text (ELEMENT *current, const char *to_protect)
current_position
= relocate_source_marks (current->source_mark_list,
-
new_command->e.c->args.list[0]->e.c->contents.list[0],
+ new_command->e.c->contents.list[0]->e.c->contents.list[0],
current_position, u8_len);
}
p += to_protect_nr;
diff --git a/tp/Texinfo/XS/main/node_name_normalization.c
b/tp/Texinfo/XS/main/node_name_normalization.c
index 827b945b3e..6d10511962 100644
--- a/tp/Texinfo/XS/main/node_name_normalization.c
+++ b/tp/Texinfo/XS/main/node_name_normalization.c
@@ -97,13 +97,14 @@ convert_to_normalized_internal (const ELEMENT *e, TEXT
*result)
}
else if (builtin_command_data[e->e.c->cmd].flags & CF_accent)
{
- if (e->e.c->args.number > 0)
+ if (e->e.c->contents.number > 0)
{
TEXT accent_text;
char *accented_char;
text_init (&accent_text);
- convert_to_normalized_internal (e->e.c->args.list[0],
&accent_text);
+ convert_to_normalized_internal (e->e.c->contents.list[0],
+ &accent_text);
accented_char = unicode_accent (accent_text.text, e);
if (accented_char)
{
@@ -116,6 +117,7 @@ convert_to_normalized_internal (const ELEMENT *e, TEXT
*result)
ADD(accent_text.text);
free (accent_text.text);
}
+ return;
}
else if (builtin_command_data[e->e.c->cmd].flags & CF_ref)
{
@@ -127,13 +129,13 @@ convert_to_normalized_internal (const ELEMENT *e, TEXT
*result)
{
/* no risk with that casting as idx < 5 */
size_t idx = (size_t) arguments_order[order_index];
- if (e->e.c->args.number > idx)
+ if (e->e.c->contents.number > idx)
{
TEXT arg_text;
text_init (&arg_text);
convert_to_normalized_internal (
- e->e.c->args.list[idx], &arg_text);
+ e->e.c->contents.list[idx], &arg_text);
if (arg_text.end > 0)
{
char *non_space_char = arg_text.text
@@ -148,13 +150,14 @@ convert_to_normalized_internal (const ELEMENT *e, TEXT
*result)
}
order_index++;
}
+ return;
}
- else if (e->e.c->args.number > 0
- && (e->e.c->args.list[0]->type == ET_brace_container
- || e->e.c->args.list[0]->type == ET_brace_arg
+ else if (e->e.c->contents.number > 0
+ && (e->e.c->contents.list[0]->type == ET_brace_container
+ || e->e.c->contents.list[0]->type == ET_brace_arg
|| e->e.c->cmd == CM_math))
{
- convert_to_normalized_internal (e->e.c->args.list[0], result);
+ convert_to_normalized_internal (e->e.c->contents.list[0], result);
return;
}
}
diff --git a/tp/Texinfo/XS/main/translations.c
b/tp/Texinfo/XS/main/translations.c
index aae481e587..ce2e661b6a 100644
--- a/tp/Texinfo/XS/main/translations.c
+++ b/tp/Texinfo/XS/main/translations.c
@@ -452,7 +452,7 @@ substitute_element_array (ELEMENT_LIST *list,
{
if (e->e.c->cmd == CM_txiinternalvalue)
{
- char *name = e->e.c->args.list[0]->e.c->contents.list[0]
+ char *name = e->e.c->contents.list[0]->e.c->contents.list[0]
->e.text->text;
size_t i;
for (i = 0; i < replaced_substrings->number; i++)
diff --git a/tp/Texinfo/XS/main/utils.c b/tp/Texinfo/XS/main/utils.c
index 95b55a15af..b226f44c5f 100644
--- a/tp/Texinfo/XS/main/utils.c
+++ b/tp/Texinfo/XS/main/utils.c
@@ -654,9 +654,10 @@ item_line_parent (ELEMENT *current)
ELEMENT *
get_label_element (const ELEMENT *e)
{
- if ((e->e.c->cmd == CM_node || e->e.c->cmd == CM_anchor)
- && e->e.c->args.number > 0)
+ if (e->e.c->cmd == CM_node && e->e.c->args.number > 0)
return e->e.c->args.list[0];
+ else if (e->e.c->cmd == CM_anchor && e->e.c->contents.number > 0)
+ return e->e.c->contents.list[0];
else if (e->e.c->cmd == CM_float && e->e.c->args.number >= 2)
return e->e.c->args.list[1];
return 0;
diff --git a/tp/Texinfo/XS/parsetexi/end_line.c
b/tp/Texinfo/XS/parsetexi/end_line.c
index a4a214a94e..f649d28c15 100644
--- a/tp/Texinfo/XS/parsetexi/end_line.c
+++ b/tp/Texinfo/XS/parsetexi/end_line.c
@@ -1017,7 +1017,7 @@ end_line_starting_block (ELEMENT *current)
/* if the command as argument does not have braces but it is
not a mark (noarg) command, warn */
if (k_command_as_arg
- && command_as_arg_e->e.c->args.number <= 0
+ && command_as_arg_e->e.c->contents.number <= 0
/* only brace commands are registered as command_as_argument
so we can assume that the following is true:
&& command_data(command_as_arg_e->e.c->cmd).flags & CF_brace
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index 4c3f231ff3..d16167f7b3 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -1185,7 +1185,7 @@ new_value_element (enum command_id cmd, const char *flag,
ELEMENT *value_text = new_text_element (ET_normal_text);
text_append_n (value_text->e.text, flag, flag_len);
- add_to_element_args (value_elt, brace_container);
+ add_to_element_contents (value_elt, brace_container);
add_to_element_contents (brace_container, value_text);
if (spaces_element)
value_elt->elt_info[eit_spaces_after_cmd_before_arg]
@@ -2204,7 +2204,7 @@ process_remaining_on_line (ELEMENT **current_inout, const
char **line_inout)
int char_len;
e = new_element (ET_following_arg);
- add_to_element_args (current, e);
+ add_to_element_contents (current, e);
/* Count any UTF-8 continuation bytes. */
char_len = 1;
diff --git a/tp/Texinfo/XS/parsetexi/separator.c
b/tp/Texinfo/XS/parsetexi/separator.c
index 840ef1690a..17a47a39de 100644
--- a/tp/Texinfo/XS/parsetexi/separator.c
+++ b/tp/Texinfo/XS/parsetexi/separator.c
@@ -68,7 +68,7 @@ handle_open_brace (ELEMENT *current, const char **line_inout)
if (cmd == CM_verb)
{
arg = new_element (ET_brace_container);
- add_to_element_args (current, arg);
+ add_to_element_contents (current, arg);
current = arg;
/* the delimiter may be in macro expansion */
@@ -98,7 +98,7 @@ handle_open_brace (ELEMENT *current, const char **line_inout)
int n;
arg = new_element (ET_brace_command_context);
- add_to_element_args (current, arg);
+ add_to_element_contents (current, arg);
current = arg;
if (cmd == CM_caption || cmd == CM_shortcaption)
{
@@ -192,7 +192,7 @@ handle_open_brace (ELEMENT *current, const char
**line_inout)
{
arg = new_element (ET_brace_container);
}
- add_to_element_args (current, arg);
+ add_to_element_contents (current, arg);
current = arg;
}
debug_nonl ("OPENED @%s, remaining: %d ",
@@ -333,22 +333,22 @@ handle_close_brace (ELEMENT *current, const char
**line_inout)
int link_or_inforef = (closed_cmd == CM_link
|| closed_cmd == CM_inforef);
if ((link_or_inforef
- && (ref->e.c->args.list[0]->e.c->contents.number == 0)
- && (ref->e.c->args.number <= 2
- || ref->e.c->args.list[2]->e.c->contents.number == 0))
+ && (ref->e.c->contents.list[0]->e.c->contents.number == 0)
+ && (ref->e.c->contents.number <= 2
+ || ref->e.c->contents.list[2]->e.c->contents.number == 0))
|| (!link_or_inforef
- && (ref->e.c->args.list[0]->e.c->contents.number == 0)
- && (ref->e.c->args.number <= 3
- || ref->e.c->args.list[3]->e.c->contents.number == 0)
- && (ref->e.c->args.number <= 4
- || ref->e.c->args.list[4]->e.c->contents.number == 0)))
+ && (ref->e.c->contents.list[0]->e.c->contents.number == 0)
+ && (ref->e.c->contents.number <= 3
+ || ref->e.c->contents.list[3]->e.c->contents.number ==
0)
+ && (ref->e.c->contents.number <= 4
+ || ref->e.c->contents.list[4]->e.c->contents.number == 0)))
{
line_warn ("command @%s missing a node or external manual "
"argument", command_name(closed_cmd));
}
else
{
- ELEMENT *arg_label = args_child_by_index (ref, 0);
+ ELEMENT *arg_label = contents_child_by_index (ref, 0);
NODE_SPEC_EXTRA *ref_label_info = parse_node_manual (arg_label,
1);
if (ref_label_info && (ref_label_info->manual_content
@@ -369,15 +369,17 @@ handle_close_brace (ELEMENT *current, const char
**line_inout)
destroy_element (ref_label_info->node_content);
}
if ((!link_or_inforef
- && (ref->e.c->args.number <= 3
- || (ref->e.c->args.number <= 4
- && ref->e.c->args.list[3]->e.c->contents.number ==
0)
- || (ref->e.c->args.list[3]->e.c->contents.number == 0
- && ref->e.c->args.list[4]->e.c->contents.number ==
0))
+ && (ref->e.c->contents.number <= 3
+ || (ref->e.c->contents.number <= 4
+ && ref->e.c->contents.list[3]
+ ->e.c->contents.number == 0)
+ || (ref->e.c->contents.list[3]->e.c->contents.number == 0
+ && ref->e.c->contents.list[4]
+ ->e.c->contents.number == 0))
&& !ref_label_info->manual_content)
|| (link_or_inforef
- && (ref->e.c->args.number <= 2
- || ref->e.c->args.list[2]->e.c->contents.number ==
0)))
+ && (ref->e.c->contents.number <= 2
+ || ref->e.c->contents.list[2]->e.c->contents.number == 0)))
{
/* we use the @*ref command here and not the label
command to have more information for messages */
@@ -386,39 +388,39 @@ handle_close_brace (ELEMENT *current, const char
**line_inout)
free (ref_label_info);
}
- if (ref->e.c->args.number > 1
- && ref->e.c->args.list[1]->e.c->contents.number > 0)
+ if (ref->e.c->contents.number > 1
+ && ref->e.c->contents.list[1]->e.c->contents.number > 0)
{
- if (check_empty_expansion (ref->e.c->args.list[1]))
+ if (check_empty_expansion (ref->e.c->contents.list[1]))
{
char *texi = 0;
- if (ref->e.c->args.list[1])
+ if (ref->e.c->contents.list[1])
texi
- = convert_contents_to_texinfo (ref->e.c->args.list[1]);
+ = convert_contents_to_texinfo
(ref->e.c->contents.list[1]);
line_warn ("in @%s empty cross reference name "
"after expansion `%s'",
command_name(closed_cmd),
- ref->e.c->args.list[1] ? texi : "");
+ ref->e.c->contents.list[1] ? texi : "");
free (texi);
}
}
if (!link_or_inforef
- && ref->e.c->args.number > 2
- && ref->e.c->args.list[2]->e.c->contents.number > 0)
+ && ref->e.c->contents.number > 2
+ && ref->e.c->contents.list[2]->e.c->contents.number > 0)
{
- if (check_empty_expansion (ref->e.c->args.list[2]))
+ if (check_empty_expansion (ref->e.c->contents.list[2]))
{
char *texi = 0;
- if (ref->e.c->args.list[2])
+ if (ref->e.c->contents.list[2])
texi
- = convert_contents_to_texinfo (ref->e.c->args.list[2]);
+ = convert_contents_to_texinfo (ref->e.c->contents.list[2]);
line_warn ("in @%s empty cross reference title "
"after expansion `%s'",
command_name(closed_cmd),
- ref->e.c->args.list[2] ? texi : "");
+ ref->e.c->contents.list[2] ? texi : "");
free (texi);
}
}
@@ -427,7 +429,7 @@ handle_close_brace (ELEMENT *current, const char
**line_inout)
{
GLOBAL_INFO *global_info = &parsed_document->global_info;
ELEMENT *image = brace_command;
- if (image->e.c->args.list[0]->e.c->contents.number == 0)
+ if (image->e.c->contents.list[0]->e.c->contents.number == 0)
{
line_error ("@image missing filename argument");
}
@@ -456,7 +458,7 @@ handle_close_brace (ELEMENT *current, const char
**line_inout)
|| closed_cmd == CM_abbr
|| closed_cmd == CM_acronym)
{
- if (brace_command->e.c->args.list[0]->e.c->contents.number == 0)
+ if (brace_command->e.c->contents.list[0]->e.c->contents.number == 0)
{
line_warn ("@%s missing first argument",
command_name(closed_cmd));
@@ -615,7 +617,7 @@ handle_comma (ELEMENT *current, const char **line_inout)
{
const char *line = *line_inout;
enum element_type type;
- ELEMENT *brace_command;
+ ELEMENT *command_element;
ELEMENT *new_arg, *spaces_before_e;
ELEMENT *new_current;
@@ -623,15 +625,15 @@ handle_comma (ELEMENT *current, const char **line_inout)
isolate_last_space (current);
type = current->type;
- brace_command = current->parent;
+ command_element = current->parent;
- if (counter_value (&count_remaining_args, brace_command) != COUNTER_VARIADIC)
+ if (counter_value (&count_remaining_args, command_element) !=
COUNTER_VARIADIC)
counter_dec (&count_remaining_args);
- if (command_data(brace_command->e.c->cmd).data == BRACE_inline)
+ if (command_data(command_element->e.c->cmd).data == BRACE_inline)
{
int expandp = 0;
- const char *format = lookup_extra_string (brace_command, AI_key_format);
+ const char *format = lookup_extra_string (command_element,
AI_key_format);
if (!format)
{/* get the first argument, which is also current that was before the
comma
and put it in extra format */
@@ -647,51 +649,52 @@ handle_comma (ELEMENT *current, const char **line_inout)
{
/* Condition is missing */
debug ("INLINE COND MISSING");
- add_extra_string (brace_command, AI_key_format, 0);
+ add_extra_string (command_element, AI_key_format, 0);
}
else
{
debug ("INLINE: %s", inline_type);
- if (brace_command->e.c->cmd == CM_inlineraw
- || brace_command->e.c->cmd == CM_inlinefmt
- || brace_command->e.c->cmd == CM_inlinefmtifelse)
+ if (command_element->e.c->cmd == CM_inlineraw
+ || command_element->e.c->cmd == CM_inlinefmt
+ || command_element->e.c->cmd == CM_inlinefmtifelse)
{
if (parser_format_expanded_p (inline_type))
{
expandp = 1;
- add_extra_integer (brace_command, AI_key_expand_index,
1);
+ add_extra_integer (command_element,
+ AI_key_expand_index, 1);
}
else
expandp = 0;
}
- else if (brace_command->e.c->cmd == CM_inlineifset
- || brace_command->e.c->cmd == CM_inlineifclear)
+ else if (command_element->e.c->cmd == CM_inlineifset
+ || command_element->e.c->cmd == CM_inlineifclear)
{
expandp = 0;
if (fetch_value (inline_type))
expandp = 1;
- if (brace_command->e.c->cmd == CM_inlineifclear)
+ if (command_element->e.c->cmd == CM_inlineifclear)
expandp = !expandp;
if (expandp)
- add_extra_integer (brace_command, AI_key_expand_index, 1);
+ add_extra_integer (command_element, AI_key_expand_index,
1);
}
else
expandp = 0;
- add_extra_string_dup (brace_command, AI_key_format, inline_type);
+ add_extra_string_dup (command_element, AI_key_format,
inline_type);
}
/* Skip first argument for a false @inlinefmtifelse */
- if (!expandp && brace_command->e.c->cmd == CM_inlinefmtifelse)
+ if (!expandp && command_element->e.c->cmd == CM_inlinefmtifelse)
{
ELEMENT *elided_arg_elt;
ELEMENT *arg_text_e;
int brace_count = 1;
- add_extra_integer (brace_command, AI_key_expand_index, 2);
+ add_extra_integer (command_element, AI_key_expand_index, 2);
elided_arg_elt = new_element (ET_elided_brace_command_arg);
- add_to_element_args (brace_command, elided_arg_elt);
+ add_to_element_contents (command_element, elided_arg_elt);
arg_text_e = new_text_element (ET_raw);
add_to_element_contents (elided_arg_elt, arg_text_e);
@@ -755,7 +758,7 @@ handle_comma (ELEMENT *current, const char **line_inout)
{ /* format is set, so this is the second comma */
/* Second part (not counting the format) of @inlinefmtifelse when
condition is true. Discard second part. */
- if (brace_command->e.c->cmd == CM_inlinefmtifelse)
+ if (command_element->e.c->cmd == CM_inlinefmtifelse)
expandp = 0;
else
/* the functions is called only for an @-command with 3 arguments for
@@ -773,7 +776,7 @@ handle_comma (ELEMENT *current, const char **line_inout)
int brace_count = 1;
elided_arg_elt = new_element (ET_elided_brace_command_arg);
- add_to_element_args (brace_command, elided_arg_elt);
+ add_to_element_contents (command_element, elided_arg_elt);
arg_text_e = new_text_element (ET_raw);
add_to_element_contents (elided_arg_elt, arg_text_e);
@@ -814,7 +817,10 @@ handle_comma (ELEMENT *current, const char **line_inout)
}
new_arg = new_element (type);
- add_to_element_args (brace_command, new_arg);
+ if (command_flags(command_element) & CF_brace)
+ add_to_element_contents (command_element, new_arg);
+ else
+ add_to_element_args (command_element, new_arg);
spaces_before_e = new_text_element (ET_internal_spaces_before_argument);
add_to_element_contents (new_arg, spaces_before_e);
internal_space_holder = new_arg;
diff --git a/tp/Texinfo/XS/structuring_transfo/structuring.c
b/tp/Texinfo/XS/structuring_transfo/structuring.c
index 38678f42a9..a459f2a0b6 100644
--- a/tp/Texinfo/XS/structuring_transfo/structuring.c
+++ b/tp/Texinfo/XS/structuring_transfo/structuring.c
@@ -30,6 +30,7 @@
#include "document_types.h"
/* fatal */
#include "base_utils.h"
+#include "types_data.h"
#include "tree.h"
#include "extra.h"
#include "builtin_commands.h"
@@ -697,11 +698,15 @@ check_nodes_are_referenced (DOCUMENT *document)
for (i = 0; i < refs->number; i++)
{
ELEMENT *ref = refs->list[i];
- if (ref->e.c->args.number > 0)
+ if (ref->e.c->contents.number > 0)
{
- ELEMENT *label_arg = ref->e.c->args.list[0];
- char *ref_normalized = lookup_extra_string (label_arg,
- AI_key_normalized);
+ ELEMENT *label_arg = ref->e.c->contents.list[0];
+ char *ref_normalized;
+ if (type_data[label_arg->type].flags & TF_text)
+ continue;
+
+ ref_normalized = lookup_extra_string (label_arg,
+ AI_key_normalized);
if (ref_normalized)
{
ELEMENT *target = find_identifier_target (identifiers_target,
@@ -1520,7 +1525,7 @@ associate_internal_references (DOCUMENT *document)
if (ref->type == ET_menu_entry_node)
label_element = ref;
else
- label_element = ref->e.c->args.list[0];
+ label_element = ref->e.c->contents.list[0];
label_node_content
= lookup_extra_container (label_element, AI_key_node_content);
diff --git a/tp/Texinfo/XS/structuring_transfo/transformations.c
b/tp/Texinfo/XS/structuring_transfo/transformations.c
index ce04c29b31..ce610dc9a2 100644
--- a/tp/Texinfo/XS/structuring_transfo/transformations.c
+++ b/tp/Texinfo/XS/structuring_transfo/transformations.c
@@ -116,7 +116,7 @@ protect_first_parenthesis (ELEMENT *element)
current_position
= relocate_source_marks (content->source_mark_list,
-
new_command->e.c->args.list[0]->e.c->contents.list[0],
+ new_command->e.c->contents.list[0]->e.c->contents.list[0],
current_position, u8_len);
destroy_element_empty_source_mark_list (content);
}
@@ -277,7 +277,7 @@ fill_gaps_in_sectioning (ELEMENT *root, ELEMENT
*commands_heading_content)
= new_command_element (ET_brace_command, CM_asis);
ELEMENT *brace_container
= new_element (ET_brace_container);
- add_to_element_args (asis_command, brace_container);
+ add_to_element_contents (asis_command, brace_container);
line_content = asis_command;
}
add_to_element_contents (line_arg, line_content);
@@ -888,9 +888,9 @@ reference_to_arg_internal (const char *type,
while (arguments_order[order_index] >= 0)
{
size_t idx = (size_t) arguments_order[order_index];
- if (e->e.c->args.number > idx)
+ if (e->e.c->contents.number > idx)
{
- ELEMENT *arg = e->e.c->args.list[idx];
+ ELEMENT *arg = e->e.c->contents.list[idx];
/*
this will not detect if the content expands as spaces only, like
@asis{ }, @ , but it is not an issue or could even be considered
@@ -898,7 +898,7 @@ reference_to_arg_internal (const char *type,
*/
if (!is_content_empty (arg, 0))
{
- ELEMENT *removed = remove_from_args (e, idx);
+ ELEMENT *removed = remove_from_contents (e, idx);
size_t i;
if (removed != arg)
fatal ("BUG: reference_to_arg_internal removed != arg");
@@ -1451,7 +1451,7 @@ protect_hashchar_at_line_beginning_internal (const char
*type,
p++;
hashchar->parent = parent;
- add_to_element_args (hashchar, arg);
+ add_to_element_contents (hashchar, arg);
add_to_element_list (container, hashchar);
if (u8_text)
diff --git a/tp/ext/latex2html.pm b/tp/ext/latex2html.pm
index 345ed2f001..493fe3f7a4 100644
--- a/tp/ext/latex2html.pm
+++ b/tp/ext/latex2html.pm
@@ -274,7 +274,7 @@ sub l2h_process($$)
my $command = $element->{'cmdname'};
my $tree;
if ($command eq 'math') {
- $tree = $element->{'args'}->[0];
+ $tree = $element->{'contents'}->[0];
} else {
$tree = {'contents' => [@{$element->{'contents'}}]};
if ($tree->{'contents'}->[0]
diff --git a/tp/ext/tex4ht.pm b/tp/ext/tex4ht.pm
index 01dbb0d734..264ca333a9 100644
--- a/tp/ext/tex4ht.pm
+++ b/tp/ext/tex4ht.pm
@@ -218,7 +218,7 @@ sub tex4ht_prepare($$)
my $cmdname = $element->{'cmdname'};
my $tree;
if ($cmdname eq 'math') {
- $tree = $element->{'args'}->[0];
+ $tree = $element->{'contents'}->[0];
} elsif ($element->{'contents'}) {
$tree = {'contents' => [@{$element->{'contents'}}]};
if (scalar(@{$tree->{'contents'}})
diff --git a/tp/init/documentation_examples.pm
b/tp/init/documentation_examples.pm
index 3edf321a12..013a81d52c 100644
--- a/tp/init/documentation_examples.pm
+++ b/tp/init/documentation_examples.pm
@@ -404,7 +404,7 @@ sub my_test_documentation_convert_xref_commands($$$$)
my $xref_tree_element = $command;
my $prepended = '';
- my $arg_node = $xref_tree_element->{'args'}->[0];
+ my $arg_node = $xref_tree_element->{'contents'}->[0];
if ($arg_node and $arg_node->{'extra'}
and defined($arg_node->{'extra'}->{'normalized'})) {
my $target_node
diff --git a/tp/t/01use.t b/tp/t/01use.t
index 601a0ce896..5f19f1179c 100644
--- a/tp/t/01use.t
+++ b/tp/t/01use.t
@@ -28,7 +28,7 @@ my $manual_tree = { 'cmdname' => 'multitable',
'contents' => [
{'text' => 'xx'},
{'cmdname' => 'b',
- 'args' => [
+ 'contents' => [
{
'type' => 'brace_container',
'contents' => [
@@ -50,7 +50,7 @@ my $manual_tree = { 'cmdname' => 'multitable',
'contents' => [
{ 'text' => "title" },
{ 'cmdname' => 'verb',
- 'args' => [ {
+ 'contents' => [ {
'contents' => [
{ 'text' =>
' in verb } ',
'type' =>
'raw' }
diff --git a/tp/t/09indices.t b/tp/t/09indices.t
index b87272dbde..b632d8fe48 100644
--- a/tp/t/09indices.t
+++ b/tp/t/09indices.t
@@ -1169,13 +1169,13 @@ my @latex_tests_cases_tests =
('syncode_index_print_both',
'same_only_seealso_seeentry');
foreach my $test (@test_formatted) {
+ $test->[2]->{'full_document'} = 1 unless
(exists($test->[2]->{'full_document'}));
push @{$test->[2]->{'test_formats'}}, 'info';
push @{$test->[2]->{'test_formats'}}, 'plaintext';
push @{$test->[2]->{'test_formats'}}, 'html_text';
push @{$test->[2]->{'test_formats'}}, 'xml';
push @{$test->[2]->{'test_formats'}}, 'latex'
if (grep {$_ eq $test->[0]} @latex_tests_cases_tests);
- $test->[2]->{'full_document'} = 1 unless
(exists($test->[2]->{'full_document'}));
}
foreach my $test (@file_tests) {
diff --git a/tp/t/init/footnote_mark_in_inline_content.pm
b/tp/t/init/footnote_mark_in_inline_content.pm
index 296f74bf26..0dee7af4f3 100644
--- a/tp/t/init/footnote_mark_in_inline_content.pm
+++ b/tp/t/init/footnote_mark_in_inline_content.pm
@@ -13,7 +13,7 @@ sub
_texi2any_test_format_single_footnote_in_inline_content($$$$$$)
$self->register_pending_formatted_inline_content($category,
$leading_content);
my $footnote_text
- = $self->convert_tree_new_formatting_context($command->{'args'}->[0],
+ = $self->convert_tree_new_formatting_context($command->{'contents'}->[0],
"$command->{'cmdname'} $number_in_doc $id");
chomp ($footnote_text);
$footnote_text .= "\n";
diff --git a/tp/t/results/alias/alias_of_definfoenclose.pl
b/tp/t/results/alias/alias_of_definfoenclose.pl
index dcaea5f661..66f6066181 100644
--- a/tp/t/results/alias/alias_of_definfoenclose.pl
+++ b/tp/t/results/alias/alias_of_definfoenclose.pl
@@ -89,7 +89,8 @@ $result_trees{'alias_of_definfoenclose'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'phoo',
+ 'contents' => [
{
'contents' => [
{
@@ -99,7 +100,6 @@ $result_trees{'alias_of_definfoenclose'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'phoo',
'extra' => {
'begin' => ';',
'end' => ':'
diff --git
a/tp/t/results/alias/alias_of_definfoenclose_before_definfoenclose.pl
b/tp/t/results/alias/alias_of_definfoenclose_before_definfoenclose.pl
index 546e0388d6..bcd67ddae4 100644
--- a/tp/t/results/alias/alias_of_definfoenclose_before_definfoenclose.pl
+++ b/tp/t/results/alias/alias_of_definfoenclose_before_definfoenclose.pl
@@ -89,7 +89,8 @@
$result_trees{'alias_of_definfoenclose_before_definfoenclose'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'phoo',
+ 'contents' => [
{
'contents' => [
{
@@ -99,7 +100,6 @@
$result_trees{'alias_of_definfoenclose_before_definfoenclose'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'phoo',
'extra' => {
'begin' => ';',
'end' => ':'
diff --git a/tp/t/results/alias/alias_zero.pl b/tp/t/results/alias/alias_zero.pl
index af12f63cbe..05f7c2097b 100644
--- a/tp/t/results/alias/alias_zero.pl
+++ b/tp/t/results/alias/alias_zero.pl
@@ -45,7 +45,8 @@ $result_trees{'alias_zero'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'strong',
+ 'contents' => [
{
'contents' => [
{
@@ -55,7 +56,6 @@ $result_trees{'alias_zero'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'strong',
'info' => {
'alias_of' => '0'
},
diff --git a/tp/t/results/alias/bad_line.pl b/tp/t/results/alias/bad_line.pl
index 0f98560893..1e9cb78c25 100644
--- a/tp/t/results/alias/bad_line.pl
+++ b/tp/t/results/alias/bad_line.pl
@@ -54,7 +54,8 @@ $result_trees{'bad_line'} = {
'text' => 'garbage-on-line =cmd '
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -64,7 +65,6 @@ $result_trees{'bad_line'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 4
}
diff --git a/tp/t/results/alias/recursive_alias.pl
b/tp/t/results/alias/recursive_alias.pl
index 12c1c9b314..966b4f0fcd 100644
--- a/tp/t/results/alias/recursive_alias.pl
+++ b/tp/t/results/alias/recursive_alias.pl
@@ -126,7 +126,8 @@ $result_trees{'recursive_alias'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'strong',
+ 'contents' => [
{
'contents' => [
{
@@ -136,7 +137,6 @@ $result_trees{'recursive_alias'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'strong',
'info' => {
'alias_of' => 'other'
},
diff --git a/tp/t/results/alias/simple.pl b/tp/t/results/alias/simple.pl
index 02fa3a19cb..dc97083d6e 100644
--- a/tp/t/results/alias/simple.pl
+++ b/tp/t/results/alias/simple.pl
@@ -100,7 +100,8 @@ $result_trees{'simple'} = {
'text' => 'Should be code: '
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -110,7 +111,6 @@ $result_trees{'simple'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'info' => {
'alias_of' => 'myalias'
},
@@ -136,7 +136,8 @@ $result_trees{'simple'} = {
'text' => 'Should be verb: '
},
{
- 'args' => [
+ 'cmdname' => 'verb',
+ 'contents' => [
{
'contents' => [
{
@@ -147,7 +148,6 @@ $result_trees{'simple'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'verb',
'info' => {
'alias_of' => 'o-theralias',
'delimiter' => '!'
diff --git a/tp/t/results/alias/texinfo_command_alias.pl
b/tp/t/results/alias/texinfo_command_alias.pl
index be846e274a..75f0d35b01 100644
--- a/tp/t/results/alias/texinfo_command_alias.pl
+++ b/tp/t/results/alias/texinfo_command_alias.pl
@@ -195,7 +195,8 @@ $result_trees{'texinfo_command_alias'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'mystrong',
+ 'contents' => [
{
'contents' => [
{
@@ -205,7 +206,6 @@ $result_trees{'texinfo_command_alias'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'mystrong',
'extra' => {
'begin' => ';',
'end' => ':'
diff --git a/tp/t/results/alias/texinfo_command_alias_indirect_before.pl
b/tp/t/results/alias/texinfo_command_alias_indirect_before.pl
index e031b9bf54..27641512e3 100644
--- a/tp/t/results/alias/texinfo_command_alias_indirect_before.pl
+++ b/tp/t/results/alias/texinfo_command_alias_indirect_before.pl
@@ -150,7 +150,8 @@ $result_trees{'texinfo_command_alias_indirect_before'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'strong',
+ 'contents' => [
{
'contents' => [
{
@@ -160,7 +161,6 @@ $result_trees{'texinfo_command_alias_indirect_before'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'strong',
'info' => {
'alias_of' => 'new'
},
diff --git a/tp/t/results/columnfractions/wrong_command.pl
b/tp/t/results/columnfractions/wrong_command.pl
index 8f568b8cc7..a6f657e6f9 100644
--- a/tp/t/results/columnfractions/wrong_command.pl
+++ b/tp/t/results/columnfractions/wrong_command.pl
@@ -18,7 +18,8 @@ $result_trees{'wrong_command'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'b',
+ 'contents' => [
{
'contents' => [
{
@@ -28,7 +29,6 @@ $result_trees{'wrong_command'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'b',
'source_info' => {
'line_nr' => 1
}
diff --git a/tp/t/results/conditionals/empty_set_in_ifset.pl
b/tp/t/results/conditionals/empty_set_in_ifset.pl
index 380c7147e1..5f090b9a4a 100644
--- a/tp/t/results/conditionals/empty_set_in_ifset.pl
+++ b/tp/t/results/conditionals/empty_set_in_ifset.pl
@@ -73,7 +73,8 @@ $result_trees{'empty_set_in_ifset'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'cmdname' => 'value',
+ 'contents' => [
{
'contents' => [
{
@@ -82,8 +83,7 @@ $result_trees{'empty_set_in_ifset'} = {
],
'type' => 'brace_container'
}
- ],
- 'cmdname' => 'value'
+ ]
},
'line' => '',
'position' => 13,
diff --git a/tp/t/results/conditionals/end_ifset_in_format.pl
b/tp/t/results/conditionals/end_ifset_in_format.pl
index 7bd588108b..268085a7c1 100644
--- a/tp/t/results/conditionals/end_ifset_in_format.pl
+++ b/tp/t/results/conditionals/end_ifset_in_format.pl
@@ -346,7 +346,8 @@ $result_trees{'end_ifset_in_format'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'verb',
+ 'contents' => [
{
'contents' => [
{
@@ -363,7 +364,6 @@ $result_trees{'end_ifset_in_format'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'verb',
'info' => {
'delimiter' => '%'
},
diff --git a/tp/t/results/conditionals/ifset_in_command.pl
b/tp/t/results/conditionals/ifset_in_command.pl
index 0097fa3d9c..75363f5acd 100644
--- a/tp/t/results/conditionals/ifset_in_command.pl
+++ b/tp/t/results/conditionals/ifset_in_command.pl
@@ -17,7 +17,8 @@ $result_trees{'ifset_in_command'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'file',
+ 'contents' => [
{
'contents' => [
{
@@ -174,7 +175,6 @@ $result_trees{'ifset_in_command'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'file',
'source_info' => {
'line_nr' => 2
}
diff --git a/tp/t/results/conditionals/inlinefmtifelse_nesting.pl
b/tp/t/results/conditionals/inlinefmtifelse_nesting.pl
index 11783d364b..59723b6579 100644
--- a/tp/t/results/conditionals/inlinefmtifelse_nesting.pl
+++ b/tp/t/results/conditionals/inlinefmtifelse_nesting.pl
@@ -12,7 +12,8 @@ $result_trees{'inlinefmtifelse_nesting'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'inlinefmtifelse',
+ 'contents' => [
{
'contents' => [
{
@@ -33,7 +34,8 @@ $result_trees{'inlinefmtifelse_nesting'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'emph',
+ 'contents' => [
{
'contents' => [
{
@@ -43,7 +45,6 @@ $result_trees{'inlinefmtifelse_nesting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'emph',
'source_info' => {
'line_nr' => 1
}
@@ -57,7 +58,6 @@ $result_trees{'inlinefmtifelse_nesting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlinefmtifelse',
'extra' => {
'expand_index' => 2,
'format' => 'info'
diff --git a/tp/t/results/conditionals/inlineiffmtifelse_not_closed.pl
b/tp/t/results/conditionals/inlineiffmtifelse_not_closed.pl
index 8e57103d5e..dab5c24d39 100644
--- a/tp/t/results/conditionals/inlineiffmtifelse_not_closed.pl
+++ b/tp/t/results/conditionals/inlineiffmtifelse_not_closed.pl
@@ -12,7 +12,8 @@ $result_trees{'inlineiffmtifelse_not_closed'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'inlinefmtifelse',
+ 'contents' => [
{
'contents' => [
{
@@ -32,7 +33,6 @@ $result_trees{'inlineiffmtifelse_not_closed'} = {
'type' => 'elided_brace_command_arg'
}
],
- 'cmdname' => 'inlinefmtifelse',
'extra' => {
'expand_index' => 2,
'format' => 'html'
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 7c4ab44570..ad469bf4d4 100644
--- a/tp/t/results/conditionals/inlineiffmtifelse_not_closed_three_arg.pl
+++ b/tp/t/results/conditionals/inlineiffmtifelse_not_closed_three_arg.pl
@@ -12,7 +12,8 @@ $result_trees{'inlineiffmtifelse_not_closed_three_arg'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'inlinefmtifelse',
+ 'contents' => [
{
'contents' => [
{
@@ -45,7 +46,6 @@ $result_trees{'inlineiffmtifelse_not_closed_three_arg'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlinefmtifelse',
'extra' => {
'expand_index' => 2,
'format' => 'html'
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 bcb678c534..8945d3d36c 100644
--- a/tp/t/results/conditionals/inlineiffmtifelse_not_closed_two_arg.pl
+++ b/tp/t/results/conditionals/inlineiffmtifelse_not_closed_two_arg.pl
@@ -12,7 +12,8 @@ $result_trees{'inlineiffmtifelse_not_closed_two_arg'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'inlinefmtifelse',
+ 'contents' => [
{
'contents' => [
{
@@ -32,7 +33,6 @@ $result_trees{'inlineiffmtifelse_not_closed_two_arg'} = {
'type' => 'elided_brace_command_arg'
}
],
- 'cmdname' => 'inlinefmtifelse',
'extra' => {
'expand_index' => 2,
'format' => 'html'
diff --git a/tp/t/results/conditionals/inlineifset_false_not_closed.pl
b/tp/t/results/conditionals/inlineifset_false_not_closed.pl
index 27487f1cb7..76154a2b21 100644
--- a/tp/t/results/conditionals/inlineifset_false_not_closed.pl
+++ b/tp/t/results/conditionals/inlineifset_false_not_closed.pl
@@ -12,7 +12,8 @@ $result_trees{'inlineifset_false_not_closed'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'inlineifset',
+ 'contents' => [
{
'contents' => [
{
@@ -32,7 +33,6 @@ $result_trees{'inlineifset_false_not_closed'} = {
'type' => 'elided_brace_command_arg'
}
],
- 'cmdname' => 'inlineifset',
'extra' => {
'format' => 'aaa'
},
diff --git a/tp/t/results/conditionals/value_on_ifset.pl
b/tp/t/results/conditionals/value_on_ifset.pl
index 7f90d11756..11fcb3a42d 100644
--- a/tp/t/results/conditionals/value_on_ifset.pl
+++ b/tp/t/results/conditionals/value_on_ifset.pl
@@ -79,7 +79,8 @@ $result_trees{'value_on_ifset'} = {
{
'counter' => 1,
'element' => {
- 'args' => [
+ 'cmdname' => 'value',
+ 'contents' => [
{
'contents' => [
{
@@ -88,8 +89,7 @@ $result_trees{'value_on_ifset'} = {
],
'type' => 'brace_container'
}
- ],
- 'cmdname' => 'value'
+ ]
},
'line' => 'x',
'position' => 1,
diff --git a/tp/t/results/converters_tests/accent_with_text.pl
b/tp/t/results/converters_tests/accent_with_text.pl
index 8b3954962e..1a0060cf3f 100644
--- a/tp/t/results/converters_tests/accent_with_text.pl
+++ b/tp/t/results/converters_tests/accent_with_text.pl
@@ -12,7 +12,8 @@ $result_trees{'accent_with_text'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'u',
+ 'contents' => [
{
'contents' => [
{
@@ -22,7 +23,6 @@ $result_trees{'accent_with_text'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'u',
'source_info' => {
'line_nr' => 1
}
@@ -31,7 +31,8 @@ $result_trees{'accent_with_text'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'dotless',
+ 'contents' => [
{
'contents' => [
{
@@ -41,7 +42,6 @@ $result_trees{'accent_with_text'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'dotless',
'source_info' => {
'line_nr' => 1
}
@@ -50,14 +50,16 @@ $result_trees{'accent_with_text'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => '^',
+ 'contents' => [
{
'contents' => [
{
'text' => '--'
},
{
- 'args' => [
+ 'cmdname' => 'dotless',
+ 'contents' => [
{
'contents' => [
{
@@ -67,7 +69,6 @@ $result_trees{'accent_with_text'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'dotless',
'source_info' => {
'line_nr' => 1
}
@@ -76,7 +77,6 @@ $result_trees{'accent_with_text'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => '^',
'source_info' => {
'line_nr' => 1
}
@@ -85,14 +85,16 @@ $result_trees{'accent_with_text'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => '^',
+ 'contents' => [
{
'contents' => [
{
'text' => '--'
},
{
- 'args' => [
+ 'cmdname' => 'dotless',
+ 'contents' => [
{
'contents' => [
{
@@ -102,7 +104,6 @@ $result_trees{'accent_with_text'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'dotless',
'source_info' => {
'line_nr' => 1
}
@@ -111,7 +112,6 @@ $result_trees{'accent_with_text'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => '^',
'source_info' => {
'line_nr' => 1
}
@@ -120,7 +120,8 @@ $result_trees{'accent_with_text'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => '^',
+ 'contents' => [
{
'contents' => [
{
@@ -130,7 +131,6 @@ $result_trees{'accent_with_text'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => '^',
'source_info' => {
'line_nr' => 1
}
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 300169a3a6..d053490a9e 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -210,7 +210,8 @@ $result_trees{'at_commands_in_raw'} = {
'text' => '<b>in b'
},
{
- 'args' => [
+ 'cmdname' => 'footnote',
+ 'contents' => [
{
'contents' => [
{
@@ -225,7 +226,6 @@ $result_trees{'at_commands_in_raw'} = {
'type' => 'brace_command_context'
}
],
- 'cmdname' => 'footnote',
'extra' => {},
'source_info' => {
'line_nr' => 12
@@ -236,7 +236,8 @@ $result_trees{'at_commands_in_raw'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'anchor',
+ 'contents' => [
{
'contents' => [
{
@@ -246,7 +247,6 @@ $result_trees{'at_commands_in_raw'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'anchor',
'extra' => {
'is_target' => 1,
'normalized' => 'anchor-in-html'
@@ -301,7 +301,8 @@ $result_trees{'at_commands_in_raw'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'kbd',
+ 'contents' => [
{
'contents' => [
{
@@ -311,13 +312,13 @@ $result_trees{'at_commands_in_raw'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'kbd',
'source_info' => {
'line_nr' => 15
}
},
{
- 'args' => [
+ 'cmdname' => 'footnote',
+ 'contents' => [
{
'contents' => [
{
@@ -332,7 +333,6 @@ $result_trees{'at_commands_in_raw'} = {
'type' => 'brace_command_context'
}
],
- 'cmdname' => 'footnote',
'extra' => {},
'source_info' => {
'line_nr' => 15
@@ -635,7 +635,8 @@ $result_trees{'at_commands_in_raw'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'value',
+ 'contents' => [
{
'contents' => [
{
@@ -644,8 +645,7 @@ $result_trees{'at_commands_in_raw'} = {
],
'type' => 'brace_container'
}
- ],
- 'cmdname' => 'value'
+ ]
},
{
'contents' => [
@@ -664,7 +664,8 @@ $result_trees{'at_commands_in_raw'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'kbd',
+ 'contents' => [
{
'contents' => [
{
@@ -674,7 +675,6 @@ $result_trees{'at_commands_in_raw'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'kbd',
'source_info' => {
'line_nr' => 67
}
@@ -694,7 +694,8 @@ $result_trees{'at_commands_in_raw'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'xref',
+ 'contents' => [
{
'contents' => [
{
@@ -712,7 +713,6 @@ $result_trees{'at_commands_in_raw'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'xref',
'source_info' => {
'line_nr' => 69
}
@@ -732,7 +732,8 @@ $result_trees{'at_commands_in_raw'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -750,7 +751,6 @@ $result_trees{'at_commands_in_raw'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 71
}
@@ -928,7 +928,8 @@ $result_trees{'at_commands_in_raw'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'acronym',
+ 'contents' => [
{
'contents' => [
{
@@ -938,7 +939,6 @@ $result_trees{'at_commands_in_raw'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'acronym',
'source_info' => {
'line_nr' => 81
}
@@ -1052,8 +1052,8 @@ $result_trees{'at_commands_in_raw'} = {
],
'type' => 'document_root'
};
-$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'at_commands_in_raw'}{'contents'}[3];
$result_texis{'at_commands_in_raw'} = '@node Top
diff --git a/tp/t/results/converters_tests/combined_fonts.pl
b/tp/t/results/converters_tests/combined_fonts.pl
index f25e3eb36e..b555b9cc65 100644
--- a/tp/t/results/converters_tests/combined_fonts.pl
+++ b/tp/t/results/converters_tests/combined_fonts.pl
@@ -176,7 +176,8 @@ $result_trees{'combined_fonts'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -186,7 +187,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 9
}
@@ -195,7 +195,8 @@ $result_trees{'combined_fonts'} = {
'text' => ', '
},
{
- 'args' => [
+ 'cmdname' => 'dfn',
+ 'contents' => [
{
'contents' => [
{
@@ -205,7 +206,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'dfn',
'source_info' => {
'line_nr' => 9
}
@@ -214,7 +214,8 @@ $result_trees{'combined_fonts'} = {
'text' => ', '
},
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -224,7 +225,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 9
}
@@ -233,7 +233,8 @@ $result_trees{'combined_fonts'} = {
'text' => ', '
},
{
- 'args' => [
+ 'cmdname' => 'strong',
+ 'contents' => [
{
'contents' => [
{
@@ -243,7 +244,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'strong',
'source_info' => {
'line_nr' => 9
}
@@ -252,7 +252,8 @@ $result_trees{'combined_fonts'} = {
'text' => ', '
},
{
- 'args' => [
+ 'cmdname' => 'kbd',
+ 'contents' => [
{
'contents' => [
{
@@ -262,7 +263,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'kbd',
'source_info' => {
'line_nr' => 9
}
@@ -271,7 +271,8 @@ $result_trees{'combined_fonts'} = {
'text' => ', '
},
{
- 'args' => [
+ 'cmdname' => 'samp',
+ 'contents' => [
{
'contents' => [
{
@@ -281,7 +282,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'samp',
'source_info' => {
'line_nr' => 9
}
@@ -301,11 +301,13 @@ $result_trees{'combined_fonts'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'dfn',
+ 'contents' => [
{
'contents' => [
{
@@ -315,7 +317,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'dfn',
'source_info' => {
'line_nr' => 11
}
@@ -324,7 +325,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 11
}
@@ -334,11 +334,13 @@ $result_trees{'combined_fonts'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -348,7 +350,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 12
}
@@ -357,7 +358,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 12
}
@@ -367,11 +367,13 @@ $result_trees{'combined_fonts'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -381,7 +383,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 13
}
@@ -390,7 +391,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 13
}
@@ -400,11 +400,13 @@ $result_trees{'combined_fonts'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'strong',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'kbd',
+ 'contents' => [
{
'contents' => [
{
@@ -414,7 +416,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'kbd',
'source_info' => {
'line_nr' => 14
}
@@ -423,7 +424,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'strong',
'source_info' => {
'line_nr' => 14
}
@@ -433,11 +433,13 @@ $result_trees{'combined_fonts'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'samp',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'strong',
+ 'contents' => [
{
'contents' => [
{
@@ -447,7 +449,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'strong',
'source_info' => {
'line_nr' => 15
}
@@ -456,7 +457,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'samp',
'source_info' => {
'line_nr' => 15
}
@@ -466,11 +466,13 @@ $result_trees{'combined_fonts'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'strong',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'samp',
+ 'contents' => [
{
'contents' => [
{
@@ -480,7 +482,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'samp',
'source_info' => {
'line_nr' => 16
}
@@ -489,7 +490,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'strong',
'source_info' => {
'line_nr' => 16
}
@@ -509,7 +509,8 @@ $result_trees{'combined_fonts'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'cite',
+ 'contents' => [
{
'contents' => [
{
@@ -519,7 +520,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'cite',
'source_info' => {
'line_nr' => 18
}
@@ -539,11 +539,13 @@ $result_trees{'combined_fonts'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'cite',
+ 'contents' => [
{
'contents' => [
{
@@ -553,7 +555,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'cite',
'source_info' => {
'line_nr' => 20
}
@@ -562,7 +563,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 20
}
@@ -572,11 +572,13 @@ $result_trees{'combined_fonts'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'cite',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -586,7 +588,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 21
}
@@ -595,7 +596,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'cite',
'source_info' => {
'line_nr' => 21
}
@@ -615,7 +615,8 @@ $result_trees{'combined_fonts'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -625,7 +626,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 23
}
@@ -634,7 +634,8 @@ $result_trees{'combined_fonts'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -644,7 +645,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 23
}
@@ -653,7 +653,8 @@ $result_trees{'combined_fonts'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'b',
+ 'contents' => [
{
'contents' => [
{
@@ -663,7 +664,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'b',
'source_info' => {
'line_nr' => 23
}
@@ -672,7 +672,8 @@ $result_trees{'combined_fonts'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -682,7 +683,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 23
}
@@ -702,11 +702,13 @@ $result_trees{'combined_fonts'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -716,7 +718,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 25
}
@@ -725,7 +726,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 25
}
@@ -735,11 +735,13 @@ $result_trees{'combined_fonts'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -749,7 +751,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 26
}
@@ -758,7 +759,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 26
}
@@ -768,11 +768,13 @@ $result_trees{'combined_fonts'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'b',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -782,7 +784,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 27
}
@@ -791,7 +792,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'b',
'source_info' => {
'line_nr' => 27
}
@@ -801,11 +801,13 @@ $result_trees{'combined_fonts'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'b',
+ 'contents' => [
{
'contents' => [
{
@@ -815,7 +817,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'b',
'source_info' => {
'line_nr' => 28
}
@@ -824,7 +825,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 28
}
@@ -834,11 +834,13 @@ $result_trees{'combined_fonts'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -848,7 +850,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 29
}
@@ -857,7 +858,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 29
}
@@ -867,11 +867,13 @@ $result_trees{'combined_fonts'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -881,7 +883,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 30
}
@@ -890,7 +891,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 30
}
@@ -900,11 +900,13 @@ $result_trees{'combined_fonts'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -914,7 +916,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 31
}
@@ -923,7 +924,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 31
}
@@ -933,11 +933,13 @@ $result_trees{'combined_fonts'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -947,7 +949,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 32
}
@@ -956,7 +957,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 32
}
@@ -990,7 +990,8 @@ $result_trees{'combined_fonts'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -1000,7 +1001,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 35
}
@@ -1010,7 +1010,8 @@ $result_trees{'combined_fonts'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'cite',
+ 'contents' => [
{
'contents' => [
{
@@ -1020,7 +1021,6 @@ $result_trees{'combined_fonts'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'cite',
'source_info' => {
'line_nr' => 36
}
diff --git a/tp/t/results/converters_tests/commands_in_sc.pl
b/tp/t/results/converters_tests/commands_in_sc.pl
index 2f1c16345c..ab22aa940d 100644
--- a/tp/t/results/converters_tests/commands_in_sc.pl
+++ b/tp/t/results/converters_tests/commands_in_sc.pl
@@ -134,14 +134,16 @@ $result_trees{'commands_in_sc'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'sc',
+ 'contents' => [
{
'contents' => [
{
'text' => 'a '
},
{
- 'args' => [
+ 'cmdname' => '~',
+ 'contents' => [
{
'contents' => [
{
@@ -151,7 +153,6 @@ $result_trees{'commands_in_sc'} = {
'type' => 'following_arg'
}
],
- 'cmdname' => '~',
'source_info' => {
'line_nr' => 7
}
@@ -160,12 +161,12 @@ $result_trees{'commands_in_sc'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'aa',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'aa',
'source_info' => {
'line_nr' => 7
}
@@ -174,12 +175,12 @@ $result_trees{'commands_in_sc'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'TeX',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'TeX',
'source_info' => {
'line_nr' => 7
}
@@ -188,7 +189,8 @@ $result_trees{'commands_in_sc'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'image',
+ 'contents' => [
{
'contents' => [
{
@@ -198,7 +200,6 @@ $result_trees{'commands_in_sc'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'image',
'extra' => {
'input_encoding_name' => 'utf-8'
},
@@ -210,7 +211,8 @@ $result_trees{'commands_in_sc'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -228,7 +230,6 @@ $result_trees{'commands_in_sc'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 7
}
@@ -237,7 +238,8 @@ $result_trees{'commands_in_sc'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'xref',
+ 'contents' => [
{
'contents' => [
{
@@ -268,7 +270,6 @@ $result_trees{'commands_in_sc'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'xref',
'source_info' => {
'line_nr' => 7
}
@@ -278,7 +279,8 @@ $result_trees{'commands_in_sc'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -314,7 +316,6 @@ $result_trees{'commands_in_sc'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 8
}
@@ -323,7 +324,8 @@ $result_trees{'commands_in_sc'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'inlinefmtifelse',
+ 'contents' => [
{
'contents' => [
{
@@ -344,7 +346,8 @@ $result_trees{'commands_in_sc'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'verb',
+ 'contents' => [
{
'contents' => [
{
@@ -355,7 +358,6 @@ $result_trees{'commands_in_sc'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'verb',
'info' => {
'delimiter' => '!'
},
@@ -367,7 +369,6 @@ $result_trees{'commands_in_sc'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlinefmtifelse',
'extra' => {
'expand_index' => 2,
'format' => 'latex'
@@ -380,7 +381,8 @@ $result_trees{'commands_in_sc'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'anchor',
+ 'contents' => [
{
'contents' => [
{
@@ -390,7 +392,6 @@ $result_trees{'commands_in_sc'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'anchor',
'extra' => {
'is_target' => 1,
'normalized' => 'inanchor'
@@ -404,7 +405,8 @@ $result_trees{'commands_in_sc'} = {
'type' => 'spaces_after_close_brace'
},
{
- 'args' => [
+ 'cmdname' => 'hyphenation',
+ 'contents' => [
{
'contents' => [
{
@@ -414,7 +416,6 @@ $result_trees{'commands_in_sc'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'hyphenation',
'extra' => {},
'source_info' => {
'line_nr' => 8
@@ -426,7 +427,8 @@ $result_trees{'commands_in_sc'} = {
'type' => 'spaces_after_close_brace'
},
{
- 'args' => [
+ 'cmdname' => 'U',
+ 'contents' => [
{
'contents' => [
{
@@ -436,7 +438,6 @@ $result_trees{'commands_in_sc'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'U',
'source_info' => {
'line_nr' => 9
}
@@ -445,7 +446,8 @@ $result_trees{'commands_in_sc'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'math',
+ 'contents' => [
{
'contents' => [
{
@@ -455,7 +457,6 @@ $result_trees{'commands_in_sc'} = {
'type' => 'brace_command_context'
}
],
- 'cmdname' => 'math',
'source_info' => {
'line_nr' => 9
}
@@ -464,7 +465,8 @@ $result_trees{'commands_in_sc'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'footnote',
+ 'contents' => [
{
'contents' => [
{
@@ -479,7 +481,6 @@ $result_trees{'commands_in_sc'} = {
'type' => 'brace_command_context'
}
],
- 'cmdname' => 'footnote',
'extra' => {},
'source_info' => {
'line_nr' => 9
@@ -489,7 +490,8 @@ $result_trees{'commands_in_sc'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'url',
+ 'contents' => [
{
'contents' => [
{
@@ -499,7 +501,6 @@ $result_trees{'commands_in_sc'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'url',
'source_info' => {
'line_nr' => 9
}
@@ -508,7 +509,8 @@ $result_trees{'commands_in_sc'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'url',
+ 'contents' => [
{
'contents' => [
{
@@ -526,7 +528,6 @@ $result_trees{'commands_in_sc'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'url',
'source_info' => {
'line_nr' => 9
}
@@ -535,7 +536,8 @@ $result_trees{'commands_in_sc'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'url',
+ 'contents' => [
{
'info' => {
'spaces_before_argument' => {
@@ -553,7 +555,6 @@ $result_trees{'commands_in_sc'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'url',
'source_info' => {
'line_nr' => 9
}
@@ -563,7 +564,8 @@ $result_trees{'commands_in_sc'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'url',
+ 'contents' => [
{
'type' => 'brace_arg'
},
@@ -579,7 +581,6 @@ $result_trees{'commands_in_sc'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'url',
'source_info' => {
'line_nr' => 10
}
@@ -588,7 +589,8 @@ $result_trees{'commands_in_sc'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'email',
+ 'contents' => [
{
'contents' => [
{
@@ -617,7 +619,6 @@ $result_trees{'commands_in_sc'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'email',
'source_info' => {
'line_nr' => 10
}
@@ -626,7 +627,8 @@ $result_trees{'commands_in_sc'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'abbr',
+ 'contents' => [
{
'contents' => [
{
@@ -649,7 +651,6 @@ $result_trees{'commands_in_sc'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'abbr',
'source_info' => {
'line_nr' => 10
}
@@ -658,7 +659,6 @@ $result_trees{'commands_in_sc'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'sc',
'source_info' => {
'line_nr' => 7
}
@@ -682,10 +682,10 @@ $result_trees{'commands_in_sc'} = {
],
'type' => 'document_root'
};
-$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[1];
-$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[3];
-$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[13]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0];
+$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0];
+$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'contents'}[1];
+$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'contents'}[3];
+$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[13]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[13]{'contents'}[0]{'contents'}[0];
$result_texis{'commands_in_sc'} = '@node Top
@top commands in sc
diff --git a/tp/t/results/converters_tests/commands_in_settitle_with_title.pl
b/tp/t/results/converters_tests/commands_in_settitle_with_title.pl
index 929731c2da..21b4aae62c 100644
--- a/tp/t/results/converters_tests/commands_in_settitle_with_title.pl
+++ b/tp/t/results/converters_tests/commands_in_settitle_with_title.pl
@@ -14,14 +14,16 @@ $result_trees{'commands_in_settitle_with_title'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'sc',
+ 'contents' => [
{
'contents' => [
{
'text' => 'sc '
},
{
- 'args' => [
+ 'cmdname' => '~',
+ 'contents' => [
{
'contents' => [
{
@@ -31,7 +33,6 @@ $result_trees{'commands_in_settitle_with_title'} = {
'type' => 'following_arg'
}
],
- 'cmdname' => '~',
'source_info' => {
'line_nr' => 1
}
@@ -40,12 +41,12 @@ $result_trees{'commands_in_settitle_with_title'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'aa',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'aa',
'source_info' => {
'line_nr' => 1
}
@@ -54,12 +55,12 @@ $result_trees{'commands_in_settitle_with_title'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'TeX',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'TeX',
'source_info' => {
'line_nr' => 1
}
@@ -68,7 +69,6 @@ $result_trees{'commands_in_settitle_with_title'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'sc',
'source_info' => {
'line_nr' => 1
}
@@ -77,7 +77,8 @@ $result_trees{'commands_in_settitle_with_title'} = {
'text' => ' node '
},
{
- 'args' => [
+ 'cmdname' => '"',
+ 'contents' => [
{
'contents' => [
{
@@ -87,7 +88,6 @@ $result_trees{'commands_in_settitle_with_title'} = {
'type' => 'following_arg'
}
],
- 'cmdname' => '"',
'source_info' => {
'line_nr' => 1
}
@@ -96,11 +96,13 @@ $result_trees{'commands_in_settitle_with_title'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => '"',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'dotless',
+ 'contents' => [
{
'contents' => [
{
@@ -110,7 +112,6 @@ $result_trees{'commands_in_settitle_with_title'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'dotless',
'source_info' => {
'line_nr' => 1
}
@@ -119,7 +120,6 @@ $result_trees{'commands_in_settitle_with_title'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => '"',
'source_info' => {
'line_nr' => 1
}
@@ -128,11 +128,13 @@ $result_trees{'commands_in_settitle_with_title'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => '`',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => '=',
+ 'contents' => [
{
'contents' => [
{
@@ -142,7 +144,6 @@ $result_trees{'commands_in_settitle_with_title'} = {
'type' => 'following_arg'
}
],
- 'cmdname' => '=',
'source_info' => {
'line_nr' => 1
}
@@ -151,7 +152,6 @@ $result_trees{'commands_in_settitle_with_title'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => '`',
'source_info' => {
'line_nr' => 1
}
@@ -160,12 +160,12 @@ $result_trees{'commands_in_settitle_with_title'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'l',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'l',
'source_info' => {
'line_nr' => 1
}
@@ -174,11 +174,13 @@ $result_trees{'commands_in_settitle_with_title'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => ',',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => '\'',
+ 'contents' => [
{
'contents' => [
{
@@ -188,7 +190,6 @@ $result_trees{'commands_in_settitle_with_title'} = {
'type' => 'following_arg'
}
],
- 'cmdname' => '\'',
'source_info' => {
'line_nr' => 1
}
@@ -197,7 +198,6 @@ $result_trees{'commands_in_settitle_with_title'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => ',',
'source_info' => {
'line_nr' => 1
}
@@ -206,12 +206,12 @@ $result_trees{'commands_in_settitle_with_title'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'exclamdown',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'exclamdown',
'source_info' => {
'line_nr' => 1
}
diff --git a/tp/t/results/converters_tests/commands_in_var.pl
b/tp/t/results/converters_tests/commands_in_var.pl
index 25fa53a46f..31c9b28f20 100644
--- a/tp/t/results/converters_tests/commands_in_var.pl
+++ b/tp/t/results/converters_tests/commands_in_var.pl
@@ -134,14 +134,16 @@ $result_trees{'commands_in_var'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
'text' => 'a '
},
{
- 'args' => [
+ 'cmdname' => '~',
+ 'contents' => [
{
'contents' => [
{
@@ -151,7 +153,6 @@ $result_trees{'commands_in_var'} = {
'type' => 'following_arg'
}
],
- 'cmdname' => '~',
'source_info' => {
'line_nr' => 7
}
@@ -160,12 +161,12 @@ $result_trees{'commands_in_var'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'aa',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'aa',
'source_info' => {
'line_nr' => 7
}
@@ -174,12 +175,12 @@ $result_trees{'commands_in_var'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'TeX',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'TeX',
'source_info' => {
'line_nr' => 7
}
@@ -188,7 +189,8 @@ $result_trees{'commands_in_var'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'image',
+ 'contents' => [
{
'contents' => [
{
@@ -198,7 +200,6 @@ $result_trees{'commands_in_var'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'image',
'extra' => {
'input_encoding_name' => 'utf-8'
},
@@ -210,7 +211,8 @@ $result_trees{'commands_in_var'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -228,7 +230,6 @@ $result_trees{'commands_in_var'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 7
}
@@ -237,7 +238,8 @@ $result_trees{'commands_in_var'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'xref',
+ 'contents' => [
{
'contents' => [
{
@@ -268,7 +270,6 @@ $result_trees{'commands_in_var'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'xref',
'source_info' => {
'line_nr' => 7
}
@@ -278,7 +279,8 @@ $result_trees{'commands_in_var'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -314,7 +316,6 @@ $result_trees{'commands_in_var'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 8
}
@@ -323,7 +324,8 @@ $result_trees{'commands_in_var'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'inlinefmtifelse',
+ 'contents' => [
{
'contents' => [
{
@@ -344,7 +346,8 @@ $result_trees{'commands_in_var'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'verb',
+ 'contents' => [
{
'contents' => [
{
@@ -355,7 +358,6 @@ $result_trees{'commands_in_var'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'verb',
'info' => {
'delimiter' => '!'
},
@@ -367,7 +369,6 @@ $result_trees{'commands_in_var'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlinefmtifelse',
'extra' => {
'expand_index' => 2,
'format' => 'latex'
@@ -380,7 +381,8 @@ $result_trees{'commands_in_var'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'anchor',
+ 'contents' => [
{
'contents' => [
{
@@ -390,7 +392,6 @@ $result_trees{'commands_in_var'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'anchor',
'extra' => {
'is_target' => 1,
'normalized' => 'inanchor'
@@ -404,7 +405,8 @@ $result_trees{'commands_in_var'} = {
'type' => 'spaces_after_close_brace'
},
{
- 'args' => [
+ 'cmdname' => 'hyphenation',
+ 'contents' => [
{
'contents' => [
{
@@ -414,7 +416,6 @@ $result_trees{'commands_in_var'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'hyphenation',
'extra' => {},
'source_info' => {
'line_nr' => 8
@@ -426,7 +427,8 @@ $result_trees{'commands_in_var'} = {
'type' => 'spaces_after_close_brace'
},
{
- 'args' => [
+ 'cmdname' => 'U',
+ 'contents' => [
{
'contents' => [
{
@@ -436,7 +438,6 @@ $result_trees{'commands_in_var'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'U',
'source_info' => {
'line_nr' => 9
}
@@ -445,7 +446,8 @@ $result_trees{'commands_in_var'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'math',
+ 'contents' => [
{
'contents' => [
{
@@ -455,7 +457,6 @@ $result_trees{'commands_in_var'} = {
'type' => 'brace_command_context'
}
],
- 'cmdname' => 'math',
'source_info' => {
'line_nr' => 9
}
@@ -464,7 +465,8 @@ $result_trees{'commands_in_var'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'footnote',
+ 'contents' => [
{
'contents' => [
{
@@ -479,7 +481,6 @@ $result_trees{'commands_in_var'} = {
'type' => 'brace_command_context'
}
],
- 'cmdname' => 'footnote',
'extra' => {},
'source_info' => {
'line_nr' => 9
@@ -489,7 +490,8 @@ $result_trees{'commands_in_var'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'url',
+ 'contents' => [
{
'contents' => [
{
@@ -499,7 +501,6 @@ $result_trees{'commands_in_var'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'url',
'source_info' => {
'line_nr' => 9
}
@@ -508,7 +509,8 @@ $result_trees{'commands_in_var'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'url',
+ 'contents' => [
{
'contents' => [
{
@@ -526,7 +528,6 @@ $result_trees{'commands_in_var'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'url',
'source_info' => {
'line_nr' => 9
}
@@ -535,7 +536,8 @@ $result_trees{'commands_in_var'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'url',
+ 'contents' => [
{
'info' => {
'spaces_before_argument' => {
@@ -553,7 +555,6 @@ $result_trees{'commands_in_var'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'url',
'source_info' => {
'line_nr' => 9
}
@@ -563,7 +564,8 @@ $result_trees{'commands_in_var'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'url',
+ 'contents' => [
{
'type' => 'brace_arg'
},
@@ -579,7 +581,6 @@ $result_trees{'commands_in_var'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'url',
'source_info' => {
'line_nr' => 10
}
@@ -588,7 +589,8 @@ $result_trees{'commands_in_var'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'email',
+ 'contents' => [
{
'contents' => [
{
@@ -617,7 +619,6 @@ $result_trees{'commands_in_var'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'email',
'source_info' => {
'line_nr' => 10
}
@@ -626,7 +627,8 @@ $result_trees{'commands_in_var'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'abbr',
+ 'contents' => [
{
'contents' => [
{
@@ -649,7 +651,6 @@ $result_trees{'commands_in_var'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'abbr',
'source_info' => {
'line_nr' => 10
}
@@ -658,7 +659,6 @@ $result_trees{'commands_in_var'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 7
}
@@ -682,10 +682,10 @@ $result_trees{'commands_in_var'} = {
],
'type' => 'document_root'
};
-$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[1];
-$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[3];
-$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[13]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0];
+$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0];
+$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'contents'}[1];
+$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'contents'}[3];
+$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[13]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[13]{'contents'}[0]{'contents'}[0];
$result_texis{'commands_in_var'} = '@node Top
@top commands in var
diff --git a/tp/t/results/converters_tests/complex_nestings.pl
b/tp/t/results/converters_tests/complex_nestings.pl
index c7ed62e7ac..e7f2745561 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -226,7 +226,8 @@ $result_trees{'complex_nestings'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -236,7 +237,6 @@ $result_trees{'complex_nestings'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 9
}
@@ -256,12 +256,12 @@ $result_trees{'complex_nestings'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'dots',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'dots',
'source_info' => {
'line_nr' => 9
}
diff --git
a/tp/t/results/converters_tests/conversion_with_undef_customization.pl
b/tp/t/results/converters_tests/conversion_with_undef_customization.pl
index fdc9d86b75..18b0905dcb 100644
--- a/tp/t/results/converters_tests/conversion_with_undef_customization.pl
+++ b/tp/t/results/converters_tests/conversion_with_undef_customization.pl
@@ -122,7 +122,8 @@ $result_trees{'conversion_with_undef_customization'} = {
'text' => 'chap'
},
{
- 'args' => [
+ 'cmdname' => '^',
+ 'contents' => [
{
'contents' => [
{
@@ -132,7 +133,6 @@ $result_trees{'conversion_with_undef_customization'} = {
'type' => 'following_arg'
}
],
- 'cmdname' => '^',
'source_info' => {
'line_nr' => 7
}
@@ -169,7 +169,8 @@ $result_trees{'conversion_with_undef_customization'} = {
'text' => 'Chap'
},
{
- 'args' => [
+ 'cmdname' => '^',
+ 'contents' => [
{
'contents' => [
{
@@ -179,7 +180,6 @@ $result_trees{'conversion_with_undef_customization'} = {
'type' => 'following_arg'
}
],
- 'cmdname' => '^',
'source_info' => {
'line_nr' => 8
}
@@ -207,7 +207,8 @@ $result_trees{'conversion_with_undef_customization'} = {
'text' => 'Text'
},
{
- 'args' => [
+ 'cmdname' => 'footnote',
+ 'contents' => [
{
'contents' => [
{
@@ -216,7 +217,8 @@ $result_trees{'conversion_with_undef_customization'} = {
'text' => 'Go '
},
{
- 'args' => [
+ 'cmdname' => 'samp',
+ 'contents' => [
{
'contents' => [
{
@@ -226,7 +228,6 @@ $result_trees{'conversion_with_undef_customization'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'samp',
'source_info' => {
'line_nr' => 10
}
@@ -238,7 +239,6 @@ $result_trees{'conversion_with_undef_customization'} = {
'type' => 'brace_command_context'
}
],
- 'cmdname' => 'footnote',
'extra' => {},
'source_info' => {
'line_nr' => 10
diff --git a/tp/t/results/converters_tests/definition_commands.pl
b/tp/t/results/converters_tests/definition_commands.pl
index 914a5bc891..71731f62ee 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -252,7 +252,8 @@ $result_trees{'definition_commands'} = {
'text' => 'deffn no var for '
},
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -262,7 +263,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 8
}
@@ -271,7 +271,8 @@ $result_trees{'definition_commands'} = {
'text' => ' and '
},
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -281,7 +282,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 8
}
@@ -387,7 +387,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -397,7 +398,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 11
}
@@ -417,7 +417,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -427,7 +428,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 11
}
@@ -483,7 +483,8 @@ $result_trees{'definition_commands'} = {
'text' => 'deffn explict var for '
},
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -493,7 +494,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 12
}
@@ -502,7 +502,8 @@ $result_trees{'definition_commands'} = {
'text' => ' and '
},
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -512,7 +513,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 12
}
@@ -618,11 +618,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -632,7 +634,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 15
}
@@ -641,7 +642,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 15
}
@@ -661,11 +661,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -675,7 +677,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 15
}
@@ -684,7 +685,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 15
}
@@ -740,7 +740,8 @@ $result_trees{'definition_commands'} = {
'text' => 'deffn r slanted for '
},
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -750,7 +751,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 16
}
@@ -759,7 +759,8 @@ $result_trees{'definition_commands'} = {
'text' => ' and '
},
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -769,7 +770,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 16
}
@@ -1088,7 +1088,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
@@ -1098,7 +1099,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 20
}
@@ -1148,7 +1148,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
@@ -1158,7 +1159,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 20
}
@@ -1187,7 +1187,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
@@ -1197,7 +1198,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 20
}
@@ -1341,7 +1341,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -1351,7 +1352,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 21
}
@@ -1401,7 +1401,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -1411,7 +1412,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 21
}
@@ -1440,7 +1440,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -1450,7 +1451,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 21
}
@@ -1594,7 +1594,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -1604,7 +1605,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 22
}
@@ -1654,7 +1654,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -1664,7 +1665,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 22
}
@@ -1693,7 +1693,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -1703,7 +1704,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 22
}
@@ -1847,7 +1847,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1857,7 +1858,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 23
}
@@ -1907,7 +1907,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1917,7 +1918,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 23
}
@@ -1946,7 +1946,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1956,7 +1957,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 23
}
@@ -2100,7 +2100,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -2110,7 +2111,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 24
}
@@ -2160,7 +2160,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -2170,7 +2171,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 24
}
@@ -2199,7 +2199,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -2209,7 +2210,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 24
}
@@ -2353,11 +2353,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'b',
+ 'contents' => [
{
'contents' => [
{
@@ -2367,7 +2369,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'b',
'source_info' => {
'line_nr' => 25
}
@@ -2376,7 +2377,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 25
}
@@ -2426,11 +2426,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'b',
+ 'contents' => [
{
'contents' => [
{
@@ -2440,7 +2442,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'b',
'source_info' => {
'line_nr' => 25
}
@@ -2449,7 +2450,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 25
}
@@ -2478,11 +2478,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'b',
+ 'contents' => [
{
'contents' => [
{
@@ -2492,7 +2494,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'b',
'source_info' => {
'line_nr' => 25
}
@@ -2501,7 +2502,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 25
}
@@ -2645,11 +2645,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -2659,7 +2661,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 26
}
@@ -2668,7 +2669,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 26
}
@@ -2718,11 +2718,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -2732,7 +2734,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 26
}
@@ -2741,7 +2742,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 26
}
@@ -2770,11 +2770,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -2784,7 +2786,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 26
}
@@ -2793,7 +2794,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 26
}
@@ -2937,11 +2937,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -2951,7 +2953,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 27
}
@@ -2960,7 +2961,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 27
}
@@ -3010,11 +3010,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -3024,7 +3026,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 27
}
@@ -3033,7 +3034,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 27
}
@@ -3062,11 +3062,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -3076,7 +3078,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 27
}
@@ -3085,7 +3086,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 27
}
@@ -3229,11 +3229,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -3243,7 +3245,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 28
}
@@ -3252,7 +3253,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 28
}
@@ -3302,11 +3302,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -3316,7 +3318,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 28
}
@@ -3325,7 +3326,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 28
}
@@ -3354,11 +3354,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -3368,7 +3370,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 28
}
@@ -3377,7 +3378,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 28
}
@@ -3521,11 +3521,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -3535,7 +3537,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 29
}
@@ -3544,7 +3545,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 29
}
@@ -3594,11 +3594,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -3608,7 +3610,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 29
}
@@ -3617,7 +3618,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 29
}
@@ -3646,11 +3646,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -3660,7 +3662,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 29
}
@@ -3669,7 +3670,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 29
}
@@ -3813,11 +3813,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -3827,7 +3829,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 30
}
@@ -3836,7 +3837,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 30
}
@@ -3886,11 +3886,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -3900,7 +3902,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 30
}
@@ -3909,7 +3910,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 30
}
@@ -3938,11 +3938,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -3952,7 +3954,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 30
}
@@ -3961,7 +3962,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 30
}
@@ -4105,11 +4105,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -4119,7 +4121,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 31
}
@@ -4128,7 +4129,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 31
}
@@ -4178,11 +4178,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -4192,7 +4194,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 31
}
@@ -4201,7 +4202,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 31
}
@@ -4230,11 +4230,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -4244,7 +4246,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 31
}
@@ -4253,7 +4254,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 31
}
@@ -4397,11 +4397,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -4411,7 +4413,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 32
}
@@ -4420,7 +4421,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 32
}
@@ -4470,11 +4470,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -4484,7 +4486,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 32
}
@@ -4493,7 +4494,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 32
}
@@ -4522,11 +4522,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -4536,7 +4538,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 32
}
@@ -4545,7 +4546,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 32
}
@@ -4689,11 +4689,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -4703,7 +4705,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 33
}
@@ -4712,7 +4713,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 33
}
@@ -4762,11 +4762,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -4776,7 +4778,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 33
}
@@ -4785,7 +4786,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 33
}
@@ -4814,11 +4814,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -4828,7 +4830,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 33
}
@@ -4837,7 +4838,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 33
}
@@ -5133,7 +5133,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -5143,7 +5144,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 38
}
@@ -5262,7 +5262,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
@@ -5272,7 +5273,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 39
}
@@ -5391,7 +5391,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -5401,7 +5402,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 40
}
@@ -5520,7 +5520,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -5530,7 +5531,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 41
}
@@ -5649,8 +5649,9 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
- {
+ 'cmdname' => 't',
+ 'contents' => [
+ {
'contents' => [
{
'text' => 'va---riable'
@@ -5659,7 +5660,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 42
}
@@ -5778,11 +5778,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'b',
+ 'contents' => [
{
'contents' => [
{
@@ -5792,7 +5794,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'b',
'source_info' => {
'line_nr' => 43
}
@@ -5801,7 +5802,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 43
}
@@ -5920,11 +5920,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -5934,7 +5936,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 44
}
@@ -5943,7 +5944,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 44
}
@@ -6062,11 +6062,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -6076,7 +6078,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 45
}
@@ -6085,7 +6086,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 45
}
@@ -6204,11 +6204,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -6218,7 +6220,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 46
}
@@ -6227,7 +6228,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 46
}
@@ -6346,11 +6346,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -6360,7 +6362,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 47
}
@@ -6369,7 +6370,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 47
}
@@ -6488,11 +6488,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -6502,7 +6504,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 48
}
@@ -6511,7 +6512,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 48
}
@@ -6630,11 +6630,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -6644,7 +6646,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 49
}
@@ -6653,7 +6654,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 49
}
@@ -6772,11 +6772,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -6786,7 +6788,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 50
}
@@ -6795,7 +6796,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 50
}
@@ -6914,11 +6914,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -6928,7 +6930,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 51
}
@@ -6937,7 +6938,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 51
}
@@ -7095,7 +7095,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -7105,7 +7106,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 55
}
@@ -7129,11 +7129,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -7143,7 +7145,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 55
}
@@ -7152,7 +7153,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 55
}
@@ -7184,7 +7184,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -7193,8 +7194,7 @@ $result_trees{'definition_commands'} = {
],
'type' => 'brace_container'
}
- ],
- 'cmdname' => 't'
+ ]
}
],
'type' => 'def_line_arg'
@@ -7226,12 +7226,12 @@ $result_trees{'definition_commands'} = {
'text' => 'Escape'
},
{
- 'args' => [
+ 'cmdname' => 'tie',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'tie',
'source_info' => {
'line_nr' => 56
}
@@ -7254,7 +7254,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -7264,17 +7265,18 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 56
}
},
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -7284,7 +7286,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 56
}
@@ -7293,18 +7294,17 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 56
}
},
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 56
}
@@ -7333,7 +7333,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -7342,15 +7343,16 @@ $result_trees{'definition_commands'} = {
],
'type' => 'brace_container'
}
- ],
- 'cmdname' => 't'
+ ]
},
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -7359,22 +7361,20 @@ $result_trees{'definition_commands'} = {
],
'type' => 'brace_container'
}
- ],
- 'cmdname' => 'slanted'
+ ]
}
],
'type' => 'brace_container'
}
- ],
- 'cmdname' => 'r'
+ ]
},
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'type' => 'brace_container'
}
- ],
- 'cmdname' => 't'
+ ]
}
],
'type' => 'def_line_arg'
@@ -7410,12 +7410,12 @@ $result_trees{'definition_commands'} = {
'text' => 'Escape'
},
{
- 'args' => [
+ 'cmdname' => 'tie',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'tie',
'source_info' => {
'line_nr' => 57
}
@@ -7438,7 +7438,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -7448,17 +7449,18 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 57
}
},
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -7468,7 +7470,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 57
}
@@ -7477,18 +7478,17 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 57
}
},
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 57
}
@@ -7517,7 +7517,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -7526,15 +7527,16 @@ $result_trees{'definition_commands'} = {
],
'type' => 'brace_container'
}
- ],
- 'cmdname' => 't'
+ ]
},
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -7543,22 +7545,20 @@ $result_trees{'definition_commands'} = {
],
'type' => 'brace_container'
}
- ],
- 'cmdname' => 'slanted'
+ ]
}
],
'type' => 'brace_container'
}
- ],
- 'cmdname' => 'r'
+ ]
},
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'type' => 'brace_container'
}
- ],
- 'cmdname' => 't'
+ ]
}
],
'type' => 'def_line_arg'
@@ -7594,12 +7594,12 @@ $result_trees{'definition_commands'} = {
'text' => 'Escape'
},
{
- 'args' => [
+ 'cmdname' => 'tie',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'tie',
'source_info' => {
'line_nr' => 58
}
@@ -7622,7 +7622,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -7632,17 +7633,18 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 58
}
},
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -7652,7 +7654,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 58
}
@@ -7661,13 +7662,13 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 58
}
},
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -7677,7 +7678,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 58
}
@@ -7697,7 +7697,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -7707,7 +7708,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 58
}
@@ -7723,11 +7723,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -7737,7 +7739,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 58
}
@@ -7746,7 +7747,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 58
}
@@ -7762,7 +7762,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -7772,7 +7773,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 58
}
@@ -7801,7 +7801,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -7810,15 +7811,16 @@ $result_trees{'definition_commands'} = {
],
'type' => 'brace_container'
}
- ],
- 'cmdname' => 't'
+ ]
},
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -7827,17 +7829,16 @@ $result_trees{'definition_commands'} = {
],
'type' => 'brace_container'
}
- ],
- 'cmdname' => 'slanted'
+ ]
}
],
'type' => 'brace_container'
}
- ],
- 'cmdname' => 'r'
+ ]
},
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -7846,8 +7847,7 @@ $result_trees{'definition_commands'} = {
],
'type' => 'brace_container'
}
- ],
- 'cmdname' => 't'
+ ]
}
],
'type' => 'def_line_arg'
@@ -7897,7 +7897,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -7907,7 +7908,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 59
}
@@ -7936,7 +7936,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -7945,8 +7946,7 @@ $result_trees{'definition_commands'} = {
],
'type' => 'brace_container'
}
- ],
- 'cmdname' => 't'
+ ]
}
],
'type' => 'def_line_arg'
@@ -7978,7 +7978,8 @@ $result_trees{'definition_commands'} = {
'text' => 'The '
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -7988,7 +7989,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 60
}
@@ -7997,7 +7997,8 @@ $result_trees{'definition_commands'} = {
'text' => ' request and the '
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -8007,7 +8008,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 60
}
@@ -8020,7 +8020,8 @@ $result_trees{'definition_commands'} = {
'text' => 'to '
},
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -8030,7 +8031,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 61
}
@@ -8039,18 +8039,19 @@ $result_trees{'definition_commands'} = {
'text' => ' (one-character name'
},
{
- 'args' => [
+ 'cmdname' => 'tie',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'tie',
'source_info' => {
'line_nr' => 61
}
},
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -8060,7 +8061,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 61
}
@@ -8070,7 +8070,8 @@ $result_trees{'definition_commands'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -8080,7 +8081,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 62
}
@@ -8200,7 +8200,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
@@ -8210,7 +8211,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 65
}
@@ -8230,7 +8230,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -8240,7 +8241,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 65
}
@@ -8260,7 +8260,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -8270,7 +8271,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 65
}
@@ -8290,7 +8290,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -8300,7 +8301,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 65
}
@@ -8320,11 +8320,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -8334,7 +8336,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 65
}
@@ -8343,7 +8344,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 65
}
@@ -8363,11 +8363,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -8377,7 +8379,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 65
}
@@ -8386,7 +8387,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 65
}
@@ -8406,15 +8406,18 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -8424,7 +8427,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 65
}
@@ -8433,7 +8435,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 65
}
@@ -8442,7 +8443,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 65
}
@@ -8462,11 +8462,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -8476,7 +8478,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 65
}
@@ -8485,7 +8486,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 65
}
@@ -8513,7 +8513,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
@@ -8523,7 +8524,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 65
}
@@ -8543,7 +8543,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -8553,7 +8554,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 65
}
@@ -8573,7 +8573,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -8583,7 +8584,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 65
}
@@ -8603,7 +8603,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -8613,7 +8614,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 65
}
@@ -8633,11 +8633,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -8647,7 +8649,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 65
}
@@ -8656,7 +8657,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 65
}
@@ -8676,11 +8676,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -8690,7 +8692,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 65
}
@@ -8699,7 +8700,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 65
}
@@ -8719,15 +8719,18 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -8737,7 +8740,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 65
}
@@ -8746,7 +8748,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 65
}
@@ -8755,7 +8756,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 65
}
@@ -8775,11 +8775,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -8789,7 +8791,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 65
}
@@ -8798,7 +8799,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 65
}
@@ -8826,7 +8826,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
@@ -8836,7 +8837,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 65
}
@@ -8856,7 +8856,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -8866,7 +8867,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 65
}
@@ -8886,7 +8886,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -8896,7 +8897,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 65
}
@@ -8916,7 +8916,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -8926,7 +8927,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 65
}
@@ -8946,11 +8946,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -8960,7 +8962,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 65
}
@@ -8969,7 +8970,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 65
}
@@ -8989,11 +8989,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -9003,7 +9005,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 65
}
@@ -9012,7 +9013,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 65
}
@@ -9032,15 +9032,18 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -9050,7 +9053,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 65
}
@@ -9059,7 +9061,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 65
}
@@ -9068,7 +9069,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 65
}
@@ -9088,11 +9088,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -9102,7 +9104,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 65
}
@@ -9111,7 +9112,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 65
}
@@ -9220,7 +9220,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
@@ -9230,7 +9231,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 66
}
@@ -9250,7 +9250,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -9260,7 +9261,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 66
}
@@ -9280,7 +9280,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -9290,7 +9291,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 66
}
@@ -9310,7 +9310,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -9320,7 +9321,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 66
}
@@ -9340,11 +9340,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -9354,7 +9356,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 66
}
@@ -9363,7 +9364,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 66
}
@@ -9383,11 +9383,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -9397,7 +9399,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 66
}
@@ -9406,7 +9407,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 66
}
@@ -9426,15 +9426,18 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -9444,7 +9447,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 66
}
@@ -9453,7 +9455,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 66
}
@@ -9462,7 +9463,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 66
}
@@ -9661,7 +9661,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -9671,7 +9672,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 70
}
@@ -9712,7 +9712,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -9722,7 +9723,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 70
}
@@ -9779,12 +9779,12 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'dots',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'dots',
'source_info' => {
'line_nr' => 71
}
@@ -9793,7 +9793,8 @@ $result_trees{'definition_commands'} = {
'text' => ' with var for '
},
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -9803,7 +9804,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 71
}
@@ -9812,7 +9812,8 @@ $result_trees{'definition_commands'} = {
'text' => ' and '
},
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -9822,7 +9823,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 71
}
@@ -9969,11 +9969,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -9983,7 +9985,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 74
}
@@ -9992,7 +9993,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 74
}
@@ -10033,11 +10033,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -10047,7 +10049,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 74
}
@@ -10056,7 +10057,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 74
}
@@ -10113,12 +10113,12 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'dots',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'dots',
'source_info' => {
'line_nr' => 75
}
@@ -10127,7 +10127,8 @@ $result_trees{'definition_commands'} = {
'text' => ' with r slanted for '
},
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -10137,7 +10138,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 75
}
@@ -10146,7 +10146,8 @@ $result_trees{'definition_commands'} = {
'text' => ' and '
},
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -10156,7 +10157,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 75
}
@@ -10337,12 +10337,12 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'dots',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'dots',
'source_info' => {
'line_nr' => 80
}
@@ -10451,7 +10451,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -10461,7 +10462,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 83
}
@@ -10584,12 +10584,12 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'dots',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'dots',
'source_info' => {
'line_nr' => 84
}
@@ -10750,7 +10750,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -10760,7 +10761,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 88
}
@@ -10801,7 +10801,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -10811,7 +10812,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 88
}
@@ -10868,12 +10868,12 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'dots',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'dots',
'source_info' => {
'line_nr' => 89
}
@@ -10882,7 +10882,8 @@ $result_trees{'definition_commands'} = {
'text' => ' for '
},
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -10892,7 +10893,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 89
}
@@ -10901,7 +10901,8 @@ $result_trees{'definition_commands'} = {
'text' => ' and '
},
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -10911,7 +10912,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 89
}
@@ -11142,7 +11142,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -11152,7 +11153,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 94
}
@@ -11161,7 +11161,8 @@ $result_trees{'definition_commands'} = {
'text' => ' calls no var '
},
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -11171,7 +11172,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 94
}
@@ -11180,7 +11180,8 @@ $result_trees{'definition_commands'} = {
'text' => ' with '
},
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -11190,7 +11191,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 94
}
@@ -11319,11 +11319,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'b',
+ 'contents' => [
{
'contents' => [
{
@@ -11333,7 +11335,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'b',
'source_info' => {
'line_nr' => 97
}
@@ -11342,7 +11343,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 97
}
@@ -11415,7 +11415,8 @@ $result_trees{'definition_commands'} = {
'text' => 'explicit keyword marking, no var '
},
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -11425,7 +11426,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 98
}
@@ -11434,7 +11434,8 @@ $result_trees{'definition_commands'} = {
'text' => ' with '
},
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -11444,7 +11445,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 98
}
@@ -11567,7 +11567,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -11577,7 +11578,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 101
}
@@ -11597,7 +11597,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -11607,7 +11608,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 101
}
@@ -11627,7 +11627,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -11637,7 +11638,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 101
}
@@ -11678,7 +11678,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -11688,7 +11689,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 101
}
@@ -11712,7 +11712,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -11722,7 +11723,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 101
}
@@ -11746,7 +11746,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -11756,7 +11757,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 101
}
@@ -11787,7 +11787,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -11797,7 +11798,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 102
}
@@ -11821,7 +11821,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -11831,7 +11832,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 102
}
@@ -12037,7 +12037,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -12047,7 +12048,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 106
}
@@ -12092,7 +12092,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -12102,7 +12103,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 106
}
@@ -12259,7 +12259,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -12269,7 +12270,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 107
}
@@ -12285,7 +12285,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
@@ -12295,7 +12296,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 107
}
@@ -12336,7 +12336,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -12346,7 +12347,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 107
}
@@ -12362,7 +12362,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
@@ -12372,7 +12373,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 107
}
@@ -12530,7 +12530,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -12540,7 +12541,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 108
}
@@ -12556,7 +12556,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -12566,7 +12567,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 108
}
@@ -12607,7 +12607,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -12617,7 +12618,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 108
}
@@ -12633,7 +12633,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -12643,7 +12644,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 108
}
@@ -12801,7 +12801,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -12811,7 +12812,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 109
}
@@ -12827,7 +12827,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -12837,7 +12838,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 109
}
@@ -12878,7 +12878,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -12888,7 +12889,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 109
}
@@ -12904,7 +12904,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -12914,7 +12915,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 109
}
@@ -13072,7 +13072,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -13082,7 +13083,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 110
}
@@ -13098,7 +13098,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -13108,7 +13109,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 110
}
@@ -13149,7 +13149,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -13159,7 +13160,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 110
}
@@ -13175,7 +13175,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -13185,7 +13186,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 110
}
@@ -13343,7 +13343,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -13353,7 +13354,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 111
}
@@ -13369,7 +13369,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -13379,7 +13380,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 111
}
@@ -13420,7 +13420,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -13430,7 +13431,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 111
}
@@ -13446,7 +13446,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -13456,7 +13457,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 111
}
@@ -13614,7 +13614,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -13624,7 +13625,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 112
}
@@ -13640,11 +13640,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'b',
+ 'contents' => [
{
'contents' => [
{
@@ -13654,7 +13656,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'b',
'source_info' => {
'line_nr' => 112
}
@@ -13663,7 +13664,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 112
}
@@ -13704,7 +13704,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -13714,7 +13715,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 112
}
@@ -13730,11 +13730,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'b',
+ 'contents' => [
{
'contents' => [
{
@@ -13744,7 +13746,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'b',
'source_info' => {
'line_nr' => 112
}
@@ -13753,7 +13754,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 112
}
@@ -13911,7 +13911,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -13921,7 +13922,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 113
}
@@ -13937,11 +13937,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -13951,7 +13953,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 113
}
@@ -13960,7 +13961,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 113
}
@@ -14001,7 +14001,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -14011,7 +14012,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 113
}
@@ -14027,11 +14027,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -14041,7 +14043,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 113
}
@@ -14050,7 +14051,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 113
}
@@ -14208,7 +14208,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -14218,7 +14219,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 114
}
@@ -14234,11 +14234,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -14248,7 +14250,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 114
}
@@ -14257,7 +14258,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 114
}
@@ -14298,7 +14298,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -14308,7 +14309,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 114
}
@@ -14324,11 +14324,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -14338,7 +14340,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 114
}
@@ -14347,7 +14348,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 114
}
@@ -14505,7 +14505,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -14515,7 +14516,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 115
}
@@ -14531,11 +14531,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -14545,7 +14547,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 115
}
@@ -14554,7 +14555,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 115
}
@@ -14595,7 +14595,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -14605,7 +14606,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 115
}
@@ -14621,11 +14621,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -14635,7 +14637,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 115
}
@@ -14644,7 +14645,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 115
}
@@ -14802,7 +14802,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -14812,7 +14813,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 116
}
@@ -14828,11 +14828,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -14842,7 +14844,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 116
}
@@ -14851,7 +14852,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 116
}
@@ -14892,7 +14892,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -14902,7 +14903,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 116
}
@@ -14918,11 +14918,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -14932,7 +14934,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 116
}
@@ -14941,7 +14942,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 116
}
@@ -15099,7 +15099,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -15109,7 +15110,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 117
}
@@ -15125,11 +15125,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -15139,7 +15141,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 117
}
@@ -15148,7 +15149,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 117
}
@@ -15189,7 +15189,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -15199,7 +15200,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 117
}
@@ -15215,11 +15215,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -15229,7 +15231,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 117
}
@@ -15238,7 +15239,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 117
}
@@ -15396,7 +15396,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -15406,7 +15407,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 118
}
@@ -15422,11 +15422,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -15436,7 +15438,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 118
}
@@ -15445,7 +15446,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 118
}
@@ -15486,7 +15486,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -15496,7 +15497,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 118
}
@@ -15512,11 +15512,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -15526,7 +15528,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 118
}
@@ -15535,7 +15536,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 118
}
@@ -15693,7 +15693,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -15703,7 +15704,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 119
}
@@ -15719,11 +15719,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -15733,7 +15735,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 119
}
@@ -15742,7 +15743,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 119
}
@@ -15783,7 +15783,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -15793,7 +15794,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 119
}
@@ -15809,11 +15809,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -15823,7 +15825,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 119
}
@@ -15832,7 +15833,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 119
}
@@ -15990,7 +15990,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -16000,7 +16001,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 120
}
@@ -16016,11 +16016,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -16030,7 +16032,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 120
}
@@ -16039,7 +16040,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 120
}
@@ -16080,7 +16080,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -16090,7 +16091,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 120
}
@@ -16106,11 +16106,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -16120,7 +16122,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 120
}
@@ -16129,7 +16130,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 120
}
@@ -16349,7 +16349,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -16359,7 +16360,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 124
}
@@ -16404,7 +16404,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -16414,7 +16415,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 124
}
@@ -16554,7 +16554,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
@@ -16564,7 +16565,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 125
}
@@ -16584,7 +16584,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -16594,7 +16595,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 125
}
@@ -16639,7 +16639,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -16649,7 +16650,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 125
}
@@ -16794,7 +16794,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -16804,7 +16805,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 126
}
@@ -16824,7 +16824,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -16834,7 +16835,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 126
}
@@ -16879,7 +16879,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -16889,7 +16890,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 126
}
@@ -17034,7 +17034,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -17044,7 +17045,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 127
}
@@ -17064,7 +17064,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -17074,7 +17075,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 127
}
@@ -17119,7 +17119,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -17129,7 +17130,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 127
}
@@ -17274,7 +17274,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -17284,7 +17285,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 128
}
@@ -17304,7 +17304,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -17314,7 +17315,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 128
}
@@ -17359,7 +17359,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -17369,7 +17370,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 128
}
@@ -17514,7 +17514,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -17524,7 +17525,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 129
}
@@ -17544,7 +17544,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -17554,7 +17555,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 129
}
@@ -17599,7 +17599,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -17609,7 +17610,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 129
}
@@ -17754,11 +17754,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'b',
+ 'contents' => [
{
'contents' => [
{
@@ -17768,7 +17770,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'b',
'source_info' => {
'line_nr' => 130
}
@@ -17777,7 +17778,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 130
}
@@ -17797,7 +17797,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -17807,7 +17808,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 130
}
@@ -17852,7 +17852,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -17862,7 +17863,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 130
}
@@ -18007,11 +18007,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -18021,7 +18023,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 131
}
@@ -18030,7 +18031,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 131
}
@@ -18050,7 +18050,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -18060,7 +18061,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 131
}
@@ -18105,7 +18105,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -18115,7 +18116,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 131
}
@@ -18260,11 +18260,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -18274,7 +18276,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 132
}
@@ -18283,7 +18284,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 132
}
@@ -18303,7 +18303,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -18313,7 +18314,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 132
}
@@ -18358,7 +18358,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -18368,7 +18369,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 132
}
@@ -18513,11 +18513,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -18527,7 +18529,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 133
}
@@ -18536,7 +18537,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 133
}
@@ -18556,7 +18556,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -18566,7 +18567,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 133
}
@@ -18611,7 +18611,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -18621,7 +18622,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 133
}
@@ -18766,11 +18766,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
@@ -18780,7 +18782,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 134
}
@@ -18789,7 +18790,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 134
}
@@ -18809,7 +18809,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -18819,7 +18820,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 134
}
@@ -18864,7 +18864,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -18874,7 +18875,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 134
}
@@ -19019,11 +19019,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -19033,7 +19035,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 135
}
@@ -19042,7 +19043,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 135
}
@@ -19062,7 +19062,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -19072,7 +19073,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 135
}
@@ -19117,7 +19117,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -19127,7 +19128,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 135
}
@@ -19272,11 +19272,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -19286,7 +19288,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 136
}
@@ -19295,7 +19296,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 136
}
@@ -19315,7 +19315,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -19325,7 +19326,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 136
}
@@ -19370,7 +19370,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -19380,7 +19381,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 136
}
@@ -19525,11 +19525,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -19539,7 +19541,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 137
}
@@ -19548,7 +19549,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 137
}
@@ -19568,7 +19568,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -19578,7 +19579,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 137
}
@@ -19623,7 +19623,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -19633,7 +19634,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 137
}
@@ -19778,11 +19778,13 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 't',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'slanted',
+ 'contents' => [
{
'contents' => [
{
@@ -19792,7 +19794,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'slanted',
'source_info' => {
'line_nr' => 138
}
@@ -19801,7 +19802,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 't',
'source_info' => {
'line_nr' => 138
}
@@ -19821,7 +19821,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -19831,7 +19832,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 138
}
@@ -19876,7 +19876,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -19886,7 +19887,6 @@ $result_trees{'definition_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 138
}
diff --git a/tp/t/results/converters_tests/empty_accent.pl
b/tp/t/results/converters_tests/empty_accent.pl
index a216d35ec8..cd8cff9483 100644
--- a/tp/t/results/converters_tests/empty_accent.pl
+++ b/tp/t/results/converters_tests/empty_accent.pl
@@ -12,12 +12,12 @@ $result_trees{'empty_accent'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => '`',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => '`',
'source_info' => {
'line_nr' => 1
}
diff --git a/tp/t/results/converters_tests/footnote_no_number.pl
b/tp/t/results/converters_tests/footnote_no_number.pl
index 77f12a6557..f746b4840c 100644
--- a/tp/t/results/converters_tests/footnote_no_number.pl
+++ b/tp/t/results/converters_tests/footnote_no_number.pl
@@ -137,7 +137,8 @@ $result_trees{'footnote_no_number'} = {
'text' => 'Para'
},
{
- 'args' => [
+ 'cmdname' => 'footnote',
+ 'contents' => [
{
'contents' => [
{
@@ -152,7 +153,6 @@ $result_trees{'footnote_no_number'} = {
'type' => 'brace_command_context'
}
],
- 'cmdname' => 'footnote',
'extra' => {},
'source_info' => {
'line_nr' => 7
@@ -176,7 +176,8 @@ $result_trees{'footnote_no_number'} = {
'text' => 'Para2'
},
{
- 'args' => [
+ 'cmdname' => 'footnote',
+ 'contents' => [
{
'contents' => [
{
@@ -191,7 +192,6 @@ $result_trees{'footnote_no_number'} = {
'type' => 'brace_command_context'
}
],
- 'cmdname' => 'footnote',
'extra' => {},
'source_info' => {
'line_nr' => 9
diff --git a/tp/t/results/converters_tests/footnote_no_number_separate.pl
b/tp/t/results/converters_tests/footnote_no_number_separate.pl
index b615ba1f12..049df1dc63 100644
--- a/tp/t/results/converters_tests/footnote_no_number_separate.pl
+++ b/tp/t/results/converters_tests/footnote_no_number_separate.pl
@@ -137,7 +137,8 @@ $result_trees{'footnote_no_number_separate'} = {
'text' => 'Para'
},
{
- 'args' => [
+ 'cmdname' => 'footnote',
+ 'contents' => [
{
'contents' => [
{
@@ -152,7 +153,6 @@ $result_trees{'footnote_no_number_separate'} = {
'type' => 'brace_command_context'
}
],
- 'cmdname' => 'footnote',
'extra' => {},
'source_info' => {
'line_nr' => 7
@@ -176,7 +176,8 @@ $result_trees{'footnote_no_number_separate'} = {
'text' => 'Para2'
},
{
- 'args' => [
+ 'cmdname' => 'footnote',
+ 'contents' => [
{
'contents' => [
{
@@ -191,7 +192,6 @@ $result_trees{'footnote_no_number_separate'} = {
'type' => 'brace_command_context'
}
],
- 'cmdname' => 'footnote',
'extra' => {},
'source_info' => {
'line_nr' => 9
diff --git a/tp/t/results/converters_tests/form_feeds.pl
b/tp/t/results/converters_tests/form_feeds.pl
index 73811ead3e..0ae2f648bb 100644
--- a/tp/t/results/converters_tests/form_feeds.pl
+++ b/tp/t/results/converters_tests/form_feeds.pl
@@ -141,7 +141,8 @@ $result_trees{'form_feeds'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -151,7 +152,6 @@ $result_trees{'form_feeds'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 11
}
@@ -171,7 +171,8 @@ $result_trees{'form_feeds'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -181,7 +182,6 @@ $result_trees{'form_feeds'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 13
}
@@ -201,7 +201,8 @@ $result_trees{'form_feeds'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -211,7 +212,6 @@ $result_trees{'form_feeds'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 15
}
@@ -229,7 +229,8 @@ $result_trees{'form_feeds'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'anchor',
+ 'contents' => [
{
'contents' => [
{
@@ -239,7 +240,6 @@ $result_trees{'form_feeds'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'anchor',
'extra' => {
'is_target' => 1,
'normalized' => 'aa'
@@ -258,7 +258,8 @@ $result_trees{'form_feeds'} = {
'text' => 'something '
},
{
- 'args' => [
+ 'cmdname' => 'email',
+ 'contents' => [
{
'contents' => [
{
@@ -286,13 +287,13 @@ $result_trees{'form_feeds'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'email',
'source_info' => {
'line_nr' => 17
}
},
{
- 'args' => [
+ 'cmdname' => 'footnote',
+ 'contents' => [
{
'contents' => [
{
@@ -315,7 +316,6 @@ $result_trees{'form_feeds'} = {
'type' => 'brace_command_context'
}
],
- 'cmdname' => 'footnote',
'extra' => {},
'info' => {
'spaces_before_argument' => {
@@ -331,7 +331,8 @@ $result_trees{'form_feeds'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'footnote',
+ 'contents' => [
{
'contents' => [
{
@@ -358,7 +359,6 @@ $result_trees{'form_feeds'} = {
'type' => 'brace_command_context'
}
],
- 'cmdname' => 'footnote',
'extra' => {},
'info' => {
'spaces_before_argument' => {
@@ -384,7 +384,8 @@ $result_trees{'form_feeds'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'xref',
+ 'contents' => [
{
'contents' => [
{
@@ -402,7 +403,6 @@ $result_trees{'form_feeds'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'xref',
'source_info' => {
'line_nr' => 20
}
@@ -544,7 +544,8 @@ $result_trees{'form_feeds'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'indicateurl',
+ 'contents' => [
{
'contents' => [
{
@@ -554,7 +555,6 @@ $result_trees{'form_feeds'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'indicateurl',
'source_info' => {
'line_nr' => 29
}
@@ -1032,7 +1032,8 @@ $result_trees{'form_feeds'} = {
'type' => 'paragraph'
},
{
- 'args' => [
+ 'cmdname' => 'caption',
+ 'contents' => [
{
'contents' => [
{
@@ -1067,7 +1068,6 @@ $result_trees{'form_feeds'} = {
'type' => 'brace_command_context'
}
],
- 'cmdname' => 'caption',
'extra' => {
'float' => {}
},
@@ -1094,7 +1094,8 @@ $result_trees{'form_feeds'} = {
'type' => 'paragraph'
},
{
- 'args' => [
+ 'cmdname' => 'shortcaption',
+ 'contents' => [
{
'contents' => [
{
@@ -1129,7 +1130,6 @@ $result_trees{'form_feeds'} = {
'type' => 'brace_command_context'
}
],
- 'cmdname' => 'shortcaption',
'extra' => {
'float' => {}
},
@@ -1346,7 +1346,7 @@ $result_trees{'form_feeds'} = {
],
'type' => 'document_root'
};
-$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[22]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'form_feeds'}{'contents'}[2];
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'form_feeds'}{'contents'}[2];
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[33]{'contents'}[1]{'extra'}{'float'}
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[33];
diff --git a/tp/t/results/converters_tests/frenchspacing_and_code.pl
b/tp/t/results/converters_tests/frenchspacing_and_code.pl
index aaf53346f6..3c35d7670f 100644
--- a/tp/t/results/converters_tests/frenchspacing_and_code.pl
+++ b/tp/t/results/converters_tests/frenchspacing_and_code.pl
@@ -192,7 +192,8 @@ $result_trees{'frenchspacing_and_code'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -202,7 +203,6 @@ $result_trees{'frenchspacing_and_code'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 12
}
@@ -425,7 +425,8 @@ $result_trees{'frenchspacing_and_code'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -435,7 +436,6 @@ $result_trees{'frenchspacing_and_code'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 18
}
@@ -455,7 +455,8 @@ $result_trees{'frenchspacing_and_code'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -465,7 +466,6 @@ $result_trees{'frenchspacing_and_code'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 18
}
@@ -748,7 +748,8 @@ $result_trees{'frenchspacing_and_code'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -758,7 +759,6 @@ $result_trees{'frenchspacing_and_code'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 22
}
@@ -778,7 +778,8 @@ $result_trees{'frenchspacing_and_code'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -788,7 +789,6 @@ $result_trees{'frenchspacing_and_code'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 22
}
@@ -1065,7 +1065,8 @@ $result_trees{'frenchspacing_and_code'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1075,7 +1076,6 @@ $result_trees{'frenchspacing_and_code'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 32
}
@@ -1298,7 +1298,8 @@ $result_trees{'frenchspacing_and_code'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -1308,7 +1309,6 @@ $result_trees{'frenchspacing_and_code'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 38
}
@@ -1328,7 +1328,8 @@ $result_trees{'frenchspacing_and_code'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1338,7 +1339,6 @@ $result_trees{'frenchspacing_and_code'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 38
}
@@ -1621,7 +1621,8 @@ $result_trees{'frenchspacing_and_code'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -1631,7 +1632,6 @@ $result_trees{'frenchspacing_and_code'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 42
}
@@ -1651,7 +1651,8 @@ $result_trees{'frenchspacing_and_code'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1661,7 +1662,6 @@ $result_trees{'frenchspacing_and_code'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 42
}
diff --git a/tp/t/results/converters_tests/image_extension.pl
b/tp/t/results/converters_tests/image_extension.pl
index c28dbd54bd..3c28c0bd86 100644
--- a/tp/t/results/converters_tests/image_extension.pl
+++ b/tp/t/results/converters_tests/image_extension.pl
@@ -10,7 +10,8 @@ $result_trees{'image_extension'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'image',
+ 'contents' => [
{
'contents' => [
{
@@ -37,7 +38,6 @@ $result_trees{'image_extension'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'image',
'extra' => {
'input_encoding_name' => 'utf-8'
},
diff --git a/tp/t/results/converters_tests/image_formatting.pl
b/tp/t/results/converters_tests/image_formatting.pl
index 39b34b1f0b..093f4fa312 100644
--- a/tp/t/results/converters_tests/image_formatting.pl
+++ b/tp/t/results/converters_tests/image_formatting.pl
@@ -134,7 +134,8 @@ $result_trees{'image_formatting'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -156,7 +157,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 7
}
@@ -165,7 +165,8 @@ $result_trees{'image_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'image',
+ 'contents' => [
{
'contents' => [
{
@@ -175,7 +176,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'image',
'extra' => {
'input_encoding_name' => 'utf-8'
},
@@ -188,7 +188,8 @@ $result_trees{'image_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -210,7 +211,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 8
}
@@ -219,7 +219,8 @@ $result_trees{'image_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'image',
+ 'contents' => [
{
'contents' => [
{
@@ -237,7 +238,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'image',
'extra' => {
'input_encoding_name' => 'utf-8'
},
@@ -250,7 +250,8 @@ $result_trees{'image_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -272,7 +273,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 9
}
@@ -281,7 +281,8 @@ $result_trees{'image_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'image',
+ 'contents' => [
{
'contents' => [
{
@@ -302,7 +303,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'image',
'extra' => {
'input_encoding_name' => 'utf-8'
},
@@ -315,7 +315,8 @@ $result_trees{'image_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -337,7 +338,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 10
}
@@ -346,7 +346,8 @@ $result_trees{'image_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'image',
+ 'contents' => [
{
'contents' => [
{
@@ -370,7 +371,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'image',
'extra' => {
'input_encoding_name' => 'utf-8'
},
@@ -383,7 +383,8 @@ $result_trees{'image_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -405,7 +406,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 11
}
@@ -414,7 +414,8 @@ $result_trees{'image_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'image',
+ 'contents' => [
{
'contents' => [
{
@@ -441,7 +442,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'image',
'extra' => {
'input_encoding_name' => 'utf-8'
},
@@ -454,7 +454,8 @@ $result_trees{'image_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -476,7 +477,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 12
}
@@ -485,7 +485,8 @@ $result_trees{'image_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'image',
+ 'contents' => [
{
'contents' => [
{
@@ -527,7 +528,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'image',
'extra' => {
'input_encoding_name' => 'utf-8'
},
@@ -540,7 +540,8 @@ $result_trees{'image_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -559,7 +560,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 13
}
@@ -568,7 +568,8 @@ $result_trees{'image_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'image',
+ 'contents' => [
{
'contents' => [
{
@@ -605,7 +606,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'image',
'extra' => {
'input_encoding_name' => 'utf-8'
},
@@ -618,7 +618,8 @@ $result_trees{'image_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -640,7 +641,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 14
}
@@ -649,7 +649,8 @@ $result_trees{'image_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'image',
+ 'contents' => [
{
'contents' => [
{
@@ -678,7 +679,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'image',
'extra' => {
'input_encoding_name' => 'utf-8'
},
@@ -691,7 +691,8 @@ $result_trees{'image_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -758,7 +759,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 15
}
@@ -767,11 +767,13 @@ $result_trees{'image_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'image',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'file',
+ 'contents' => [
{
'contents' => [
{
@@ -781,7 +783,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'file',
'source_info' => {
'line_nr' => 15
}
@@ -822,7 +823,8 @@ $result_trees{'image_formatting'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'file',
+ 'contents' => [
{
'contents' => [
{
@@ -832,7 +834,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'file',
'source_info' => {
'line_nr' => 15
}
@@ -847,7 +848,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'image',
'extra' => {
'input_encoding_name' => 'utf-8'
},
@@ -860,7 +860,8 @@ $result_trees{'image_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'image',
+ 'contents' => [
{
'contents' => [
{
@@ -870,7 +871,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'image',
'extra' => {
'input_encoding_name' => 'utf-8'
},
@@ -882,7 +882,8 @@ $result_trees{'image_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'image',
+ 'contents' => [
{
'contents' => [
{
@@ -892,7 +893,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'image',
'extra' => {
'input_encoding_name' => 'utf-8'
},
@@ -929,7 +929,8 @@ $result_trees{'image_formatting'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -951,7 +952,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 19
}
@@ -960,7 +960,8 @@ $result_trees{'image_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'image',
+ 'contents' => [
{
'contents' => [
{
@@ -970,7 +971,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'image',
'extra' => {
'input_encoding_name' => 'utf-8'
},
@@ -983,7 +983,8 @@ $result_trees{'image_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1005,7 +1006,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 20
}
@@ -1014,7 +1014,8 @@ $result_trees{'image_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'image',
+ 'contents' => [
{
'contents' => [
{
@@ -1032,7 +1033,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'image',
'extra' => {
'input_encoding_name' => 'utf-8'
},
@@ -1045,7 +1045,8 @@ $result_trees{'image_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1067,7 +1068,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 21
}
@@ -1076,7 +1076,8 @@ $result_trees{'image_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'image',
+ 'contents' => [
{
'contents' => [
{
@@ -1097,7 +1098,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'image',
'extra' => {
'input_encoding_name' => 'utf-8'
},
@@ -1110,7 +1110,8 @@ $result_trees{'image_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1132,7 +1133,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 22
}
@@ -1141,7 +1141,8 @@ $result_trees{'image_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'image',
+ 'contents' => [
{
'contents' => [
{
@@ -1165,7 +1166,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'image',
'extra' => {
'input_encoding_name' => 'utf-8'
},
@@ -1178,7 +1178,8 @@ $result_trees{'image_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1200,7 +1201,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 23
}
@@ -1209,7 +1209,8 @@ $result_trees{'image_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'image',
+ 'contents' => [
{
'contents' => [
{
@@ -1236,7 +1237,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'image',
'extra' => {
'input_encoding_name' => 'utf-8'
},
@@ -1249,7 +1249,8 @@ $result_trees{'image_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1271,7 +1272,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 24
}
@@ -1280,7 +1280,8 @@ $result_trees{'image_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'image',
+ 'contents' => [
{
'contents' => [
{
@@ -1322,7 +1323,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'image',
'extra' => {
'input_encoding_name' => 'utf-8'
},
@@ -1335,7 +1335,8 @@ $result_trees{'image_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1357,7 +1358,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 25
}
@@ -1366,7 +1366,8 @@ $result_trees{'image_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'image',
+ 'contents' => [
{
'contents' => [
{
@@ -1395,7 +1396,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'image',
'extra' => {
'input_encoding_name' => 'utf-8'
},
@@ -1408,7 +1408,8 @@ $result_trees{'image_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1475,7 +1476,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 26
}
@@ -1484,11 +1484,13 @@ $result_trees{'image_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'image',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'file',
+ 'contents' => [
{
'contents' => [
{
@@ -1498,7 +1500,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'file',
'source_info' => {
'line_nr' => 26
}
@@ -1539,7 +1540,8 @@ $result_trees{'image_formatting'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'file',
+ 'contents' => [
{
'contents' => [
{
@@ -1549,7 +1551,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'file',
'source_info' => {
'line_nr' => 26
}
@@ -1564,7 +1565,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'image',
'extra' => {
'input_encoding_name' => 'utf-8'
},
@@ -1577,7 +1577,8 @@ $result_trees{'image_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'image',
+ 'contents' => [
{
'contents' => [
{
@@ -1587,7 +1588,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'image',
'extra' => {
'input_encoding_name' => 'utf-8'
},
@@ -1599,7 +1599,8 @@ $result_trees{'image_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'image',
+ 'contents' => [
{
'contents' => [
{
@@ -1609,7 +1610,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'image',
'extra' => {
'input_encoding_name' => 'utf-8'
},
@@ -1665,7 +1665,8 @@ $result_trees{'image_formatting'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'image',
+ 'contents' => [
{
'contents' => [
{
@@ -1689,7 +1690,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'image',
'extra' => {
'input_encoding_name' => 'utf-8'
},
@@ -1713,7 +1713,8 @@ $result_trees{'image_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'image',
+ 'contents' => [
{
'contents' => [
{
@@ -1737,7 +1738,6 @@ $result_trees{'image_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'image',
'extra' => {
'input_encoding_name' => 'utf-8'
},
diff --git a/tp/t/results/converters_tests/image_with_spaces.pl
b/tp/t/results/converters_tests/image_with_spaces.pl
index 60e7f29025..2a32309852 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 2ee82942ea..fbc3be14ac 100644
--- a/tp/t/results/converters_tests/inline.pl
+++ b/tp/t/results/converters_tests/inline.pl
@@ -17,7 +17,8 @@ $result_trees{'inline'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'inlinefmt',
+ 'contents' => [
{
'contents' => [
{
@@ -40,7 +41,6 @@ $result_trees{'inline'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlinefmt',
'extra' => {
'expand_index' => 1,
'format' => 'html'
@@ -54,7 +54,8 @@ $result_trees{'inline'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'inlinefmt',
+ 'contents' => [
{
'contents' => [
{
@@ -77,7 +78,6 @@ $result_trees{'inline'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlinefmt',
'extra' => {
'expand_index' => 1,
'format' => 'plaintext'
@@ -91,7 +91,8 @@ $result_trees{'inline'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'inlinefmt',
+ 'contents' => [
{
'contents' => [
{
@@ -114,7 +115,6 @@ $result_trees{'inline'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlinefmt',
'extra' => {
'expand_index' => 1,
'format' => 'xml'
@@ -128,7 +128,8 @@ $result_trees{'inline'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'inlinefmt',
+ 'contents' => [
{
'contents' => [
{
@@ -151,7 +152,6 @@ $result_trees{'inline'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlinefmt',
'extra' => {
'expand_index' => 1,
'format' => 'docbook'
@@ -165,7 +165,8 @@ $result_trees{'inline'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'inlinefmt',
+ 'contents' => [
{
'contents' => [
{
@@ -184,7 +185,6 @@ $result_trees{'inline'} = {
'type' => 'elided_brace_command_arg'
}
],
- 'cmdname' => 'inlinefmt',
'extra' => {
'format' => 'tex'
},
@@ -197,7 +197,8 @@ $result_trees{'inline'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'inlinefmt',
+ 'contents' => [
{
'contents' => [
{
@@ -209,7 +210,8 @@ $result_trees{'inline'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'math',
+ 'contents' => [
{
'contents' => [
{
@@ -221,7 +223,8 @@ $result_trees{'inline'} = {
'text' => '{a < b '
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -242,7 +245,6 @@ $result_trees{'inline'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 7
}
@@ -271,7 +273,6 @@ $result_trees{'inline'} = {
'type' => 'brace_command_context'
}
],
- 'cmdname' => 'math',
'source_info' => {
'line_nr' => 7
}
@@ -288,7 +289,6 @@ $result_trees{'inline'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlinefmt',
'extra' => {
'expand_index' => 1,
'format' => 'latex'
@@ -317,7 +317,8 @@ $result_trees{'inline'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'inlineraw',
+ 'contents' => [
{
'contents' => [
{
@@ -340,7 +341,6 @@ $result_trees{'inline'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlineraw',
'extra' => {
'expand_index' => 1,
'format' => 'html'
@@ -354,7 +354,8 @@ $result_trees{'inline'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'inlineraw',
+ 'contents' => [
{
'contents' => [
{
@@ -377,7 +378,6 @@ $result_trees{'inline'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlineraw',
'extra' => {
'expand_index' => 1,
'format' => 'plaintext'
@@ -391,7 +391,8 @@ $result_trees{'inline'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'inlineraw',
+ 'contents' => [
{
'contents' => [
{
@@ -414,7 +415,6 @@ $result_trees{'inline'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlineraw',
'extra' => {
'expand_index' => 1,
'format' => 'xml'
@@ -428,7 +428,8 @@ $result_trees{'inline'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'inlineraw',
+ 'contents' => [
{
'contents' => [
{
@@ -451,7 +452,6 @@ $result_trees{'inline'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlineraw',
'extra' => {
'expand_index' => 1,
'format' => 'docbook'
@@ -465,7 +465,8 @@ $result_trees{'inline'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'inlineraw',
+ 'contents' => [
{
'contents' => [
{
@@ -484,7 +485,6 @@ $result_trees{'inline'} = {
'type' => 'elided_brace_command_arg'
}
],
- 'cmdname' => 'inlineraw',
'extra' => {
'format' => 'tex'
},
@@ -497,7 +497,8 @@ $result_trees{'inline'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'inlineraw',
+ 'contents' => [
{
'contents' => [
{
@@ -517,7 +518,8 @@ $result_trees{'inline'} = {
'text' => '{a < b '
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -538,7 +540,6 @@ $result_trees{'inline'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 15
}
@@ -575,7 +576,6 @@ $result_trees{'inline'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlineraw',
'extra' => {
'expand_index' => 1,
'format' => 'latex'
diff --git a/tp/t/results/converters_tests/inline_expand_tex.pl
b/tp/t/results/converters_tests/inline_expand_tex.pl
index c9d1716b88..16347c026c 100644
--- a/tp/t/results/converters_tests/inline_expand_tex.pl
+++ b/tp/t/results/converters_tests/inline_expand_tex.pl
@@ -17,7 +17,8 @@ $result_trees{'inline_expand_tex'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'inlinefmt',
+ 'contents' => [
{
'contents' => [
{
@@ -36,7 +37,6 @@ $result_trees{'inline_expand_tex'} = {
'type' => 'elided_brace_command_arg'
}
],
- 'cmdname' => 'inlinefmt',
'extra' => {
'format' => 'html'
},
@@ -49,7 +49,8 @@ $result_trees{'inline_expand_tex'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'inlinefmt',
+ 'contents' => [
{
'contents' => [
{
@@ -68,7 +69,6 @@ $result_trees{'inline_expand_tex'} = {
'type' => 'elided_brace_command_arg'
}
],
- 'cmdname' => 'inlinefmt',
'extra' => {
'format' => 'plaintext'
},
@@ -81,7 +81,8 @@ $result_trees{'inline_expand_tex'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'inlinefmt',
+ 'contents' => [
{
'contents' => [
{
@@ -100,7 +101,6 @@ $result_trees{'inline_expand_tex'} = {
'type' => 'elided_brace_command_arg'
}
],
- 'cmdname' => 'inlinefmt',
'extra' => {
'format' => 'xml'
},
@@ -113,7 +113,8 @@ $result_trees{'inline_expand_tex'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'inlinefmt',
+ 'contents' => [
{
'contents' => [
{
@@ -132,7 +133,6 @@ $result_trees{'inline_expand_tex'} = {
'type' => 'elided_brace_command_arg'
}
],
- 'cmdname' => 'inlinefmt',
'extra' => {
'format' => 'docbook'
},
@@ -145,7 +145,8 @@ $result_trees{'inline_expand_tex'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'inlinefmt',
+ 'contents' => [
{
'contents' => [
{
@@ -160,7 +161,8 @@ $result_trees{'inline_expand_tex'} = {
'text' => '$\\underlinea < b '
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -170,7 +172,6 @@ $result_trees{'inline_expand_tex'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 6
}
@@ -184,7 +185,6 @@ $result_trees{'inline_expand_tex'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlinefmt',
'extra' => {
'expand_index' => 1,
'format' => 'tex'
@@ -198,7 +198,8 @@ $result_trees{'inline_expand_tex'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'inlinefmt',
+ 'contents' => [
{
'contents' => [
{
@@ -217,7 +218,6 @@ $result_trees{'inline_expand_tex'} = {
'type' => 'elided_brace_command_arg'
}
],
- 'cmdname' => 'inlinefmt',
'extra' => {
'format' => 'latex'
},
@@ -245,7 +245,8 @@ $result_trees{'inline_expand_tex'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'inlineraw',
+ 'contents' => [
{
'contents' => [
{
@@ -264,7 +265,6 @@ $result_trees{'inline_expand_tex'} = {
'type' => 'elided_brace_command_arg'
}
],
- 'cmdname' => 'inlineraw',
'extra' => {
'format' => 'html'
},
@@ -277,7 +277,8 @@ $result_trees{'inline_expand_tex'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'inlineraw',
+ 'contents' => [
{
'contents' => [
{
@@ -296,7 +297,6 @@ $result_trees{'inline_expand_tex'} = {
'type' => 'elided_brace_command_arg'
}
],
- 'cmdname' => 'inlineraw',
'extra' => {
'format' => 'plaintext'
},
@@ -309,7 +309,8 @@ $result_trees{'inline_expand_tex'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'inlineraw',
+ 'contents' => [
{
'contents' => [
{
@@ -328,7 +329,6 @@ $result_trees{'inline_expand_tex'} = {
'type' => 'elided_brace_command_arg'
}
],
- 'cmdname' => 'inlineraw',
'extra' => {
'format' => 'xml'
},
@@ -341,7 +341,8 @@ $result_trees{'inline_expand_tex'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'inlineraw',
+ 'contents' => [
{
'contents' => [
{
@@ -360,7 +361,6 @@ $result_trees{'inline_expand_tex'} = {
'type' => 'elided_brace_command_arg'
}
],
- 'cmdname' => 'inlineraw',
'extra' => {
'format' => 'docbook'
},
@@ -373,7 +373,8 @@ $result_trees{'inline_expand_tex'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'inlineraw',
+ 'contents' => [
{
'contents' => [
{
@@ -393,7 +394,8 @@ $result_trees{'inline_expand_tex'} = {
'text' => '{a < b '
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -414,7 +416,6 @@ $result_trees{'inline_expand_tex'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 14
}
@@ -440,7 +441,6 @@ $result_trees{'inline_expand_tex'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlineraw',
'extra' => {
'expand_index' => 1,
'format' => 'tex'
@@ -454,7 +454,8 @@ $result_trees{'inline_expand_tex'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'inlineraw',
+ 'contents' => [
{
'contents' => [
{
@@ -473,7 +474,6 @@ $result_trees{'inline_expand_tex'} = {
'type' => 'elided_brace_command_arg'
}
],
- 'cmdname' => 'inlineraw',
'extra' => {
'format' => 'latex'
},
diff --git a/tp/t/results/converters_tests/inlinefmtifelse.pl
b/tp/t/results/converters_tests/inlinefmtifelse.pl
index 677a3a2525..cc69b46c47 100644
--- a/tp/t/results/converters_tests/inlinefmtifelse.pl
+++ b/tp/t/results/converters_tests/inlinefmtifelse.pl
@@ -12,7 +12,8 @@ $result_trees{'inlinefmtifelse'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'inlinefmtifelse',
+ 'contents' => [
{
'contents' => [
{
@@ -39,7 +40,6 @@ $result_trees{'inlinefmtifelse'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlinefmtifelse',
'extra' => {
'expand_index' => 2,
'format' => 'html'
@@ -53,7 +53,8 @@ $result_trees{'inlinefmtifelse'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'inlinefmtifelse',
+ 'contents' => [
{
'contents' => [
{
@@ -80,7 +81,6 @@ $result_trees{'inlinefmtifelse'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlinefmtifelse',
'extra' => {
'expand_index' => 2,
'format' => 'html'
@@ -104,7 +104,8 @@ $result_trees{'inlinefmtifelse'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'inlinefmtifelse',
+ 'contents' => [
{
'contents' => [
{
@@ -123,7 +124,6 @@ $result_trees{'inlinefmtifelse'} = {
'type' => 'elided_brace_command_arg'
}
],
- 'cmdname' => 'inlinefmtifelse',
'extra' => {
'expand_index' => 2,
'format' => 'plaintext'
@@ -137,7 +137,8 @@ $result_trees{'inlinefmtifelse'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'inlinefmtifelse',
+ 'contents' => [
{
'contents' => [
{
@@ -164,7 +165,6 @@ $result_trees{'inlinefmtifelse'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlinefmtifelse',
'extra' => {
'expand_index' => 2,
'format' => 'plaintext'
@@ -188,7 +188,8 @@ $result_trees{'inlinefmtifelse'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'inlinefmtifelse',
+ 'contents' => [
{
'contents' => [
{
@@ -210,7 +211,6 @@ $result_trees{'inlinefmtifelse'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlinefmtifelse',
'extra' => {
'expand_index' => 2,
'format' => 'xml'
@@ -234,7 +234,8 @@ $result_trees{'inlinefmtifelse'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'inlinefmtifelse',
+ 'contents' => [
{
'contents' => [
{
@@ -274,7 +275,6 @@ $result_trees{'inlinefmtifelse'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlinefmtifelse',
'extra' => {
'expand_index' => 2,
'format' => 'docbook'
@@ -298,7 +298,8 @@ $result_trees{'inlinefmtifelse'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'inlinefmtifelse',
+ 'contents' => [
{
'contents' => [
{
@@ -338,7 +339,6 @@ $result_trees{'inlinefmtifelse'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlinefmtifelse',
'extra' => {
'expand_index' => 2,
'format' => 'tex'
@@ -362,7 +362,8 @@ $result_trees{'inlinefmtifelse'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'inlinefmtifelse',
+ 'contents' => [
{
'contents' => [
{
@@ -389,7 +390,6 @@ $result_trees{'inlinefmtifelse'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlinefmtifelse',
'extra' => {
'expand_index' => 2,
'format' => 'docbook'
@@ -413,7 +413,8 @@ $result_trees{'inlinefmtifelse'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'inlinefmtifelse',
+ 'contents' => [
{
'contents' => [
{
@@ -440,7 +441,6 @@ $result_trees{'inlinefmtifelse'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlinefmtifelse',
'extra' => {
'expand_index' => 2,
'format' => 'tex'
@@ -464,7 +464,8 @@ $result_trees{'inlinefmtifelse'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'inlinefmtifelse',
+ 'contents' => [
{
'contents' => [
{
@@ -491,7 +492,6 @@ $result_trees{'inlinefmtifelse'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlinefmtifelse',
'extra' => {
'expand_index' => 2,
'format' => 'latex'
diff --git a/tp/t/results/converters_tests/inlinefmtifelse_with_commands.pl
b/tp/t/results/converters_tests/inlinefmtifelse_with_commands.pl
index 0816b93867..7925a18eb2 100644
--- a/tp/t/results/converters_tests/inlinefmtifelse_with_commands.pl
+++ b/tp/t/results/converters_tests/inlinefmtifelse_with_commands.pl
@@ -12,7 +12,8 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'inlinefmtifelse',
+ 'contents' => [
{
'contents' => [
{
@@ -36,7 +37,8 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
'text' => 'else '
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -46,7 +48,6 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 1
}
@@ -55,7 +56,6 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlinefmtifelse',
'extra' => {
'expand_index' => 2,
'format' => 'html'
@@ -79,7 +79,8 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'inlinefmtifelse',
+ 'contents' => [
{
'contents' => [
{
@@ -103,7 +104,8 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
'text' => 'else '
},
{
- 'args' => [
+ 'cmdname' => 'emph',
+ 'contents' => [
{
'contents' => [
{
@@ -113,7 +115,6 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'emph',
'source_info' => {
'line_nr' => 3
}
@@ -122,7 +123,6 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlinefmtifelse',
'extra' => {
'expand_index' => 2,
'format' => 'plaintext'
@@ -146,7 +146,8 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'inlinefmtifelse',
+ 'contents' => [
{
'contents' => [
{
@@ -170,7 +171,8 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
'text' => 'xml '
},
{
- 'args' => [
+ 'cmdname' => 'env',
+ 'contents' => [
{
'contents' => [
{
@@ -180,7 +182,6 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'env',
'source_info' => {
'line_nr' => 5
}
@@ -194,7 +195,6 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlinefmtifelse',
'extra' => {
'expand_index' => 2,
'format' => 'xml'
@@ -218,7 +218,8 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'inlinefmtifelse',
+ 'contents' => [
{
'contents' => [
{
@@ -250,7 +251,8 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
'text' => 'else '
},
{
- 'args' => [
+ 'cmdname' => 'strong',
+ 'contents' => [
{
'contents' => [
{
@@ -260,7 +262,6 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'strong',
'source_info' => {
'line_nr' => 7
}
@@ -277,7 +278,6 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlinefmtifelse',
'extra' => {
'expand_index' => 2,
'format' => 'docbook'
@@ -301,7 +301,8 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'inlinefmtifelse',
+ 'contents' => [
{
'contents' => [
{
@@ -322,7 +323,8 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -332,7 +334,6 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 9
}
@@ -344,7 +345,6 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlinefmtifelse',
'extra' => {
'expand_index' => 2,
'format' => 'tex'
@@ -368,7 +368,8 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'inlinefmtifelse',
+ 'contents' => [
{
'contents' => [
{
@@ -389,7 +390,8 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'sc',
+ 'contents' => [
{
'contents' => [
{
@@ -399,7 +401,6 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'sc',
'source_info' => {
'line_nr' => 11
}
@@ -411,7 +412,6 @@ $result_trees{'inlinefmtifelse_with_commands'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlinefmtifelse',
'extra' => {
'expand_index' => 2,
'format' => 'latex'
diff --git a/tp/t/results/converters_tests/inlinefmtspaces.pl
b/tp/t/results/converters_tests/inlinefmtspaces.pl
index 503beb3ee8..bce919ec28 100644
--- a/tp/t/results/converters_tests/inlinefmtspaces.pl
+++ b/tp/t/results/converters_tests/inlinefmtspaces.pl
@@ -15,7 +15,8 @@ $result_trees{'inlinefmtspaces'} = {
'text' => 'A '
},
{
- 'args' => [
+ 'cmdname' => 'inlinefmt',
+ 'contents' => [
{
'contents' => [
{
@@ -38,12 +39,12 @@ $result_trees{'inlinefmtspaces'} = {
'text' => 'plaintext `` '
},
{
- 'args' => [
+ 'cmdname' => 'lbracechar',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'lbracechar',
'source_info' => {
'line_nr' => 1
}
@@ -60,7 +61,6 @@ $result_trees{'inlinefmtspaces'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlinefmt',
'extra' => {
'expand_index' => 1,
'format' => 'plaintext'
@@ -79,7 +79,8 @@ $result_trees{'inlinefmtspaces'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'inlinefmt',
+ 'contents' => [
{
'contents' => [
{
@@ -102,7 +103,8 @@ $result_trees{'inlinefmtspaces'} = {
'text' => 'in <i>'
},
{
- 'args' => [
+ 'cmdname' => 'acronym',
+ 'contents' => [
{
'contents' => [
{
@@ -112,7 +114,6 @@ $result_trees{'inlinefmtspaces'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'acronym',
'source_info' => {
'line_nr' => 2
}
@@ -129,7 +130,6 @@ $result_trees{'inlinefmtspaces'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlinefmt',
'extra' => {
'expand_index' => 1,
'format' => 'html'
diff --git a/tp/t/results/converters_tests/inlineifsetifclear.pl
b/tp/t/results/converters_tests/inlineifsetifclear.pl
index e4933b9645..4582e4bfef 100644
--- a/tp/t/results/converters_tests/inlineifsetifclear.pl
+++ b/tp/t/results/converters_tests/inlineifsetifclear.pl
@@ -12,7 +12,8 @@ $result_trees{'inlineifsetifclear'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'inlineifclear',
+ 'contents' => [
{
'contents' => [
{
@@ -35,7 +36,6 @@ $result_trees{'inlineifsetifclear'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlineifclear',
'extra' => {
'expand_index' => 1,
'format' => 'aaa'
@@ -59,7 +59,8 @@ $result_trees{'inlineifsetifclear'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'inlineifset',
+ 'contents' => [
{
'contents' => [
{
@@ -78,7 +79,6 @@ $result_trees{'inlineifsetifclear'} = {
'type' => 'elided_brace_command_arg'
}
],
- 'cmdname' => 'inlineifset',
'extra' => {
'format' => 'aaa'
},
@@ -123,7 +123,8 @@ $result_trees{'inlineifsetifclear'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'inlineifclear',
+ 'contents' => [
{
'contents' => [
{
@@ -142,7 +143,6 @@ $result_trees{'inlineifsetifclear'} = {
'type' => 'elided_brace_command_arg'
}
],
- 'cmdname' => 'inlineifclear',
'extra' => {
'format' => 'aaa'
},
@@ -165,7 +165,8 @@ $result_trees{'inlineifsetifclear'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'inlineifset',
+ 'contents' => [
{
'contents' => [
{
@@ -188,7 +189,6 @@ $result_trees{'inlineifsetifclear'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlineifset',
'extra' => {
'expand_index' => 1,
'format' => 'aaa'
diff --git a/tp/t/results/converters_tests/inlineifsetifclearspaces.pl
b/tp/t/results/converters_tests/inlineifsetifclearspaces.pl
index b779dc6a75..3d3ad8e074 100644
--- a/tp/t/results/converters_tests/inlineifsetifclearspaces.pl
+++ b/tp/t/results/converters_tests/inlineifsetifclearspaces.pl
@@ -12,7 +12,8 @@ $result_trees{'inlineifsetifclearspaces'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'inlineifclear',
+ 'contents' => [
{
'contents' => [
{
@@ -43,7 +44,6 @@ $result_trees{'inlineifsetifclearspaces'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlineifclear',
'extra' => {
'expand_index' => 1,
'format' => 'aaa'
@@ -73,7 +73,8 @@ $result_trees{'inlineifsetifclearspaces'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'inlineifset',
+ 'contents' => [
{
'contents' => [
{
@@ -100,7 +101,6 @@ $result_trees{'inlineifsetifclearspaces'} = {
'type' => 'elided_brace_command_arg'
}
],
- 'cmdname' => 'inlineifset',
'extra' => {
'format' => 'aaa'
},
@@ -151,7 +151,8 @@ $result_trees{'inlineifsetifclearspaces'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'inlineifclear',
+ 'contents' => [
{
'contents' => [
{
@@ -178,7 +179,6 @@ $result_trees{'inlineifsetifclearspaces'} = {
'type' => 'elided_brace_command_arg'
}
],
- 'cmdname' => 'inlineifclear',
'extra' => {
'format' => 'aaa'
},
@@ -206,7 +206,8 @@ $result_trees{'inlineifsetifclearspaces'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'inlineifset',
+ 'contents' => [
{
'contents' => [
{
@@ -237,7 +238,6 @@ $result_trees{'inlineifsetifclearspaces'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlineifset',
'extra' => {
'expand_index' => 1,
'format' => 'aaa'
diff --git a/tp/t/results/converters_tests/inlinerawspaces.pl
b/tp/t/results/converters_tests/inlinerawspaces.pl
index 5a147156a8..b91a374baa 100644
--- a/tp/t/results/converters_tests/inlinerawspaces.pl
+++ b/tp/t/results/converters_tests/inlinerawspaces.pl
@@ -15,7 +15,8 @@ $result_trees{'inlinerawspaces'} = {
'text' => 'A '
},
{
- 'args' => [
+ 'cmdname' => 'inlineraw',
+ 'contents' => [
{
'contents' => [
{
@@ -38,12 +39,12 @@ $result_trees{'inlinerawspaces'} = {
'text' => 'plaintext `` '
},
{
- 'args' => [
+ 'cmdname' => 'lbracechar',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'lbracechar',
'source_info' => {
'line_nr' => 1
}
@@ -60,7 +61,6 @@ $result_trees{'inlinerawspaces'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlineraw',
'extra' => {
'expand_index' => 1,
'format' => 'plaintext'
@@ -74,7 +74,8 @@ $result_trees{'inlinerawspaces'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'inlineraw',
+ 'contents' => [
{
'contents' => [
{
@@ -97,7 +98,8 @@ $result_trees{'inlinerawspaces'} = {
'text' => 'in <i>'
},
{
- 'args' => [
+ 'cmdname' => 'acronym',
+ 'contents' => [
{
'contents' => [
{
@@ -107,7 +109,6 @@ $result_trees{'inlinerawspaces'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'acronym',
'source_info' => {
'line_nr' => 2
}
@@ -124,7 +125,6 @@ $result_trees{'inlinerawspaces'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inlineraw',
'extra' => {
'expand_index' => 1,
'format' => 'html'
diff --git a/tp/t/results/converters_tests/link.pl
b/tp/t/results/converters_tests/link.pl
index 9c41c26861..a26b1f4da3 100644
--- a/tp/t/results/converters_tests/link.pl
+++ b/tp/t/results/converters_tests/link.pl
@@ -165,7 +165,8 @@ $result_trees{'link'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'link',
+ 'contents' => [
{
'contents' => [
{
@@ -183,7 +184,6 @@ $result_trees{'link'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'link',
'source_info' => {
'line_nr' => 11
}
@@ -203,7 +203,8 @@ $result_trees{'link'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'link',
+ 'contents' => [
{
'contents' => [
{
@@ -234,7 +235,6 @@ $result_trees{'link'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'link',
'source_info' => {
'line_nr' => 13
}
@@ -300,7 +300,8 @@ $result_trees{'link'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'link',
+ 'contents' => [
{
'contents' => [
{
@@ -318,7 +319,6 @@ $result_trees{'link'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'link',
'source_info' => {
'line_nr' => 18
}
@@ -338,7 +338,8 @@ $result_trees{'link'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'link',
+ 'contents' => [
{
'contents' => [
{
@@ -369,7 +370,6 @@ $result_trees{'link'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'link',
'source_info' => {
'line_nr' => 20
}
@@ -403,7 +403,8 @@ $result_trees{'link'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'link',
+ 'contents' => [
{
'contents' => [
{
@@ -431,7 +432,6 @@ $result_trees{'link'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'link',
'source_info' => {
'line_nr' => 24
}
@@ -451,7 +451,8 @@ $result_trees{'link'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'link',
+ 'contents' => [
{
'contents' => [
{
@@ -484,7 +485,6 @@ $result_trees{'link'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'link',
'source_info' => {
'line_nr' => 26
}
@@ -513,12 +513,12 @@ $result_trees{'link'} = {
],
'type' => 'document_root'
};
-$result_trees{'link'}{'contents'}[3]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'link'}{'contents'}[3]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'link'}{'contents'}[3]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'link'}{'contents'}[3]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'link'}{'contents'}[3]{'contents'}[9]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'link'}{'contents'}[3]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'link'}{'contents'}[3]{'contents'}[11]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'link'}{'contents'}[3]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'link'}{'contents'}[3]{'contents'}[15]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'link'}{'contents'}[3]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'link'}{'contents'}[3]{'contents'}[17]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'link'}{'contents'}[3]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'link'}{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'link'}{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'link'}{'contents'}[3]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'link'}{'contents'}[3]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'link'}{'contents'}[3]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'link'}{'contents'}[3]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'link'}{'contents'}[3]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'link'}{'contents'}[3]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'link'}{'contents'}[3]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'link'}{'contents'}[3]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'link'}{'contents'}[3]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'link'}{'contents'}[3]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'link'} = '@node One
@chapter ONEX
diff --git a/tp/t/results/converters_tests/multitable_prototypes.pl
b/tp/t/results/converters_tests/multitable_prototypes.pl
index 75c6061d16..daed15b097 100644
--- a/tp/t/results/converters_tests/multitable_prototypes.pl
+++ b/tp/t/results/converters_tests/multitable_prototypes.pl
@@ -52,7 +52,8 @@ $result_trees{'multitable_prototypes'} = {
'text' => 'j '
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -62,7 +63,6 @@ $result_trees{'multitable_prototypes'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 1
}
@@ -80,7 +80,8 @@ $result_trees{'multitable_prototypes'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'var',
+ 'contents' => [
{
'contents' => [
{
@@ -90,7 +91,6 @@ $result_trees{'multitable_prototypes'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'var',
'source_info' => {
'line_nr' => 1
}
@@ -175,7 +175,8 @@ $result_trees{'multitable_prototypes'} = {
'text' => 'k '
},
{
- 'args' => [
+ 'cmdname' => 'samp',
+ 'contents' => [
{
'contents' => [
{
@@ -185,7 +186,6 @@ $result_trees{'multitable_prototypes'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'samp',
'source_info' => {
'line_nr' => 4
}
diff --git a/tp/t/results/converters_tests/normal_font_in_monospace.pl
b/tp/t/results/converters_tests/normal_font_in_monospace.pl
index 758ea5af42..049fde396a 100644
--- a/tp/t/results/converters_tests/normal_font_in_monospace.pl
+++ b/tp/t/results/converters_tests/normal_font_in_monospace.pl
@@ -29,14 +29,16 @@ $result_trees{'normal_font_in_monospace'} = {
'text' => 'in example '
},
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
'text' => 'in r---now '
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -46,7 +48,6 @@ $result_trees{'normal_font_in_monospace'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 2
}
@@ -55,7 +56,6 @@ $result_trees{'normal_font_in_monospace'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 2
}
@@ -110,21 +110,24 @@ $result_trees{'normal_font_in_monospace'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'command',
+ 'contents' => [
{
'contents' => [
{
'text' => 'in command---c '
},
{
- 'args' => [
+ 'cmdname' => 'r',
+ 'contents' => [
{
'contents' => [
{
'text' => 'in r---r '
},
{
- 'args' => [
+ 'cmdname' => 'file',
+ 'contents' => [
{
'contents' => [
{
@@ -134,7 +137,6 @@ $result_trees{'normal_font_in_monospace'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'file',
'source_info' => {
'line_nr' => 5
}
@@ -143,7 +145,6 @@ $result_trees{'normal_font_in_monospace'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'r',
'source_info' => {
'line_nr' => 5
}
@@ -152,7 +153,6 @@ $result_trees{'normal_font_in_monospace'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'command',
'source_info' => {
'line_nr' => 5
}
diff --git a/tp/t/results/converters_tests/raw_block_commands.pl
b/tp/t/results/converters_tests/raw_block_commands.pl
index c54329b8ae..23b5f1b144 100644
--- a/tp/t/results/converters_tests/raw_block_commands.pl
+++ b/tp/t/results/converters_tests/raw_block_commands.pl
@@ -223,7 +223,8 @@ $result_trees{'raw_block_commands'} = {
'text' => '$\\underline{a < b '
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -244,7 +245,6 @@ $result_trees{'raw_block_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 15
}
@@ -316,7 +316,8 @@ $result_trees{'raw_block_commands'} = {
'text' => '$\\frac{a < b '
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -337,7 +338,6 @@ $result_trees{'raw_block_commands'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 19
}
diff --git a/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl
b/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl
index a932608dee..edc086403c 100644
--- a/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl
+++ b/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl
@@ -223,7 +223,8 @@ $result_trees{'raw_block_commands_expand_tex'} = {
'text' => '$\\underline{a < b '
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -244,7 +245,6 @@ $result_trees{'raw_block_commands_expand_tex'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 15
}
@@ -316,7 +316,8 @@ $result_trees{'raw_block_commands_expand_tex'} = {
'text' => '$\\frac{a < b '
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -337,7 +338,6 @@ $result_trees{'raw_block_commands_expand_tex'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 19
}
diff --git a/tp/t/results/converters_tests/ref_error_formatting.pl
b/tp/t/results/converters_tests/ref_error_formatting.pl
index 61c42c250b..8c596fe9b2 100644
--- a/tp/t/results/converters_tests/ref_error_formatting.pl
+++ b/tp/t/results/converters_tests/ref_error_formatting.pl
@@ -17,7 +17,8 @@ $result_trees{'ref_error_formatting'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -39,7 +40,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 2
}
@@ -48,7 +48,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -66,7 +67,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 2
}
@@ -86,7 +86,8 @@ $result_trees{'ref_error_formatting'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -108,7 +109,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 4
}
@@ -117,7 +117,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'type' => 'brace_arg'
},
@@ -130,7 +131,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 4
}
@@ -140,7 +140,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -162,7 +163,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 5
}
@@ -171,7 +171,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'type' => 'brace_arg'
},
@@ -187,7 +188,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 5
}
@@ -197,7 +197,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -219,7 +220,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 6
}
@@ -228,7 +228,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'type' => 'brace_arg'
},
@@ -247,7 +248,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 6
}
@@ -257,7 +257,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -279,7 +280,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 7
}
@@ -288,7 +288,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'type' => 'brace_arg'
},
@@ -310,7 +311,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 7
}
@@ -320,7 +320,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -342,7 +343,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 8
}
@@ -351,7 +351,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -377,7 +378,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 8
}
@@ -387,7 +387,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -409,7 +410,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 9
}
@@ -418,7 +418,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -447,7 +448,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 9
}
@@ -457,7 +457,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -479,7 +480,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 10
}
@@ -488,7 +488,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -519,7 +520,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 10
}
@@ -529,7 +529,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -551,7 +552,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 11
}
@@ -560,7 +560,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -594,7 +595,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 11
}
@@ -604,7 +604,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -626,7 +627,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 12
}
@@ -635,7 +635,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -672,7 +673,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 12
}
@@ -682,7 +682,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -704,7 +705,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 13
}
@@ -713,7 +713,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -749,7 +750,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 13
}
@@ -759,7 +759,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -781,7 +782,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 14
}
@@ -790,7 +790,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -829,7 +830,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 14
}
@@ -839,7 +839,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -861,7 +862,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 15
}
@@ -870,7 +870,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -911,7 +912,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 15
}
@@ -921,7 +921,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -943,7 +944,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 16
}
@@ -952,7 +952,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -996,7 +997,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 16
}
@@ -1006,7 +1006,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1028,7 +1029,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 17
}
@@ -1037,7 +1037,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -1096,7 +1097,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 17
}
@@ -1106,7 +1106,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1128,7 +1129,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 18
}
@@ -1137,7 +1137,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -1173,7 +1174,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 18
}
@@ -1183,7 +1183,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1205,7 +1206,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 19
}
@@ -1214,7 +1214,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -1253,7 +1254,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 19
}
@@ -1263,7 +1263,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1285,7 +1286,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 20
}
@@ -1294,7 +1294,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -1348,7 +1349,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 20
}
@@ -1358,7 +1358,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1380,7 +1381,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 21
}
@@ -1389,7 +1389,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -1428,7 +1429,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 21
}
@@ -1438,7 +1438,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1460,7 +1461,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 22
}
@@ -1469,7 +1469,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'type' => 'brace_arg'
},
@@ -1493,7 +1494,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 22
}
@@ -1503,7 +1503,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1525,7 +1526,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 23
}
@@ -1534,7 +1534,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'type' => 'brace_arg'
},
@@ -1558,7 +1559,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 23
}
@@ -1568,7 +1568,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1590,7 +1591,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 24
}
@@ -1599,7 +1599,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'type' => 'brace_arg'
},
@@ -1626,7 +1627,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 24
}
@@ -1636,7 +1636,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1658,7 +1659,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 25
}
@@ -1667,7 +1667,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'type' => 'brace_arg'
},
@@ -1696,7 +1697,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 25
}
@@ -1706,7 +1706,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1728,7 +1729,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 26
}
@@ -1737,7 +1737,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'type' => 'brace_arg'
},
@@ -1769,7 +1770,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 26
}
@@ -1779,7 +1779,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1801,7 +1802,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 27
}
@@ -1810,7 +1810,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'type' => 'brace_arg'
},
@@ -1857,7 +1858,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 27
}
@@ -1867,7 +1867,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1889,7 +1890,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 28
}
@@ -1898,7 +1898,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'type' => 'brace_arg'
},
@@ -1922,7 +1923,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 28
}
@@ -1932,7 +1932,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1954,7 +1955,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 29
}
@@ -1963,7 +1963,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'type' => 'brace_arg'
},
@@ -1990,7 +1991,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 29
}
@@ -2000,7 +2000,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -2022,7 +2023,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 30
}
@@ -2031,7 +2031,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'type' => 'brace_arg'
},
@@ -2073,7 +2074,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 30
}
@@ -2083,7 +2083,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -2105,7 +2106,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 31
}
@@ -2114,7 +2114,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'type' => 'brace_arg'
},
@@ -2141,7 +2142,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 31
}
@@ -2161,7 +2161,8 @@ $result_trees{'ref_error_formatting'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -2183,7 +2184,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 33
}
@@ -2192,7 +2192,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'inforef',
+ 'contents' => [
{
'type' => 'brace_arg'
},
@@ -2210,7 +2211,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inforef',
'source_info' => {
'line_nr' => 33
}
@@ -2220,7 +2220,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -2242,7 +2243,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 34
}
@@ -2251,7 +2251,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'inforef',
+ 'contents' => [
{
'type' => 'brace_arg'
},
@@ -2267,7 +2268,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inforef',
'source_info' => {
'line_nr' => 34
}
@@ -2277,7 +2277,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -2299,7 +2300,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 35
}
@@ -2308,7 +2308,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'inforef',
+ 'contents' => [
{
'type' => 'brace_arg'
},
@@ -2334,7 +2335,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inforef',
'source_info' => {
'line_nr' => 35
}
@@ -2344,7 +2344,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -2363,7 +2364,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 36
}
@@ -2372,12 +2372,12 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'inforef',
+ 'contents' => [
{
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inforef',
'source_info' => {
'line_nr' => 36
}
@@ -2397,7 +2397,8 @@ $result_trees{'ref_error_formatting'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -2419,7 +2420,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 38
}
@@ -2428,7 +2428,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'inforef',
+ 'contents' => [
{
'contents' => [
{
@@ -2471,7 +2472,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inforef',
'source_info' => {
'line_nr' => 38
}
@@ -2481,7 +2481,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -2503,7 +2504,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 39
}
@@ -2512,7 +2512,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'inforef',
+ 'contents' => [
{
'contents' => [
{
@@ -2530,7 +2531,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inforef',
'source_info' => {
'line_nr' => 39
}
@@ -2540,7 +2540,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -2562,7 +2563,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 40
}
@@ -2571,7 +2571,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'inforef',
+ 'contents' => [
{
'contents' => [
{
@@ -2602,7 +2603,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inforef',
'source_info' => {
'line_nr' => 40
}
@@ -2612,7 +2612,8 @@ $result_trees{'ref_error_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -2634,7 +2635,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 41
}
@@ -2643,7 +2643,8 @@ $result_trees{'ref_error_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'inforef',
+ 'contents' => [
{
'contents' => [
{
@@ -2671,7 +2672,6 @@ $result_trees{'ref_error_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inforef',
'source_info' => {
'line_nr' => 41
}
@@ -2689,25 +2689,25 @@ $result_trees{'ref_error_formatting'} = {
],
'type' => 'document_root'
};
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[18]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[18]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[22]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[22]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[26]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[26]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[30]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[30]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[34]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[34]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[38]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[38]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[42]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[42]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[46]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[46]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[50]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[50]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[54]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[54]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[58]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[58]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[62]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[62]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[66]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[66]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[70]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[70]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[10]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[14]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[18]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[18]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[22]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[22]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[26]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[26]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[30]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[30]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[34]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[34]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[38]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[38]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[42]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[42]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[46]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[46]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[50]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[50]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[54]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[54]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[58]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[58]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[62]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[62]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[66]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[66]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[70]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[3]{'contents'}[70]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[6]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[10]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[14]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_error_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[14]{'contents'}[0]{'contents'}[0];
$result_texis{'ref_error_formatting'} = '
@code{@@ref@{node@}} @ref{node}
diff --git a/tp/t/results/converters_tests/ref_in_sectioning.pl
b/tp/t/results/converters_tests/ref_in_sectioning.pl
index 8cbb7f978e..6ffb8a20a0 100644
--- a/tp/t/results/converters_tests/ref_in_sectioning.pl
+++ b/tp/t/results/converters_tests/ref_in_sectioning.pl
@@ -70,7 +70,8 @@ $result_trees{'ref_in_sectioning'} = {
'text' => 'for example '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -88,7 +89,6 @@ $result_trees{'ref_in_sectioning'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 4
}
@@ -97,7 +97,8 @@ $result_trees{'ref_in_sectioning'} = {
'text' => ' ('
},
{
- 'args' => [
+ 'cmdname' => 'pxref',
+ 'contents' => [
{
'contents' => [
{
@@ -115,7 +116,6 @@ $result_trees{'ref_in_sectioning'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'pxref',
'source_info' => {
'line_nr' => 4
}
@@ -124,7 +124,8 @@ $result_trees{'ref_in_sectioning'} = {
'text' => ') ('
},
{
- 'args' => [
+ 'cmdname' => 'pxref',
+ 'contents' => [
{
'contents' => [
{
@@ -173,7 +174,6 @@ $result_trees{'ref_in_sectioning'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'pxref',
'source_info' => {
'line_nr' => 4
}
@@ -391,7 +391,8 @@ $result_trees{'ref_in_sectioning'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'xref',
+ 'contents' => [
{
'contents' => [
{
@@ -445,7 +446,6 @@ $result_trees{'ref_in_sectioning'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'xref',
'source_info' => {
'line_nr' => 12
}
@@ -519,7 +519,8 @@ $result_trees{'ref_in_sectioning'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -537,7 +538,6 @@ $result_trees{'ref_in_sectioning'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 15
}
@@ -583,7 +583,8 @@ $result_trees{'ref_in_sectioning'} = {
'text' => 'for example '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -601,7 +602,6 @@ $result_trees{'ref_in_sectioning'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 17
}
@@ -610,7 +610,8 @@ $result_trees{'ref_in_sectioning'} = {
'text' => ' ('
},
{
- 'args' => [
+ 'cmdname' => 'pxref',
+ 'contents' => [
{
'contents' => [
{
@@ -628,7 +629,6 @@ $result_trees{'ref_in_sectioning'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'pxref',
'source_info' => {
'line_nr' => 17
}
@@ -637,7 +637,8 @@ $result_trees{'ref_in_sectioning'} = {
'text' => ') ('
},
{
- 'args' => [
+ 'cmdname' => 'pxref',
+ 'contents' => [
{
'contents' => [
{
@@ -686,7 +687,6 @@ $result_trees{'ref_in_sectioning'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'pxref',
'source_info' => {
'line_nr' => 17
}
@@ -729,7 +729,8 @@ $result_trees{'ref_in_sectioning'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -760,7 +761,6 @@ $result_trees{'ref_in_sectioning'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 19
}
@@ -803,11 +803,13 @@ $result_trees{'ref_in_sectioning'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -817,7 +819,6 @@ $result_trees{'ref_in_sectioning'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 21
}
@@ -839,7 +840,8 @@ $result_trees{'ref_in_sectioning'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'samp',
+ 'contents' => [
{
'contents' => [
{
@@ -849,7 +851,6 @@ $result_trees{'ref_in_sectioning'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'samp',
'source_info' => {
'line_nr' => 21
}
@@ -863,7 +864,6 @@ $result_trees{'ref_in_sectioning'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 21
}
@@ -906,11 +906,13 @@ $result_trees{'ref_in_sectioning'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -920,7 +922,6 @@ $result_trees{'ref_in_sectioning'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 23
}
@@ -955,7 +956,6 @@ $result_trees{'ref_in_sectioning'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 23
}
@@ -998,7 +998,8 @@ $result_trees{'ref_in_sectioning'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -1040,7 +1041,6 @@ $result_trees{'ref_in_sectioning'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 25
}
@@ -1083,7 +1083,8 @@ $result_trees{'ref_in_sectioning'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -1125,7 +1126,6 @@ $result_trees{'ref_in_sectioning'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 27
}
@@ -1168,7 +1168,8 @@ $result_trees{'ref_in_sectioning'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'type' => 'brace_arg'
},
@@ -1198,7 +1199,6 @@ $result_trees{'ref_in_sectioning'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 29
}
@@ -1241,7 +1241,8 @@ $result_trees{'ref_in_sectioning'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'type' => 'brace_arg'
},
@@ -1265,7 +1266,6 @@ $result_trees{'ref_in_sectioning'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 31
}
@@ -1308,7 +1308,8 @@ $result_trees{'ref_in_sectioning'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'inforef',
+ 'contents' => [
{
'contents' => [
{
@@ -1351,7 +1352,6 @@ $result_trees{'ref_in_sectioning'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inforef',
'source_info' => {
'line_nr' => 33
}
@@ -1397,7 +1397,8 @@ $result_trees{'ref_in_sectioning'} = {
'text' => '('
},
{
- 'args' => [
+ 'cmdname' => 'pxref',
+ 'contents' => [
{
'contents' => [
{
@@ -1444,7 +1445,6 @@ $result_trees{'ref_in_sectioning'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'pxref',
'source_info' => {
'line_nr' => 35
}
@@ -1490,7 +1490,8 @@ $result_trees{'ref_in_sectioning'} = {
'text' => '('
},
{
- 'args' => [
+ 'cmdname' => 'pxref',
+ 'contents' => [
{
'type' => 'brace_arg'
},
@@ -1517,7 +1518,6 @@ $result_trees{'ref_in_sectioning'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'pxref',
'source_info' => {
'line_nr' => 37
}
@@ -1560,7 +1560,8 @@ $result_trees{'ref_in_sectioning'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'xref',
+ 'contents' => [
{
'contents' => [
{
@@ -1591,7 +1592,6 @@ $result_trees{'ref_in_sectioning'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'xref',
'source_info' => {
'line_nr' => 39
}
@@ -1634,7 +1634,8 @@ $result_trees{'ref_in_sectioning'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'xref',
+ 'contents' => [
{
'type' => 'brace_arg'
},
@@ -1653,7 +1654,6 @@ $result_trees{'ref_in_sectioning'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'xref',
'source_info' => {
'line_nr' => 41
}
@@ -1694,24 +1694,24 @@ $result_trees{'ref_in_sectioning'} = {
],
'type' => 'document_root'
};
-$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[5]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0];
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[3]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[5]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[9]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[9]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[18]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[18]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[9]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[9]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[18]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[18]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'ref_in_sectioning'} = '@contents
diff --git
a/tp/t/results/converters_tests/reference_for_formatting_customizations.pl
b/tp/t/results/converters_tests/reference_for_formatting_customizations.pl
index 2fe0346797..f1f134ea31 100644
--- a/tp/t/results/converters_tests/reference_for_formatting_customizations.pl
+++ b/tp/t/results/converters_tests/reference_for_formatting_customizations.pl
@@ -142,12 +142,12 @@ $result_trees{'reference_for_formatting_customizations'}
= {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'AA',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'AA',
'source_info' => {
'file_name' => 'formatting_customizations_input.texi',
'line_nr' => 7
@@ -157,12 +157,12 @@ $result_trees{'reference_for_formatting_customizations'}
= {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'equiv',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'equiv',
'source_info' => {
'file_name' => 'formatting_customizations_input.texi',
'line_nr' => 7
@@ -178,12 +178,12 @@ $result_trees{'reference_for_formatting_customizations'}
= {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'copyright',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'copyright',
'source_info' => {
'file_name' => 'formatting_customizations_input.texi',
'line_nr' => 7
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 a9f9d8eac7..ef87402031 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
@@ -82,7 +82,8 @@ $result_trees{'references_to_top_no_top_output'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'anchor',
+ 'contents' => [
{
'contents' => [
{
@@ -95,7 +96,6 @@ $result_trees{'references_to_top_no_top_output'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'anchor',
'extra' => {
'is_target' => 1,
'normalized' => 'a-in-copying'
@@ -228,7 +228,8 @@ $result_trees{'references_to_top_no_top_output'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'anchor',
+ 'contents' => [
{
'contents' => [
{
@@ -238,7 +239,6 @@ $result_trees{'references_to_top_no_top_output'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'anchor',
'extra' => {
'is_target' => 1,
'normalized' => 'a-in-top'
@@ -263,7 +263,8 @@ $result_trees{'references_to_top_no_top_output'} = {
'text' => 'Paragraph '
},
{
- 'args' => [
+ 'cmdname' => 'anchor',
+ 'contents' => [
{
'contents' => [
{
@@ -273,7 +274,6 @@ $result_trees{'references_to_top_no_top_output'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'anchor',
'extra' => {
'is_target' => 1,
'normalized' => 'a-in-paragraph-in-top'
@@ -297,7 +297,8 @@ $result_trees{'references_to_top_no_top_output'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'footnote',
+ 'contents' => [
{
'contents' => [
{
@@ -306,7 +307,8 @@ $result_trees{'references_to_top_no_top_output'} = {
'text' => 'in footnote '
},
{
- 'args' => [
+ 'cmdname' => 'anchor',
+ 'contents' => [
{
'contents' => [
{
@@ -316,7 +318,6 @@ $result_trees{'references_to_top_no_top_output'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'anchor',
'extra' => {
'is_target' => 1,
'normalized' => 'a-in-footnote'
@@ -332,7 +333,6 @@ $result_trees{'references_to_top_no_top_output'} = {
'type' => 'brace_command_context'
}
],
- 'cmdname' => 'footnote',
'extra' => {},
'source_info' => {
'line_nr' => 18
@@ -406,7 +406,8 @@ $result_trees{'references_to_top_no_top_output'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'anchor',
+ 'contents' => [
{
'contents' => [
{
@@ -416,7 +417,6 @@ $result_trees{'references_to_top_no_top_output'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'anchor',
'extra' => {
'is_target' => 1,
'normalized' => 'a-in-float'
@@ -433,7 +433,8 @@ $result_trees{'references_to_top_no_top_output'} = {
'type' => 'paragraph'
},
{
- 'args' => [
+ 'cmdname' => 'caption',
+ 'contents' => [
{
'contents' => [
{
@@ -442,7 +443,8 @@ $result_trees{'references_to_top_no_top_output'} = {
'text' => 'Caption Flist. '
},
{
- 'args' => [
+ 'cmdname' => 'anchor',
+ 'contents' => [
{
'contents' => [
{
@@ -452,7 +454,6 @@ $result_trees{'references_to_top_no_top_output'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'anchor',
'extra' => {
'is_target' => 1,
'normalized' => 'a-in-caption'
@@ -468,7 +469,6 @@ $result_trees{'references_to_top_no_top_output'} = {
'type' => 'brace_command_context'
}
],
- 'cmdname' => 'caption',
'extra' => {
'float' => {}
},
@@ -658,7 +658,8 @@ $result_trees{'references_to_top_no_top_output'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'pxref',
+ 'contents' => [
{
'contents' => [
{
@@ -676,7 +677,6 @@ $result_trees{'references_to_top_no_top_output'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'pxref',
'source_info' => {
'line_nr' => 35
}
@@ -686,7 +686,8 @@ $result_trees{'references_to_top_no_top_output'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'pxref',
+ 'contents' => [
{
'contents' => [
{
@@ -704,7 +705,6 @@ $result_trees{'references_to_top_no_top_output'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'pxref',
'source_info' => {
'line_nr' => 36
}
@@ -714,7 +714,8 @@ $result_trees{'references_to_top_no_top_output'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'pxref',
+ 'contents' => [
{
'contents' => [
{
@@ -732,7 +733,6 @@ $result_trees{'references_to_top_no_top_output'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'pxref',
'source_info' => {
'line_nr' => 37
}
@@ -742,7 +742,8 @@ $result_trees{'references_to_top_no_top_output'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'pxref',
+ 'contents' => [
{
'contents' => [
{
@@ -760,7 +761,6 @@ $result_trees{'references_to_top_no_top_output'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'pxref',
'source_info' => {
'line_nr' => 38
}
@@ -770,7 +770,8 @@ $result_trees{'references_to_top_no_top_output'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'pxref',
+ 'contents' => [
{
'contents' => [
{
@@ -788,7 +789,6 @@ $result_trees{'references_to_top_no_top_output'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'pxref',
'source_info' => {
'line_nr' => 39
}
@@ -798,7 +798,8 @@ $result_trees{'references_to_top_no_top_output'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'pxref',
+ 'contents' => [
{
'contents' => [
{
@@ -816,7 +817,6 @@ $result_trees{'references_to_top_no_top_output'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'pxref',
'source_info' => {
'line_nr' => 40
}
@@ -951,7 +951,8 @@ $result_trees{'references_to_top_no_top_output'} = {
'type' => 'paragraph'
},
{
- 'args' => [
+ 'cmdname' => 'caption',
+ 'contents' => [
{
'contents' => [
{
@@ -966,7 +967,6 @@ $result_trees{'references_to_top_no_top_output'} = {
'type' => 'brace_command_context'
}
],
- 'cmdname' => 'caption',
'extra' => {
'float' => {}
},
@@ -1081,12 +1081,12 @@
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'extra'}{'caption'}
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'contents'}[1];
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'extra'}{'float_section'}
= $result_trees{'references_to_top_no_top_output'}{'contents'}[2];
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[14]{'extra'}{'element_node'}
= $result_trees{'references_to_top_no_top_output'}{'contents'}[1];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[10]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[0];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'contents'}[0]{'contents'}[0];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[10]{'contents'}[0]{'contents'}[0];
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'references_to_top_no_top_output'}{'contents'}[3];
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'extra'}{'float'}
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7];
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'extra'}{'caption'}
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'contents'}[1];
diff --git a/tp/t/results/converters_tests/refs_formatting.pl
b/tp/t/results/converters_tests/refs_formatting.pl
index fa88be86f3..643424be81 100644
--- a/tp/t/results/converters_tests/refs_formatting.pl
+++ b/tp/t/results/converters_tests/refs_formatting.pl
@@ -68,7 +68,8 @@ $result_trees{'refs_formatting'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -90,7 +91,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 4
}
@@ -99,7 +99,8 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -125,7 +126,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 4
}
@@ -135,7 +135,8 @@ $result_trees{'refs_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -157,7 +158,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 5
}
@@ -166,7 +166,8 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -195,7 +196,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 5
}
@@ -205,7 +205,8 @@ $result_trees{'refs_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -227,7 +228,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 6
}
@@ -236,7 +236,8 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -267,7 +268,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 6
}
@@ -277,7 +277,8 @@ $result_trees{'refs_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -299,7 +300,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 7
}
@@ -308,7 +308,8 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -342,7 +343,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 7
}
@@ -352,7 +352,8 @@ $result_trees{'refs_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -374,7 +375,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 8
}
@@ -383,7 +383,8 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -420,7 +421,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 8
}
@@ -430,7 +430,8 @@ $result_trees{'refs_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -452,7 +453,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 9
}
@@ -461,7 +461,8 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -497,7 +498,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 9
}
@@ -507,7 +507,8 @@ $result_trees{'refs_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -529,7 +530,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 10
}
@@ -538,7 +538,8 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -577,7 +578,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 10
}
@@ -587,7 +587,8 @@ $result_trees{'refs_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -609,7 +610,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 11
}
@@ -618,7 +618,8 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -659,7 +660,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 11
}
@@ -669,7 +669,8 @@ $result_trees{'refs_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -691,7 +692,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 12
}
@@ -700,7 +700,8 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -744,7 +745,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 12
}
@@ -754,7 +754,8 @@ $result_trees{'refs_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -776,7 +777,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 13
}
@@ -785,7 +785,8 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -844,7 +845,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 13
}
@@ -854,7 +854,8 @@ $result_trees{'refs_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -876,7 +877,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 14
}
@@ -885,7 +885,8 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -921,7 +922,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 14
}
@@ -931,7 +931,8 @@ $result_trees{'refs_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -953,7 +954,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 15
}
@@ -962,7 +962,8 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -1001,7 +1002,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 15
}
@@ -1011,7 +1011,8 @@ $result_trees{'refs_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1033,7 +1034,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 16
}
@@ -1042,7 +1042,8 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -1096,7 +1097,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 16
}
@@ -1106,7 +1106,8 @@ $result_trees{'refs_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1128,7 +1129,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 17
}
@@ -1137,7 +1137,8 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -1176,7 +1177,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 17
}
@@ -1196,7 +1196,8 @@ $result_trees{'refs_formatting'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1218,7 +1219,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 19
}
@@ -1227,7 +1227,8 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -1266,7 +1267,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 19
}
@@ -1276,7 +1276,8 @@ $result_trees{'refs_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1298,7 +1299,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 20
}
@@ -1307,7 +1307,8 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -1349,7 +1350,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 20
}
@@ -1359,7 +1359,8 @@ $result_trees{'refs_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1381,7 +1382,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 21
}
@@ -1390,7 +1390,8 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -1435,7 +1436,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 21
}
@@ -1445,7 +1445,8 @@ $result_trees{'refs_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1467,7 +1468,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 22
}
@@ -1476,7 +1476,8 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -1524,7 +1525,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 22
}
@@ -1534,7 +1534,8 @@ $result_trees{'refs_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1556,7 +1557,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 23
}
@@ -1565,7 +1565,8 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -1615,7 +1616,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 23
}
@@ -1625,7 +1625,8 @@ $result_trees{'refs_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1647,7 +1648,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 24
}
@@ -1656,7 +1656,8 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -1706,7 +1707,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 24
}
@@ -1716,7 +1716,8 @@ $result_trees{'refs_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1738,7 +1739,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 25
}
@@ -1747,7 +1747,8 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -1800,7 +1801,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 25
}
@@ -1810,7 +1810,8 @@ $result_trees{'refs_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1832,7 +1833,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 26
}
@@ -1841,7 +1841,8 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -1896,7 +1897,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 26
}
@@ -1906,7 +1906,8 @@ $result_trees{'refs_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1928,7 +1929,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 27
}
@@ -1937,7 +1937,8 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -1995,7 +1996,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 27
}
@@ -2005,7 +2005,8 @@ $result_trees{'refs_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -2027,7 +2028,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 28
}
@@ -2036,7 +2036,8 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -2109,7 +2110,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 28
}
@@ -2119,7 +2119,8 @@ $result_trees{'refs_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -2141,7 +2142,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 29
}
@@ -2150,7 +2150,8 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -2200,7 +2201,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 29
}
@@ -2210,7 +2210,8 @@ $result_trees{'refs_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -2232,7 +2233,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 30
}
@@ -2241,7 +2241,8 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -2294,7 +2295,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 30
}
@@ -2304,7 +2304,8 @@ $result_trees{'refs_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -2326,7 +2327,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 31
}
@@ -2335,7 +2335,8 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -2403,7 +2404,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 31
}
@@ -2413,7 +2413,8 @@ $result_trees{'refs_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -2435,7 +2436,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 32
}
@@ -2444,7 +2444,8 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -2497,7 +2498,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 32
}
@@ -2517,7 +2517,8 @@ $result_trees{'refs_formatting'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -2539,7 +2540,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 34
}
@@ -2548,7 +2548,8 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'inforef',
+ 'contents' => [
{
'contents' => [
{
@@ -2591,7 +2592,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inforef',
'source_info' => {
'line_nr' => 34
}
@@ -2601,7 +2601,8 @@ $result_trees{'refs_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -2623,7 +2624,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 35
}
@@ -2632,7 +2632,8 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'inforef',
+ 'contents' => [
{
'contents' => [
{
@@ -2650,7 +2651,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inforef',
'source_info' => {
'line_nr' => 35
}
@@ -2660,7 +2660,8 @@ $result_trees{'refs_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -2682,7 +2683,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 36
}
@@ -2691,7 +2691,8 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'inforef',
+ 'contents' => [
{
'contents' => [
{
@@ -2722,7 +2723,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inforef',
'source_info' => {
'line_nr' => 36
}
@@ -2732,7 +2732,8 @@ $result_trees{'refs_formatting'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -2754,7 +2755,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 37
}
@@ -2763,7 +2763,8 @@ $result_trees{'refs_formatting'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'inforef',
+ 'contents' => [
{
'contents' => [
{
@@ -2791,7 +2792,6 @@ $result_trees{'refs_formatting'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inforef',
'source_info' => {
'line_nr' => 37
}
@@ -2819,52 +2819,52 @@ $result_trees{'refs_formatting'} = {
],
'type' => 'document_root'
};
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[30]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[30]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[34]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[34]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[42]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[42]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[46]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[46]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[54]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[54]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'args'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'args'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'args'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'args'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'args'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'args'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'args'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'args'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'args'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'args'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'args'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'args'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'args'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'args'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'args'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'args'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'args'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'args'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'args'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'args'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'args'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'args'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[10]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[14]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[30]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[34]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[42]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[46]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[54]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[54]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[6]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[10]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[14]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[14]{'contents'}[0]{'contents'}[0];
$result_texis{'refs_formatting'} = '@node chapter
@chapter chapter
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 7e302faf8c..df37f50c6f 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
@@ -98,14 +98,16 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => 'A '
},
{
- 'args' => [
+ 'cmdname' => 'sc',
+ 'contents' => [
{
'contents' => [
{
'text' => 'sc '
},
{
- 'args' => [
+ 'cmdname' => '~',
+ 'contents' => [
{
'contents' => [
{
@@ -115,7 +117,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'following_arg'
}
],
- 'cmdname' => '~',
'source_info' => {
'line_nr' => 6
}
@@ -124,12 +125,12 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'aa',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'aa',
'source_info' => {
'line_nr' => 6
}
@@ -138,12 +139,12 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'TeX',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'TeX',
'source_info' => {
'line_nr' => 6
}
@@ -152,7 +153,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'sc',
'source_info' => {
'line_nr' => 6
}
@@ -161,7 +161,8 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' node '
},
{
- 'args' => [
+ 'cmdname' => '"',
+ 'contents' => [
{
'contents' => [
{
@@ -171,7 +172,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'following_arg'
}
],
- 'cmdname' => '"',
'source_info' => {
'line_nr' => 6
}
@@ -180,11 +180,13 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => '"',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'dotless',
+ 'contents' => [
{
'contents' => [
{
@@ -194,7 +196,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'dotless',
'source_info' => {
'line_nr' => 6
}
@@ -203,7 +204,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => '"',
'source_info' => {
'line_nr' => 6
}
@@ -212,11 +212,13 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => '`',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => '=',
+ 'contents' => [
{
'contents' => [
{
@@ -226,7 +228,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'following_arg'
}
],
- 'cmdname' => '=',
'source_info' => {
'line_nr' => 6
}
@@ -235,7 +236,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => '`',
'source_info' => {
'line_nr' => 6
}
@@ -244,12 +244,12 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'l',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'l',
'source_info' => {
'line_nr' => 6
}
@@ -258,11 +258,13 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => ',',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => '\'',
+ 'contents' => [
{
'contents' => [
{
@@ -272,7 +274,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'following_arg'
}
],
- 'cmdname' => '\'',
'source_info' => {
'line_nr' => 6
}
@@ -281,7 +282,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => ',',
'source_info' => {
'line_nr' => 6
}
@@ -290,12 +290,12 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'exclamdown',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'exclamdown',
'source_info' => {
'line_nr' => 6
}
@@ -407,14 +407,16 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => 'A '
},
{
- 'args' => [
+ 'cmdname' => 'sc',
+ 'contents' => [
{
'contents' => [
{
'text' => 'sc '
},
{
- 'args' => [
+ 'cmdname' => '~',
+ 'contents' => [
{
'contents' => [
{
@@ -424,7 +426,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'following_arg'
}
],
- 'cmdname' => '~',
'source_info' => {
'line_nr' => 9
}
@@ -433,12 +434,12 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'aa',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'aa',
'source_info' => {
'line_nr' => 9
}
@@ -447,12 +448,12 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'TeX',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'TeX',
'source_info' => {
'line_nr' => 9
}
@@ -461,7 +462,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'sc',
'source_info' => {
'line_nr' => 9
}
@@ -470,7 +470,8 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' node '
},
{
- 'args' => [
+ 'cmdname' => '"',
+ 'contents' => [
{
'contents' => [
{
@@ -480,7 +481,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'following_arg'
}
],
- 'cmdname' => '"',
'source_info' => {
'line_nr' => 9
}
@@ -489,11 +489,13 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => '"',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'dotless',
+ 'contents' => [
{
'contents' => [
{
@@ -503,7 +505,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'dotless',
'source_info' => {
'line_nr' => 9
}
@@ -512,7 +513,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => '"',
'source_info' => {
'line_nr' => 9
}
@@ -521,11 +521,13 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => '`',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => '=',
+ 'contents' => [
{
'contents' => [
{
@@ -535,7 +537,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'following_arg'
}
],
- 'cmdname' => '=',
'source_info' => {
'line_nr' => 9
}
@@ -544,7 +545,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => '`',
'source_info' => {
'line_nr' => 9
}
@@ -553,12 +553,12 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'l',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'l',
'source_info' => {
'line_nr' => 9
}
@@ -567,11 +567,13 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => ',',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => '\'',
+ 'contents' => [
{
'contents' => [
{
@@ -581,7 +583,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'following_arg'
}
],
- 'cmdname' => '\'',
'source_info' => {
'line_nr' => 9
}
@@ -590,7 +591,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => ',',
'source_info' => {
'line_nr' => 9
}
@@ -599,12 +599,12 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'exclamdown',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'exclamdown',
'source_info' => {
'line_nr' => 9
}
@@ -641,7 +641,8 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => 'A '
},
{
- 'args' => [
+ 'cmdname' => 'sc',
+ 'contents' => [
{
'contents' => [
{
@@ -651,7 +652,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'sc',
'source_info' => {
'line_nr' => 10
}
@@ -660,7 +660,8 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' node '
},
{
- 'args' => [
+ 'cmdname' => '"',
+ 'contents' => [
{
'contents' => [
{
@@ -670,7 +671,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'following_arg'
}
],
- 'cmdname' => '"',
'source_info' => {
'line_nr' => 10
}
@@ -679,11 +679,13 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => '"',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'dotless',
+ 'contents' => [
{
'contents' => [
{
@@ -693,7 +695,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'dotless',
'source_info' => {
'line_nr' => 10
}
@@ -702,7 +703,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => '"',
'source_info' => {
'line_nr' => 10
}
@@ -711,11 +711,13 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => '`',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => '=',
+ 'contents' => [
{
'contents' => [
{
@@ -725,7 +727,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'following_arg'
}
],
- 'cmdname' => '=',
'source_info' => {
'line_nr' => 10
}
@@ -734,7 +735,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => '`',
'source_info' => {
'line_nr' => 10
}
@@ -743,12 +743,12 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'l',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'l',
'source_info' => {
'line_nr' => 10
}
@@ -757,11 +757,13 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => ',',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => '\'',
+ 'contents' => [
{
'contents' => [
{
@@ -771,7 +773,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'following_arg'
}
],
- 'cmdname' => '\'',
'source_info' => {
'line_nr' => 10
}
@@ -780,7 +781,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => ',',
'source_info' => {
'line_nr' => 10
}
@@ -789,12 +789,12 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'exclamdown',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'exclamdown',
'source_info' => {
'line_nr' => 10
}
@@ -822,14 +822,16 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => 'see '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
'text' => 'a '
},
{
- 'args' => [
+ 'cmdname' => 'strong',
+ 'contents' => [
{
'contents' => [
{
@@ -839,7 +841,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'strong',
'source_info' => {
'line_nr' => 12
}
@@ -848,7 +849,8 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' ref with '
},
{
- 'args' => [
+ 'cmdname' => 'sc',
+ 'contents' => [
{
'contents' => [
{
@@ -858,18 +860,17 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'sc',
'source_info' => {
'line_nr' => 12
}
},
{
- 'args' => [
+ 'cmdname' => 'comma',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'comma',
'source_info' => {
'line_nr' => 12
}
@@ -878,7 +879,8 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' a i trema '
},
{
- 'args' => [
+ 'cmdname' => '"',
+ 'contents' => [
{
'contents' => [
{
@@ -888,18 +890,17 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'following_arg'
}
],
- 'cmdname' => '"',
'source_info' => {
'line_nr' => 12
}
},
{
- 'args' => [
+ 'cmdname' => 'comma',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'comma',
'source_info' => {
'line_nr' => 12
}
@@ -908,11 +909,13 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' a dotless i trema '
},
{
- 'args' => [
+ 'cmdname' => '"',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'dotless',
+ 'contents' => [
{
'contents' => [
{
@@ -922,7 +925,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'dotless',
'source_info' => {
'line_nr' => 12
}
@@ -931,7 +933,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => '"',
'source_info' => {
'line_nr' => 12
}
@@ -940,11 +941,13 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => '`',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => '=',
+ 'contents' => [
{
'contents' => [
{
@@ -954,7 +957,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'following_arg'
}
],
- 'cmdname' => '=',
'source_info' => {
'line_nr' => 12
}
@@ -963,7 +965,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => '`',
'source_info' => {
'line_nr' => 12
}
@@ -972,12 +973,12 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' and exclamdown '
},
{
- 'args' => [
+ 'cmdname' => 'exclamdown',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'exclamdown',
'source_info' => {
'line_nr' => 12
}
@@ -1020,7 +1021,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 12
}
@@ -1040,21 +1040,24 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'xref',
+ 'contents' => [
{
'contents' => [
{
'text' => 'A '
},
{
- 'args' => [
+ 'cmdname' => 'sc',
+ 'contents' => [
{
'contents' => [
{
'text' => 'sc '
},
{
- 'args' => [
+ 'cmdname' => '~',
+ 'contents' => [
{
'contents' => [
{
@@ -1064,7 +1067,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'following_arg'
}
],
- 'cmdname' => '~',
'source_info' => {
'line_nr' => 14
}
@@ -1073,12 +1075,12 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'aa',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'aa',
'source_info' => {
'line_nr' => 14
}
@@ -1087,12 +1089,12 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'TeX',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'TeX',
'source_info' => {
'line_nr' => 14
}
@@ -1101,7 +1103,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'sc',
'source_info' => {
'line_nr' => 14
}
@@ -1110,7 +1111,8 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' node '
},
{
- 'args' => [
+ 'cmdname' => '"',
+ 'contents' => [
{
'contents' => [
{
@@ -1120,7 +1122,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'following_arg'
}
],
- 'cmdname' => '"',
'source_info' => {
'line_nr' => 14
}
@@ -1129,11 +1130,13 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => '"',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'dotless',
+ 'contents' => [
{
'contents' => [
{
@@ -1143,7 +1146,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'dotless',
'source_info' => {
'line_nr' => 14
}
@@ -1152,7 +1154,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => '"',
'source_info' => {
'line_nr' => 14
}
@@ -1161,11 +1162,13 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => '`',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => '=',
+ 'contents' => [
{
'contents' => [
{
@@ -1175,7 +1178,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'following_arg'
}
],
- 'cmdname' => '=',
'source_info' => {
'line_nr' => 14
}
@@ -1184,7 +1186,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => '`',
'source_info' => {
'line_nr' => 14
}
@@ -1193,12 +1194,12 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'l',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'l',
'source_info' => {
'line_nr' => 14
}
@@ -1207,11 +1208,13 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => ',',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => '\'',
+ 'contents' => [
{
'contents' => [
{
@@ -1221,7 +1224,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'following_arg'
}
],
- 'cmdname' => '\'',
'source_info' => {
'line_nr' => 14
}
@@ -1230,7 +1232,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => ',',
'source_info' => {
'line_nr' => 14
}
@@ -1239,12 +1240,12 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'exclamdown',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'exclamdown',
'source_info' => {
'line_nr' => 14
}
@@ -1274,7 +1275,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'xref',
'source_info' => {
'line_nr' => 14
}
@@ -1316,34 +1316,34 @@
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'co
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[11];
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[12];
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[13]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[13];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[4];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[5];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[6];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[7];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[8];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[9];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[10];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[11]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[11];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[12]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[12];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[13]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[13];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[3]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[4]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[5]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[6]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[7]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[8]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[8];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[9]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[10]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[10];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[11]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[11];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[12]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[12];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[13]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[13];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[4];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[5];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[6];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[7];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[8];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[9];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[10];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[11];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[12];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[13];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[11];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[12];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[13];
$result_texis{'some_at_commands_in_ref_nodes'} = '
@node Top
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 462a13d48a..6bd5953cc1 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
@@ -107,7 +107,8 @@ $result_trees{'spaces_in_empty_node_names'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'verb',
+ 'contents' => [
{
'contents' => [
{
@@ -118,7 +119,6 @@ $result_trees{'spaces_in_empty_node_names'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'verb',
'info' => {
'delimiter' => ':'
},
@@ -303,7 +303,8 @@ $result_trees{'spaces_in_empty_node_names'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'verb',
+ 'contents' => [
{
'contents' => [
{
@@ -314,7 +315,6 @@ $result_trees{'spaces_in_empty_node_names'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'verb',
'info' => {
'delimiter' => ':'
},
@@ -354,7 +354,8 @@ $result_trees{'spaces_in_empty_node_names'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'w',
+ 'contents' => [
{
'contents' => [
{
@@ -364,7 +365,6 @@ $result_trees{'spaces_in_empty_node_names'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'w',
'source_info' => {
'line_nr' => 13
}
@@ -389,7 +389,8 @@ $result_trees{'spaces_in_empty_node_names'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -411,7 +412,6 @@ $result_trees{'spaces_in_empty_node_names'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 15
}
@@ -431,11 +431,13 @@ $result_trees{'spaces_in_empty_node_names'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'verb',
+ 'contents' => [
{
'contents' => [
{
@@ -446,7 +448,6 @@ $result_trees{'spaces_in_empty_node_names'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'verb',
'info' => {
'delimiter' => ':'
},
@@ -466,7 +467,6 @@ $result_trees{'spaces_in_empty_node_names'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 17
}
@@ -486,11 +486,13 @@ $result_trees{'spaces_in_empty_node_names'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'w',
+ 'contents' => [
{
'contents' => [
{
@@ -500,7 +502,6 @@ $result_trees{'spaces_in_empty_node_names'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'w',
'source_info' => {
'line_nr' => 19
}
@@ -517,7 +518,6 @@ $result_trees{'spaces_in_empty_node_names'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 19
}
@@ -546,10 +546,10 @@
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'conte
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'spaces_in_empty_node_names'} = '@node Top
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 211aedb3cd..19346fb04e 100644
--- a/tp/t/results/converters_tests/spaces_in_node_names.pl
+++ b/tp/t/results/converters_tests/spaces_in_node_names.pl
@@ -114,7 +114,8 @@ $result_trees{'spaces_in_node_names'} = {
'text' => 'b'
},
{
- 'args' => [
+ 'cmdname' => 'verb',
+ 'contents' => [
{
'contents' => [
{
@@ -125,7 +126,6 @@ $result_trees{'spaces_in_node_names'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'verb',
'info' => {
'delimiter' => ':'
},
@@ -325,7 +325,8 @@ $result_trees{'spaces_in_node_names'} = {
'text' => 'b'
},
{
- 'args' => [
+ 'cmdname' => 'verb',
+ 'contents' => [
{
'contents' => [
{
@@ -336,7 +337,6 @@ $result_trees{'spaces_in_node_names'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'verb',
'info' => {
'delimiter' => ':'
},
@@ -383,7 +383,8 @@ $result_trees{'spaces_in_node_names'} = {
'text' => 'c'
},
{
- 'args' => [
+ 'cmdname' => 'w',
+ 'contents' => [
{
'contents' => [
{
@@ -393,7 +394,6 @@ $result_trees{'spaces_in_node_names'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'w',
'source_info' => {
'line_nr' => 13
}
@@ -418,7 +418,8 @@ $result_trees{'spaces_in_node_names'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -444,7 +445,6 @@ $result_trees{'spaces_in_node_names'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 15
}
@@ -464,14 +464,16 @@ $result_trees{'spaces_in_node_names'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
'text' => 'b'
},
{
- 'args' => [
+ 'cmdname' => 'verb',
+ 'contents' => [
{
'contents' => [
{
@@ -482,7 +484,6 @@ $result_trees{'spaces_in_node_names'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'verb',
'info' => {
'delimiter' => ':'
},
@@ -503,7 +504,6 @@ $result_trees{'spaces_in_node_names'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 17
}
@@ -523,14 +523,16 @@ $result_trees{'spaces_in_node_names'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
'text' => 'c'
},
{
- 'args' => [
+ 'cmdname' => 'w',
+ 'contents' => [
{
'contents' => [
{
@@ -540,7 +542,6 @@ $result_trees{'spaces_in_node_names'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'w',
'source_info' => {
'line_nr' => 19
}
@@ -558,7 +559,6 @@ $result_trees{'spaces_in_node_names'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 19
}
@@ -594,13 +594,13 @@
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[2]
=
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
=
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1];
$result_texis{'spaces_in_node_names'} = '@node Top
diff --git a/tp/t/results/converters_tests/test_formatting_customizations.pl
b/tp/t/results/converters_tests/test_formatting_customizations.pl
index e797cb8c6b..51f1d45711 100644
--- a/tp/t/results/converters_tests/test_formatting_customizations.pl
+++ b/tp/t/results/converters_tests/test_formatting_customizations.pl
@@ -142,12 +142,12 @@ $result_trees{'test_formatting_customizations'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'AA',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'AA',
'source_info' => {
'file_name' => 'formatting_customizations_input.texi',
'line_nr' => 7
@@ -157,12 +157,12 @@ $result_trees{'test_formatting_customizations'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'equiv',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'equiv',
'source_info' => {
'file_name' => 'formatting_customizations_input.texi',
'line_nr' => 7
@@ -178,12 +178,12 @@ $result_trees{'test_formatting_customizations'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'copyright',
+ 'contents' => [
{
'type' => 'brace_container'
}
],
- 'cmdname' => 'copyright',
'source_info' => {
'file_name' => 'formatting_customizations_input.texi',
'line_nr' => 7
diff --git a/tp/t/results/converters_tests/things_before_setfilename.pl
b/tp/t/results/converters_tests/things_before_setfilename.pl
index 799e6e1ddd..a40d13b5ac 100644
--- a/tp/t/results/converters_tests/things_before_setfilename.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename.pl
@@ -27,7 +27,8 @@ $result_trees{'things_before_setfilename'} = {
'type' => 'preamble_before_beginning'
},
{
- 'args' => [
+ 'cmdname' => 'anchor',
+ 'contents' => [
{
'contents' => [
{
@@ -37,7 +38,6 @@ $result_trees{'things_before_setfilename'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'anchor',
'extra' => {
'is_target' => 1,
'normalized' => 'An-anchor'
@@ -64,7 +64,8 @@ $result_trees{'things_before_setfilename'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -82,7 +83,6 @@ $result_trees{'things_before_setfilename'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'file_name' => 'things_before_setfilename.texi',
'line_nr' => 6
@@ -107,7 +107,8 @@ $result_trees{'things_before_setfilename'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -125,7 +126,6 @@ $result_trees{'things_before_setfilename'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'file_name' => 'things_before_setfilename.texi',
'line_nr' => 9
@@ -146,7 +146,8 @@ $result_trees{'things_before_setfilename'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'footnote',
+ 'contents' => [
{
'contents' => [
{
@@ -164,7 +165,8 @@ $result_trees{'things_before_setfilename'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'anchor',
+ 'contents' => [
{
'contents' => [
{
@@ -174,7 +176,6 @@ $result_trees{'things_before_setfilename'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'anchor',
'extra' => {
'is_target' => 1,
'normalized' => 'Anchor-in-footnote'
@@ -201,7 +202,8 @@ $result_trees{'things_before_setfilename'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -219,7 +221,6 @@ $result_trees{'things_before_setfilename'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'file_name' =>
'things_before_setfilename.texi',
'line_nr' => 16
@@ -236,7 +237,6 @@ $result_trees{'things_before_setfilename'} = {
'type' => 'brace_command_context'
}
],
- 'cmdname' => 'footnote',
'extra' => {},
'source_info' => {
'file_name' => 'things_before_setfilename.texi',
@@ -348,7 +348,8 @@ $result_trees{'things_before_setfilename'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -366,7 +367,6 @@ $result_trees{'things_before_setfilename'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'file_name' => 'things_before_setfilename.texi',
'line_nr' => 24
@@ -429,7 +429,8 @@ $result_trees{'things_before_setfilename'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'caption',
+ 'contents' => [
{
'contents' => [
{
@@ -444,7 +445,6 @@ $result_trees{'things_before_setfilename'} = {
'type' => 'brace_command_context'
}
],
- 'cmdname' => 'caption',
'extra' => {
'float' => {}
},
@@ -927,7 +927,8 @@ $result_trees{'things_before_setfilename'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -945,7 +946,6 @@ $result_trees{'things_before_setfilename'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'file_name' => 'things_before_setfilename.texi',
'line_nr' => 53
@@ -970,7 +970,8 @@ $result_trees{'things_before_setfilename'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -988,7 +989,6 @@ $result_trees{'things_before_setfilename'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'file_name' => 'things_before_setfilename.texi',
'line_nr' => 56
@@ -1023,15 +1023,15 @@ $result_trees{'things_before_setfilename'} = {
],
'type' => 'document_root'
};
-$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[12]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[0];
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[2]{'extra'}{'float'}
=
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14];
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'extra'}{'caption'}
=
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[2];
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0];
$result_texis{'things_before_setfilename'} = '\\input texinfo
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 3df1163f55..0aef3f6b90 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
@@ -27,7 +27,8 @@ $result_trees{'things_before_setfilename_no_element'} = {
'type' => 'preamble_before_beginning'
},
{
- 'args' => [
+ 'cmdname' => 'anchor',
+ 'contents' => [
{
'contents' => [
{
@@ -37,7 +38,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'anchor',
'extra' => {
'is_target' => 1,
'normalized' => 'An-anchor'
@@ -64,7 +64,8 @@ $result_trees{'things_before_setfilename_no_element'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -82,7 +83,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'file_name' => 'things_before_setfilename_no_element.texi',
'line_nr' => 6
@@ -107,7 +107,8 @@ $result_trees{'things_before_setfilename_no_element'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -125,7 +126,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'file_name' => 'things_before_setfilename_no_element.texi',
'line_nr' => 9
@@ -146,7 +146,8 @@ $result_trees{'things_before_setfilename_no_element'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'footnote',
+ 'contents' => [
{
'contents' => [
{
@@ -164,7 +165,8 @@ $result_trees{'things_before_setfilename_no_element'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'anchor',
+ 'contents' => [
{
'contents' => [
{
@@ -174,7 +176,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'anchor',
'extra' => {
'is_target' => 1,
'normalized' => 'Anchor-in-footnote'
@@ -201,7 +202,8 @@ $result_trees{'things_before_setfilename_no_element'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -219,7 +221,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'file_name' =>
'things_before_setfilename_no_element.texi',
'line_nr' => 16
@@ -236,7 +237,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
'type' => 'brace_command_context'
}
],
- 'cmdname' => 'footnote',
'extra' => {},
'source_info' => {
'file_name' => 'things_before_setfilename_no_element.texi',
@@ -348,7 +348,8 @@ $result_trees{'things_before_setfilename_no_element'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -366,7 +367,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'file_name' => 'things_before_setfilename_no_element.texi',
'line_nr' => 24
@@ -429,7 +429,8 @@ $result_trees{'things_before_setfilename_no_element'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'caption',
+ 'contents' => [
{
'contents' => [
{
@@ -444,7 +445,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
'type' => 'brace_command_context'
}
],
- 'cmdname' => 'caption',
'extra' => {
'float' => {}
},
@@ -800,7 +800,8 @@ $result_trees{'things_before_setfilename_no_element'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -818,7 +819,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'file_name' => 'things_before_setfilename_no_element.texi',
'line_nr' => 47
@@ -843,7 +843,8 @@ $result_trees{'things_before_setfilename_no_element'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -861,7 +862,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'file_name' => 'things_before_setfilename_no_element.texi',
'line_nr' => 50
@@ -885,15 +885,15 @@ $result_trees{'things_before_setfilename_no_element'} = {
],
'type' => 'document_root'
};
-$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[12]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[0];
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[2]{'extra'}{'float'}
=
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[14];
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'extra'}{'caption'}
=
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[2];
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0];
$result_texis{'things_before_setfilename_no_element'} = '\\input texinfo
diff --git a/tp/t/results/converters_tests/top_in_ref.pl
b/tp/t/results/converters_tests/top_in_ref.pl
index 4464430d4f..7c21d75842 100644
--- a/tp/t/results/converters_tests/top_in_ref.pl
+++ b/tp/t/results/converters_tests/top_in_ref.pl
@@ -75,7 +75,8 @@ $result_trees{'top_in_ref'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -97,7 +98,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 5
}
@@ -106,7 +106,8 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -132,7 +133,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 5
}
@@ -142,7 +142,8 @@ $result_trees{'top_in_ref'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -164,7 +165,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 6
}
@@ -173,7 +173,8 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -202,7 +203,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 6
}
@@ -212,7 +212,8 @@ $result_trees{'top_in_ref'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -234,7 +235,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 7
}
@@ -243,7 +243,8 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -274,7 +275,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 7
}
@@ -284,7 +284,8 @@ $result_trees{'top_in_ref'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -306,7 +307,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 8
}
@@ -315,7 +315,8 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -349,7 +350,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 8
}
@@ -359,7 +359,8 @@ $result_trees{'top_in_ref'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -381,7 +382,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 9
}
@@ -390,7 +390,8 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -427,7 +428,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 9
}
@@ -437,7 +437,8 @@ $result_trees{'top_in_ref'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -459,7 +460,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 10
}
@@ -468,7 +468,8 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -504,7 +505,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 10
}
@@ -514,7 +514,8 @@ $result_trees{'top_in_ref'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -536,7 +537,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 11
}
@@ -545,7 +545,8 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -584,7 +585,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 11
}
@@ -594,7 +594,8 @@ $result_trees{'top_in_ref'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -616,7 +617,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 12
}
@@ -625,7 +625,8 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -666,7 +667,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 12
}
@@ -676,7 +676,8 @@ $result_trees{'top_in_ref'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -698,7 +699,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 13
}
@@ -707,7 +707,8 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -751,7 +752,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 13
}
@@ -761,7 +761,8 @@ $result_trees{'top_in_ref'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -783,7 +784,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 14
}
@@ -792,7 +792,8 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -851,7 +852,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 14
}
@@ -861,7 +861,8 @@ $result_trees{'top_in_ref'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -883,7 +884,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 15
}
@@ -892,7 +892,8 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -928,7 +929,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 15
}
@@ -938,7 +938,8 @@ $result_trees{'top_in_ref'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -960,7 +961,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 16
}
@@ -969,7 +969,8 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -1008,7 +1009,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 16
}
@@ -1018,7 +1018,8 @@ $result_trees{'top_in_ref'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1040,7 +1041,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 17
}
@@ -1049,7 +1049,8 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -1103,7 +1104,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 17
}
@@ -1113,7 +1113,8 @@ $result_trees{'top_in_ref'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1135,7 +1136,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 18
}
@@ -1144,7 +1144,8 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -1183,7 +1184,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 18
}
@@ -1203,7 +1203,8 @@ $result_trees{'top_in_ref'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1225,7 +1226,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 20
}
@@ -1234,7 +1234,8 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -1273,7 +1274,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 20
}
@@ -1283,7 +1283,8 @@ $result_trees{'top_in_ref'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1305,7 +1306,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 21
}
@@ -1314,7 +1314,8 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -1356,7 +1357,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 21
}
@@ -1366,7 +1366,8 @@ $result_trees{'top_in_ref'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1388,7 +1389,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 22
}
@@ -1397,7 +1397,8 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -1442,7 +1443,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 22
}
@@ -1452,7 +1452,8 @@ $result_trees{'top_in_ref'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1474,7 +1475,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 23
}
@@ -1483,7 +1483,8 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -1531,7 +1532,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 23
}
@@ -1541,7 +1541,8 @@ $result_trees{'top_in_ref'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1563,7 +1564,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 24
}
@@ -1572,7 +1572,8 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -1622,7 +1623,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 24
}
@@ -1632,7 +1632,8 @@ $result_trees{'top_in_ref'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1654,7 +1655,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 25
}
@@ -1663,7 +1663,8 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -1713,7 +1714,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 25
}
@@ -1723,7 +1723,8 @@ $result_trees{'top_in_ref'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1745,7 +1746,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 26
}
@@ -1754,7 +1754,8 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -1807,7 +1808,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 26
}
@@ -1817,7 +1817,8 @@ $result_trees{'top_in_ref'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1839,7 +1840,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 27
}
@@ -1848,7 +1848,8 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -1903,7 +1904,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 27
}
@@ -1913,7 +1913,8 @@ $result_trees{'top_in_ref'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -1935,7 +1936,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 28
}
@@ -1944,7 +1944,8 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -2002,7 +2003,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 28
}
@@ -2012,7 +2012,8 @@ $result_trees{'top_in_ref'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -2034,7 +2035,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 29
}
@@ -2043,7 +2043,8 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -2116,7 +2117,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 29
}
@@ -2126,7 +2126,8 @@ $result_trees{'top_in_ref'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -2148,7 +2149,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 30
}
@@ -2157,7 +2157,8 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -2207,7 +2208,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 30
}
@@ -2217,7 +2217,8 @@ $result_trees{'top_in_ref'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -2239,7 +2240,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 31
}
@@ -2248,7 +2248,8 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -2301,7 +2302,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 31
}
@@ -2311,7 +2311,8 @@ $result_trees{'top_in_ref'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -2333,7 +2334,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 32
}
@@ -2342,7 +2342,8 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -2410,7 +2411,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 32
}
@@ -2420,7 +2420,8 @@ $result_trees{'top_in_ref'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -2442,7 +2443,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 33
}
@@ -2451,7 +2451,8 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'ref',
+ 'contents' => [
{
'contents' => [
{
@@ -2504,7 +2505,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'ref',
'source_info' => {
'line_nr' => 33
}
@@ -2524,7 +2524,8 @@ $result_trees{'top_in_ref'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -2546,7 +2547,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 35
}
@@ -2555,7 +2555,8 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'inforef',
+ 'contents' => [
{
'contents' => [
{
@@ -2598,7 +2599,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inforef',
'source_info' => {
'line_nr' => 35
}
@@ -2608,7 +2608,8 @@ $result_trees{'top_in_ref'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -2630,7 +2631,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 36
}
@@ -2639,7 +2639,8 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'inforef',
+ 'contents' => [
{
'contents' => [
{
@@ -2657,7 +2658,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inforef',
'source_info' => {
'line_nr' => 36
}
@@ -2667,7 +2667,8 @@ $result_trees{'top_in_ref'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -2689,7 +2690,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 37
}
@@ -2698,7 +2698,8 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'inforef',
+ 'contents' => [
{
'contents' => [
{
@@ -2729,7 +2730,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inforef',
'source_info' => {
'line_nr' => 37
}
@@ -2739,7 +2739,8 @@ $result_trees{'top_in_ref'} = {
'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -2761,7 +2762,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 38
}
@@ -2770,7 +2770,8 @@ $result_trees{'top_in_ref'} = {
'text' => ' '
},
{
- 'args' => [
+ 'cmdname' => 'inforef',
+ 'contents' => [
{
'contents' => [
{
@@ -2798,7 +2799,6 @@ $result_trees{'top_in_ref'} = {
'type' => 'brace_arg'
}
],
- 'cmdname' => 'inforef',
'source_info' => {
'line_nr' => 38
}
@@ -2827,52 +2827,52 @@ $result_trees{'top_in_ref'} = {
],
'type' => 'document_root'
};
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[30]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[30]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[34]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[34]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[42]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[42]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[46]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[46]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[54]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[54]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'args'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'args'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'args'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'args'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'args'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'args'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'args'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'args'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'args'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'args'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'args'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'args'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'args'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'args'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'args'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'args'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'args'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'args'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'args'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'args'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'args'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'args'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'args'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[6]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[10]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[14]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[30]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[34]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[42]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[46]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[54]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[54]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[6]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[10]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[14]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[14]{'contents'}[0]{'contents'}[0];
$result_texis{'top_in_ref'} = '@node Top
diff --git a/tp/t/results/converters_tests/unknown_value.pl
b/tp/t/results/converters_tests/unknown_value.pl
index 4139e57e56..b13e98c74f 100644
--- a/tp/t/results/converters_tests/unknown_value.pl
+++ b/tp/t/results/converters_tests/unknown_value.pl
@@ -10,7 +10,8 @@ $result_trees{'unknown_value'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'value',
+ 'contents' => [
{
'contents' => [
{
@@ -19,8 +20,7 @@ $result_trees{'unknown_value'} = {
],
'type' => 'brace_container'
}
- ],
- 'cmdname' => 'value'
+ ]
}
],
'type' => 'before_node_section'
diff --git
a/tp/t/results/converters_tests/various_itemize_command_as_argument.pl
b/tp/t/results/converters_tests/various_itemize_command_as_argument.pl
index d3eb48d8f7..ccc15ab534 100644
--- a/tp/t/results/converters_tests/various_itemize_command_as_argument.pl
+++ b/tp/t/results/converters_tests/various_itemize_command_as_argument.pl
@@ -637,7 +637,8 @@ $result_trees{'various_itemize_command_as_argument'} = {
'text' => 'a'
},
{
- 'args' => [
+ 'cmdname' => 'sup',
+ 'contents' => [
{
'contents' => [
{
@@ -647,7 +648,6 @@ $result_trees{'various_itemize_command_as_argument'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'sup',
'source_info' => {
'line_nr' => 31
}
diff --git
a/tp/t/results/converters_tests/various_vtable_command_as_argument.pl
b/tp/t/results/converters_tests/various_vtable_command_as_argument.pl
index c048a596ad..e9fb68b4e4 100644
--- a/tp/t/results/converters_tests/various_vtable_command_as_argument.pl
+++ b/tp/t/results/converters_tests/various_vtable_command_as_argument.pl
@@ -855,7 +855,8 @@ $result_trees{'various_vtable_command_as_argument'} = {
'text' => 'a'
},
{
- 'args' => [
+ 'cmdname' => 'sup',
+ 'contents' => [
{
'contents' => [
{
@@ -865,7 +866,6 @@ $result_trees{'various_vtable_command_as_argument'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'sup',
'source_info' => {
'line_nr' => 30
}
diff --git a/tp/t/results/coverage/accent_and_dash.pl
b/tp/t/results/coverage/accent_and_dash.pl
index dbd8a84224..315eb99a90 100644
--- a/tp/t/results/coverage/accent_and_dash.pl
+++ b/tp/t/results/coverage/accent_and_dash.pl
@@ -12,7 +12,8 @@ $result_trees{'accent_and_dash'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => '^',
+ 'contents' => [
{
'contents' => [
{
@@ -22,7 +23,6 @@ $result_trees{'accent_and_dash'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => '^',
'source_info' => {
'line_nr' => 1
}
diff --git a/tp/t/results/coverage/accent_no_closed.pl
b/tp/t/results/coverage/accent_no_closed.pl
index 8ab69db67d..37766ab31e 100644
--- a/tp/t/results/coverage/accent_no_closed.pl
+++ b/tp/t/results/coverage/accent_no_closed.pl
@@ -12,7 +12,8 @@ $result_trees{'accent_no_closed'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => '~',
+ 'contents' => [
{
'contents' => [
{
@@ -22,7 +23,6 @@ $result_trees{'accent_no_closed'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => '~',
'source_info' => {
'line_nr' => 1
}
diff --git a/tp/t/results/coverage/accent_no_closed_comment.pl
b/tp/t/results/coverage/accent_no_closed_comment.pl
index b892e68d4b..e2888caa2d 100644
--- a/tp/t/results/coverage/accent_no_closed_comment.pl
+++ b/tp/t/results/coverage/accent_no_closed_comment.pl
@@ -12,7 +12,8 @@ $result_trees{'accent_no_closed_comment'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => '~',
+ 'contents' => [
{
'contents' => [
{
@@ -32,7 +33,6 @@ $result_trees{'accent_no_closed_comment'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => '~',
'source_info' => {
'line_nr' => 1
}
diff --git a/tp/t/results/coverage/accent_no_closed_newline.pl
b/tp/t/results/coverage/accent_no_closed_newline.pl
index 9eee8fb192..c204dc032c 100644
--- a/tp/t/results/coverage/accent_no_closed_newline.pl
+++ b/tp/t/results/coverage/accent_no_closed_newline.pl
@@ -12,7 +12,8 @@ $result_trees{'accent_no_closed_newline'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => '~',
+ 'contents' => [
{
'contents' => [
{
@@ -28,7 +29,6 @@ $result_trees{'accent_no_closed_newline'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => '~',
'source_info' => {
'line_nr' => 1
}
diff --git a/tp/t/results/coverage/accent_no_closed_paragraph.pl
b/tp/t/results/coverage/accent_no_closed_paragraph.pl
index 7da734377b..f38298a69a 100644
--- a/tp/t/results/coverage/accent_no_closed_paragraph.pl
+++ b/tp/t/results/coverage/accent_no_closed_paragraph.pl
@@ -12,7 +12,8 @@ $result_trees{'accent_no_closed_paragraph'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => '~',
+ 'contents' => [
{
'contents' => [
{
@@ -28,7 +29,6 @@ $result_trees{'accent_no_closed_paragraph'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => '~',
'source_info' => {
'line_nr' => 1
}
diff --git a/tp/t/results/coverage/accents_errors.pl
b/tp/t/results/coverage/accents_errors.pl
index dabd78f7ff..67dc2dad7d 100644
--- a/tp/t/results/coverage/accents_errors.pl
+++ b/tp/t/results/coverage/accents_errors.pl
@@ -15,7 +15,8 @@ $result_trees{'accents_errors'} = {
'text' => 'accent at end of line '
},
{
- 'args' => [
+ 'cmdname' => 'ringaccent',
+ 'contents' => [
{
'contents' => [
{
@@ -25,7 +26,6 @@ $result_trees{'accents_errors'} = {
'type' => 'following_arg'
}
],
- 'cmdname' => 'ringaccent',
'info' => {
'spaces_after_cmd_before_arg' => {
'text' => '
@@ -40,7 +40,8 @@ $result_trees{'accents_errors'} = {
'text' => 'ccent at end of line and spaces '
},
{
- 'args' => [
+ 'cmdname' => 'ringaccent',
+ 'contents' => [
{
'contents' => [
{
@@ -50,7 +51,6 @@ $result_trees{'accents_errors'} = {
'type' => 'following_arg'
}
],
- 'cmdname' => 'ringaccent',
'info' => {
'spaces_after_cmd_before_arg' => {
'text' => '
@@ -97,7 +97,8 @@ $result_trees{'accents_errors'} = {
'text' => 'accent character with spaces '
},
{
- 'args' => [
+ 'cmdname' => '~',
+ 'contents' => [
{
'contents' => [
{
@@ -107,7 +108,6 @@ $result_trees{'accents_errors'} = {
'type' => 'following_arg'
}
],
- 'cmdname' => '~',
'info' => {
'spaces_after_cmd_before_arg' => {
'text' => ' '
@@ -125,7 +125,8 @@ $result_trees{'accents_errors'} = {
'text' => 'accent character at end of line '
},
{
- 'args' => [
+ 'cmdname' => '~',
+ 'contents' => [
{
'contents' => [
{
@@ -135,7 +136,6 @@ $result_trees{'accents_errors'} = {
'type' => 'following_arg'
}
],
- 'cmdname' => '~',
'info' => {
'spaces_after_cmd_before_arg' => {
'text' => '
diff --git a/tp/t/results/coverage/arg_in_brace_no_arg_command.pl
b/tp/t/results/coverage/arg_in_brace_no_arg_command.pl
index 9582da6101..87e43e7fc2 100644
--- a/tp/t/results/coverage/arg_in_brace_no_arg_command.pl
+++ b/tp/t/results/coverage/arg_in_brace_no_arg_command.pl
@@ -12,7 +12,8 @@ $result_trees{'arg_in_brace_no_arg_command'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'TeX',
+ 'contents' => [
{
'contents' => [
{
@@ -22,7 +23,6 @@ $result_trees{'arg_in_brace_no_arg_command'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'TeX',
'source_info' => {
'line_nr' => 1
}
diff --git a/tp/t/results/coverage/block_commands.pl
b/tp/t/results/coverage/block_commands.pl
index e08562dcf2..72bbbdaebc 100644
--- a/tp/t/results/coverage/block_commands.pl
+++ b/tp/t/results/coverage/block_commands.pl
@@ -200,7 +200,8 @@ $result_trees{'block_commands'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'caption',
+ 'contents' => [
{
'contents' => [
{
@@ -229,7 +230,6 @@ $result_trees{'block_commands'} = {
'type' => 'brace_command_context'
}
],
- 'cmdname' => 'caption',
'extra' => {
'float' => {}
},
diff --git a/tp/t/results/coverage/cartouche.pl
b/tp/t/results/coverage/cartouche.pl
index 98edd7a107..2278bdbf85 100644
--- a/tp/t/results/coverage/cartouche.pl
+++ b/tp/t/results/coverage/cartouche.pl
@@ -77,7 +77,8 @@ $result_trees{'cartouche'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'emph',
+ 'contents' => [
{
'contents' => [
{
@@ -87,7 +88,6 @@ $result_trees{'cartouche'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'emph',
'source_info' => {
'line_nr' => 5
}
diff --git a/tp/t/results/coverage/cartouche_title_and_content.pl
b/tp/t/results/coverage/cartouche_title_and_content.pl
index 497d042a6b..e456962101 100644
--- a/tp/t/results/coverage/cartouche_title_and_content.pl
+++ b/tp/t/results/coverage/cartouche_title_and_content.pl
@@ -17,7 +17,8 @@ $result_trees{'cartouche_title_and_content'} = {
'text' => 'Box title on '
},
{
- 'args' => [
+ 'cmdname' => 'emph',
+ 'contents' => [
{
'contents' => [
{
@@ -27,7 +28,6 @@ $result_trees{'cartouche_title_and_content'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'emph',
'source_info' => {
'line_nr' => 1
}
diff --git a/tp/t/results/coverage/center.pl b/tp/t/results/coverage/center.pl
index ab4d0c94c6..ce197a18db 100644
--- a/tp/t/results/coverage/center.pl
+++ b/tp/t/results/coverage/center.pl
@@ -22,7 +22,8 @@ $result_trees{'center'} = {
'text' => 'in center '
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -32,7 +33,6 @@ $result_trees{'center'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 2
}
diff --git a/tp/t/results/coverage/command_in_end.pl
b/tp/t/results/coverage/command_in_end.pl
index fa7b4abd79..7c86eab887 100644
--- a/tp/t/results/coverage/command_in_end.pl
+++ b/tp/t/results/coverage/command_in_end.pl
@@ -34,7 +34,8 @@ $result_trees{'command_in_end'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -44,7 +45,6 @@ $result_trees{'command_in_end'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 3
}
@@ -105,7 +105,8 @@ $result_trees{'command_in_end'} = {
'text' => 'q'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -115,7 +116,6 @@ $result_trees{'command_in_end'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 7
}
@@ -179,7 +179,8 @@ $result_trees{'command_in_end'} = {
'text' => 'qu'
},
{
- 'args' => [
+ 'cmdname' => 'code',
+ 'contents' => [
{
'contents' => [
{
@@ -189,7 +190,6 @@ $result_trees{'command_in_end'} = {
'type' => 'brace_container'
}
],
- 'cmdname' => 'code',
'source_info' => {
'line_nr' => 11
}
@@ -253,7 +253,8 @@ $result_trees{'command_in_end'} = {
'text' => 'quot'
},
{
- 'args' => [
+ 'cmdname' => 'asis',
+ 'contents' => [
{
'contents' => [
{
@@ -263,7 +264,6 @@ $result_trees{'command_in_end'} = {
'type' => 'brace_container'