From cdb8117b8f1ac752d1927b82759c5be9f0ec0ab5 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 10 Jan 2024 03:03:23 +0000 Subject: CTAN sync 202401100303 --- .../raw_block_commands_expand_tex.pl | 136 ++++++++++++--------- 1 file changed, 80 insertions(+), 56 deletions(-) (limited to 'macros/texinfo/texinfo/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl') diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl index b8b8e4d8fc..c75fb73136 100644 --- a/macros/texinfo/texinfo/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl +++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl @@ -17,9 +17,11 @@ $result_trees{'raw_block_commands_expand_tex'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -29,10 +31,7 @@ $result_trees{'raw_block_commands_expand_tex'} = { { 'contents' => [ { - 'text' => 'html ``' - }, - { - 'text' => '} + 'text' => 'html ``} ' } ], @@ -46,18 +45,24 @@ $result_trees{'raw_block_commands_expand_tex'} = { 'text' => 'html' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'html' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => '', 'line_nr' => 4, @@ -79,9 +84,11 @@ $result_trees{'raw_block_commands_expand_tex'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -91,10 +98,7 @@ $result_trees{'raw_block_commands_expand_tex'} = { { 'contents' => [ { - 'text' => 'xml ``' - }, - { - 'text' => '} + 'text' => 'xml ``} ' } ], @@ -108,18 +112,24 @@ $result_trees{'raw_block_commands_expand_tex'} = { 'text' => 'xml' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'xml' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => '', 'line_nr' => 8, @@ -141,9 +151,11 @@ $result_trees{'raw_block_commands_expand_tex'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -153,10 +165,7 @@ $result_trees{'raw_block_commands_expand_tex'} = { { 'contents' => [ { - 'text' => 'docbook ``' - }, - { - 'text' => '} + 'text' => 'docbook ``} ' } ], @@ -170,18 +179,24 @@ $result_trees{'raw_block_commands_expand_tex'} = { 'text' => 'docbook' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'docbook' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => '', 'line_nr' => 12, @@ -203,9 +218,11 @@ $result_trees{'raw_block_commands_expand_tex'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -215,10 +232,7 @@ $result_trees{'raw_block_commands_expand_tex'} = { { 'contents' => [ { - 'text' => '$\\underline' - }, - { - 'text' => '{a < b ' + 'text' => '$\\underline{a < b ' }, { 'args' => [ @@ -230,7 +244,7 @@ $result_trees{'raw_block_commands_expand_tex'} = { { 'contents' => [ { - 'text' => ' code ' + 'text' => '{ code }' } ], 'source_info' => { @@ -238,7 +252,7 @@ $result_trees{'raw_block_commands_expand_tex'} = { 'line_nr' => 15, 'macro' => '' }, - 'type' => 'bracketed' + 'type' => 'balanced_braces' } ], 'type' => 'brace_command_arg' @@ -266,18 +280,24 @@ $result_trees{'raw_block_commands_expand_tex'} = { 'text' => 'tex' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'tex' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => '', 'line_nr' => 16, @@ -299,9 +319,11 @@ $result_trees{'raw_block_commands_expand_tex'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -311,10 +333,7 @@ $result_trees{'raw_block_commands_expand_tex'} = { { 'contents' => [ { - 'text' => '$\\frac' - }, - { - 'text' => '{a < b ' + 'text' => '$\\frac{a < b ' }, { 'args' => [ @@ -326,7 +345,7 @@ $result_trees{'raw_block_commands_expand_tex'} = { { 'contents' => [ { - 'text' => ' code ' + 'text' => '{ code }' } ], 'source_info' => { @@ -334,7 +353,7 @@ $result_trees{'raw_block_commands_expand_tex'} = { 'line_nr' => 19, 'macro' => '' }, - 'type' => 'bracketed' + 'type' => 'balanced_braces' } ], 'type' => 'brace_command_arg' @@ -348,13 +367,7 @@ $result_trees{'raw_block_commands_expand_tex'} = { } }, { - 'text' => '}' - }, - { - 'text' => '{b' - }, - { - 'text' => '}$ `` + 'text' => '}{b}$ `` ' } ], @@ -368,18 +381,24 @@ $result_trees{'raw_block_commands_expand_tex'} = { 'text' => 'latex' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'latex' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => '', 'line_nr' => 20, @@ -424,10 +443,15 @@ $\\frac{a < b @code{tex \\hbox{ code }}}{b}$ `` $result_texts{'raw_block_commands_expand_tex'} = ' +html ``} +xml ``} +docbook ``} +$\\underline{a < b tex \\hbox{ code }}$ `` +$\\frac{a < b tex \\hbox{ code }}{b}$ `` '; $result_errors{'raw_block_commands_expand_tex'} = []; -- cgit v1.2.3