diff options
author | Norbert Preining <norbert@preining.info> | 2022-12-02 03:04:31 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2022-12-02 03:04:31 +0000 |
commit | 42cda2ed3fa7472e6c064fdbf998d636556343db (patch) | |
tree | 0995420f9b6b31ad8bef5b0e61f35bc7338bab42 /macros/texinfo/texinfo/tp/t | |
parent | 77362f5f4b083c21c2044b0c54d228da42804c72 (diff) |
CTAN sync 202212020304
Diffstat (limited to 'macros/texinfo/texinfo/tp/t')
16 files changed, 2739 insertions, 725 deletions
diff --git a/macros/texinfo/texinfo/tp/t/30sectioning.t b/macros/texinfo/texinfo/tp/t/30sectioning.t index 4dd30bcee7..fcf89023be 100644 --- a/macros/texinfo/texinfo/tp/t/30sectioning.t +++ b/macros/texinfo/texinfo/tp/t/30sectioning.t @@ -536,6 +536,26 @@ in node Top in chap '], +['recursive_self_section_reference', +'@node sharp +@chapter @ref{sharp} tuple +'], +['double_recursive_self_section_reference', +'@node n1 +@chapter @ref{n2} + +@node n2 +@chapter @ref{n1} +'], +['double_recursive_self_section_node_reference', +'@node Top +@top top + +@node node1 +@chapter @ref{to node1} + +@node to @ref{node1} +'], ); my $character_and_spaces_in_refs_text = '@node Top diff --git a/macros/texinfo/texinfo/tp/t/converters_tests.t b/macros/texinfo/texinfo/tp/t/converters_tests.t index d42ebde3e0..b200035b80 100644 --- a/macros/texinfo/texinfo/tp/t/converters_tests.t +++ b/macros/texinfo/texinfo/tp/t/converters_tests.t @@ -588,6 +588,7 @@ explanation @code{@@image@{f--ile,,,alt@}} @image{f--ile,,,alt} @code{@@image@{f--ile,,,,e-d-xt@}} @image{f--ile,,,,e--xt} @code{@@image@{f--ile,aze,az,alt,e--xt@}} @image{f--ile,aze,az,alt,e--xt} +@code{@@image@{f--ile,aze,az,alt,} @image{f--ile,aze,az,alt,} @code{@@image@{f-ile,aze,,a--lt@}} @image{f-ile,aze,,a--lt} @code{@@image@{@@file@{f--ile@}@@@@@@.,aze,az,alt,@@file@{file ext@} e--xt@@@}} @image{@file{f--ile}@@@.,aze,az,alt,@file{file ext} e--xt@}} @image{image} @image{image} diff --git a/macros/texinfo/texinfo/tp/t/html_tests.t b/macros/texinfo/texinfo/tp/t/html_tests.t index e7cd6666b6..b0c0863f54 100644 --- a/macros/texinfo/texinfo/tp/t/html_tests.t +++ b/macros/texinfo/texinfo/tp/t/html_tests.t @@ -552,6 +552,10 @@ In top. @uref{http://example.com/acc_@"a@ogonek{a}} '], +['empty_titlefont', +' +@titlefont{} +'], ); my $test_accents_sc_no_brace_commands_quotes = '@u{--a} diff --git a/macros/texinfo/texinfo/tp/t/info_tests.t b/macros/texinfo/texinfo/tp/t/info_tests.t index ba620ffb75..12af9cf50b 100644 --- a/macros/texinfo/texinfo/tp/t/info_tests.t +++ b/macros/texinfo/texinfo/tp/t/info_tests.t @@ -930,6 +930,33 @@ HHH @image{figure, , , ,txt} JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ @end flushright '], +['empty_arguments', +' +@strong{} +@uref{,} +@abbr{a,} +'], +['float_without_type', +' +@node Top + +@float a, +aa +@end float + +@listoffloats a +'], +['empty_caption', +' +@node Top + +@float a,b +aa +@caption{} +@end float + +@listoffloats a +'], ); my @file_tests = ( diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/image_formatting.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/image_formatting.pl index 7609334f02..be158739f7 100644 --- a/macros/texinfo/texinfo/tp/t/results/converters_tests/image_formatting.pl +++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/image_formatting.pl @@ -584,6 +584,88 @@ $result_trees{'image_formatting'} = { 'cmdname' => '{' }, { + 'text' => 'f--ile,aze,az,alt,' + } + ], + 'type' => 'brace_command_arg' + } + ], + 'cmdname' => 'code', + 'source_info' => { + 'file_name' => '', + 'line_nr' => 13, + 'macro' => '' + } + }, + { + 'text' => ' ' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'f--ile' + } + ], + 'type' => 'brace_command_arg' + }, + { + 'contents' => [ + { + 'text' => 'aze' + } + ], + 'type' => 'brace_command_arg' + }, + { + 'contents' => [ + { + 'text' => 'az' + } + ], + 'type' => 'brace_command_arg' + }, + { + 'contents' => [ + { + 'text' => 'alt' + } + ], + 'type' => 'brace_command_arg' + }, + { + 'type' => 'brace_command_arg' + } + ], + 'cmdname' => 'image', + 'extra' => { + 'input_perl_encoding' => 'utf-8' + }, + 'source_info' => { + 'file_name' => '', + 'line_nr' => 13, + 'macro' => '' + } + }, + { + 'text' => ' +' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'cmdname' => '@' + }, + { + 'text' => 'image' + }, + { + 'cmdname' => '{' + }, + { 'text' => 'f-ile,aze,,a--lt' }, { @@ -596,7 +678,7 @@ $result_trees{'image_formatting'} = { 'cmdname' => 'code', 'source_info' => { 'file_name' => '', - 'line_nr' => 13, + 'line_nr' => 14, 'macro' => '' } }, @@ -639,7 +721,7 @@ $result_trees{'image_formatting'} = { }, 'source_info' => { 'file_name' => '', - 'line_nr' => 13, + 'line_nr' => 14, 'macro' => '' } }, @@ -718,7 +800,7 @@ $result_trees{'image_formatting'} = { 'cmdname' => 'code', 'source_info' => { 'file_name' => '', - 'line_nr' => 14, + 'line_nr' => 15, 'macro' => '' } }, @@ -743,7 +825,7 @@ $result_trees{'image_formatting'} = { 'cmdname' => 'file', 'source_info' => { 'file_name' => '', - 'line_nr' => 14, + 'line_nr' => 15, 'macro' => '' } }, @@ -796,7 +878,7 @@ $result_trees{'image_formatting'} = { 'cmdname' => 'file', 'source_info' => { 'file_name' => '', - 'line_nr' => 14, + 'line_nr' => 15, 'macro' => '' } }, @@ -816,7 +898,7 @@ $result_trees{'image_formatting'} = { }, 'source_info' => { 'file_name' => '', - 'line_nr' => 14, + 'line_nr' => 15, 'macro' => '' } }, @@ -841,7 +923,7 @@ $result_trees{'image_formatting'} = { }, 'source_info' => { 'file_name' => '', - 'line_nr' => 15, + 'line_nr' => 16, 'macro' => '' } }, @@ -865,7 +947,7 @@ $result_trees{'image_formatting'} = { }, 'source_info' => { 'file_name' => '', - 'line_nr' => 15, + 'line_nr' => 16, 'macro' => '' } }, @@ -921,7 +1003,7 @@ $result_trees{'image_formatting'} = { 'cmdname' => 'code', 'source_info' => { 'file_name' => '', - 'line_nr' => 18, + 'line_nr' => 19, 'macro' => '' } }, @@ -945,7 +1027,7 @@ $result_trees{'image_formatting'} = { }, 'source_info' => { 'file_name' => '', - 'line_nr' => 18, + 'line_nr' => 19, 'macro' => '' } }, @@ -979,7 +1061,7 @@ $result_trees{'image_formatting'} = { 'cmdname' => 'code', 'source_info' => { 'file_name' => '', - 'line_nr' => 19, + 'line_nr' => 20, 'macro' => '' } }, @@ -1011,7 +1093,7 @@ $result_trees{'image_formatting'} = { }, 'source_info' => { 'file_name' => '', - 'line_nr' => 19, + 'line_nr' => 20, 'macro' => '' } }, @@ -1045,7 +1127,7 @@ $result_trees{'image_formatting'} = { 'cmdname' => 'code', 'source_info' => { 'file_name' => '', - 'line_nr' => 20, + 'line_nr' => 21, 'macro' => '' } }, @@ -1080,7 +1162,7 @@ $result_trees{'image_formatting'} = { }, 'source_info' => { 'file_name' => '', - 'line_nr' => 20, + 'line_nr' => 21, 'macro' => '' } }, @@ -1114,7 +1196,7 @@ $result_trees{'image_formatting'} = { 'cmdname' => 'code', 'source_info' => { 'file_name' => '', - 'line_nr' => 21, + 'line_nr' => 22, 'macro' => '' } }, @@ -1152,7 +1234,7 @@ $result_trees{'image_formatting'} = { }, 'source_info' => { 'file_name' => '', - 'line_nr' => 21, + 'line_nr' => 22, 'macro' => '' } }, @@ -1186,7 +1268,7 @@ $result_trees{'image_formatting'} = { 'cmdname' => 'code', 'source_info' => { 'file_name' => '', - 'line_nr' => 22, + 'line_nr' => 23, 'macro' => '' } }, @@ -1227,7 +1309,7 @@ $result_trees{'image_formatting'} = { }, 'source_info' => { 'file_name' => '', - 'line_nr' => 22, + 'line_nr' => 23, 'macro' => '' } }, @@ -1261,7 +1343,7 @@ $result_trees{'image_formatting'} = { 'cmdname' => 'code', 'source_info' => { 'file_name' => '', - 'line_nr' => 23, + 'line_nr' => 24, 'macro' => '' } }, @@ -1317,7 +1399,7 @@ $result_trees{'image_formatting'} = { }, 'source_info' => { 'file_name' => '', - 'line_nr' => 23, + 'line_nr' => 24, 'macro' => '' } }, @@ -1351,7 +1433,7 @@ $result_trees{'image_formatting'} = { 'cmdname' => 'code', 'source_info' => { 'file_name' => '', - 'line_nr' => 24, + 'line_nr' => 25, 'macro' => '' } }, @@ -1394,7 +1476,7 @@ $result_trees{'image_formatting'} = { }, 'source_info' => { 'file_name' => '', - 'line_nr' => 24, + 'line_nr' => 25, 'macro' => '' } }, @@ -1473,7 +1555,7 @@ $result_trees{'image_formatting'} = { 'cmdname' => 'code', 'source_info' => { 'file_name' => '', - 'line_nr' => 25, + 'line_nr' => 26, 'macro' => '' } }, @@ -1498,7 +1580,7 @@ $result_trees{'image_formatting'} = { 'cmdname' => 'file', 'source_info' => { 'file_name' => '', - 'line_nr' => 25, + 'line_nr' => 26, 'macro' => '' } }, @@ -1551,7 +1633,7 @@ $result_trees{'image_formatting'} = { 'cmdname' => 'file', 'source_info' => { 'file_name' => '', - 'line_nr' => 25, + 'line_nr' => 26, 'macro' => '' } }, @@ -1571,7 +1653,7 @@ $result_trees{'image_formatting'} = { }, 'source_info' => { 'file_name' => '', - 'line_nr' => 25, + 'line_nr' => 26, 'macro' => '' } }, @@ -1596,7 +1678,7 @@ $result_trees{'image_formatting'} = { }, 'source_info' => { 'file_name' => '', - 'line_nr' => 26, + 'line_nr' => 27, 'macro' => '' } }, @@ -1620,7 +1702,7 @@ $result_trees{'image_formatting'} = { }, 'source_info' => { 'file_name' => '', - 'line_nr' => 26, + 'line_nr' => 27, 'macro' => '' } }, @@ -1653,14 +1735,14 @@ $result_trees{'image_formatting'} = { }, 'source_info' => { 'file_name' => '', - 'line_nr' => 27, + 'line_nr' => 28, 'macro' => '' } } ], 'source_info' => { 'file_name' => '', - 'line_nr' => 17, + 'line_nr' => 18, 'macro' => '' } }, @@ -1700,7 +1782,7 @@ $result_trees{'image_formatting'} = { }, 'source_info' => { 'file_name' => '', - 'line_nr' => 29, + 'line_nr' => 30, 'macro' => '' } }, @@ -1750,7 +1832,7 @@ $result_trees{'image_formatting'} = { }, 'source_info' => { 'file_name' => '', - 'line_nr' => 32, + 'line_nr' => 33, 'macro' => '' } }, @@ -1791,6 +1873,7 @@ $result_texis{'image_formatting'} = '@node Top @code{@@image@{f--ile,,,alt@}} @image{f--ile,,,alt} @code{@@image@{f--ile,,,,e-d-xt@}} @image{f--ile,,,,e--xt} @code{@@image@{f--ile,aze,az,alt,e--xt@}} @image{f--ile,aze,az,alt,e--xt} +@code{@@image@{f--ile,aze,az,alt,} @image{f--ile,aze,az,alt,} @code{@@image@{f-ile,aze,,a--lt@}} @image{f-ile,aze,,a--lt} @code{@@image@{@@file@{f--ile@}@@@@@@.,aze,az,alt,@@file@{file ext@} e--xt@@@}} @image{@file{f--ile}@@@.,aze,az,alt,@file{file ext} e--xt@}} @image{image} @image{image} @@ -1826,6 +1909,7 @@ $result_texts{'image_formatting'} = 'top @image{f--ile,,,alt} f--ile @image{f--ile,,,,e-d-xt} f--ile @image{f--ile,aze,az,alt,e--xt} f--ile +@image{f--ile,aze,az,alt, f--ile @image{f-ile,aze,,a--lt} f-ile @image{@file{f--ile}@@@.,aze,az,alt,@file{file ext} e--xt@} f--ile@. image image @@ -1951,7 +2035,8 @@ $result_converted{'plaintext'}->{'image_formatting'} = 'top ‘@image{f--ile}’ Image description""\\. ‘@image{f--ile,l--i}’ Image description""\\. ‘@image{f--ile,,l--e}’ Image description""\\. ‘@image{f--ile,,,alt}’ Image description""\\. ‘@image{f--ile,,,,e-d-xt}’ Image description""\\. -‘@image{f--ile,aze,az,alt,e--xt}’ Image description""\\. ‘@image{f-ile,aze,,a--lt}’ [a-lt] +‘@image{f--ile,aze,az,alt,e--xt}’ Image description""\\. ‘@image{f--ile,aze,az,alt,’ Image description""\\. +‘@image{f-ile,aze,,a--lt}’ [a-lt] ‘@image{@file{f--ile}@@@.,aze,az,alt,@file{file ext} e--xt@}’ [alt] aaa bbb ccc aaa @@ -2002,6 +2087,7 @@ $result_converted{'html_text'}->{'image_formatting'} = '<div class="top-level-ex <code class="code">@image{f--ile,,,alt}</code> <img class="image" src="f--ile.png" alt="alt"> <code class="code">@image{f--ile,,,,e-d-xt}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,aze,az,alt,e--xt}</code> <img class="image" src="f--ile.png" alt="alt"> +<code class="code">@image{f--ile,aze,az,alt,</code> <img class="image" src="f--ile.png" alt="alt"> <code class="code">@image{f-ile,aze,,a--lt}</code> <img class="image" src="f-ile.jpg" alt="a–lt"> <code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{file ext} e--xt@}</code> <img class="image" src="f--ile%40.file%20ext%20e--xt%7d" alt="alt"> <img class="image" src="image.jpg" alt="image"> <img class="image" src="image.jpg" alt="image"> @@ -2031,7 +2117,7 @@ $result_converted_errors{'html_text'}->{'image_formatting'} = [ 'error_line' => 'warning: @image file `f-ile\' (for HTML) not found, using `f-ile.jpg\' ', 'file_name' => '', - 'line_nr' => 13, + 'line_nr' => 14, 'macro' => '', 'text' => '@image file `f-ile\' (for HTML) not found, using `f-ile.jpg\'', 'type' => 'warning' @@ -2040,7 +2126,7 @@ $result_converted_errors{'html_text'}->{'image_formatting'} = [ 'error_line' => 'warning: @image file `f--ile@.\' (for HTML) not found, using `f--ile@.file ext e--xt}\' ', 'file_name' => '', - 'line_nr' => 14, + 'line_nr' => 15, 'macro' => '', 'text' => '@image file `f--ile@.\' (for HTML) not found, using `f--ile@.file ext e--xt}\'', 'type' => 'warning' @@ -2049,7 +2135,7 @@ $result_converted_errors{'html_text'}->{'image_formatting'} = [ 'error_line' => 'warning: @image file `image\' (for HTML) not found, using `image.jpg\' ', 'file_name' => '', - 'line_nr' => 15, + 'line_nr' => 16, 'macro' => '', 'text' => '@image file `image\' (for HTML) not found, using `image.jpg\'', 'type' => 'warning' @@ -2058,7 +2144,7 @@ $result_converted_errors{'html_text'}->{'image_formatting'} = [ 'error_line' => 'warning: @image file `image\' (for HTML) not found, using `image.jpg\' ', 'file_name' => '', - 'line_nr' => 15, + 'line_nr' => 16, 'macro' => '', 'text' => '@image file `image\' (for HTML) not found, using `image.jpg\'', 'type' => 'warning' @@ -2067,7 +2153,7 @@ $result_converted_errors{'html_text'}->{'image_formatting'} = [ 'error_line' => 'warning: @image file `f-ile\' (for HTML) not found, using `f-ile.jpg\' ', 'file_name' => '', - 'line_nr' => 24, + 'line_nr' => 25, 'macro' => '', 'text' => '@image file `f-ile\' (for HTML) not found, using `f-ile.jpg\'', 'type' => 'warning' @@ -2076,7 +2162,7 @@ $result_converted_errors{'html_text'}->{'image_formatting'} = [ 'error_line' => 'warning: @image file `f--ile@.\' (for HTML) not found, using `f--ile@.file ext e--xt}\' ', 'file_name' => '', - 'line_nr' => 25, + 'line_nr' => 26, 'macro' => '', 'text' => '@image file `f--ile@.\' (for HTML) not found, using `f--ile@.file ext e--xt}\'', 'type' => 'warning' @@ -2085,7 +2171,7 @@ $result_converted_errors{'html_text'}->{'image_formatting'} = [ 'error_line' => 'warning: @image file `image\' (for HTML) not found, using `image.jpg\' ', 'file_name' => '', - 'line_nr' => 26, + 'line_nr' => 27, 'macro' => '', 'text' => '@image file `image\' (for HTML) not found, using `image.jpg\'', 'type' => 'warning' @@ -2094,7 +2180,7 @@ $result_converted_errors{'html_text'}->{'image_formatting'} = [ 'error_line' => 'warning: @image file `image\' (for HTML) not found, using `image.jpg\' ', 'file_name' => '', - 'line_nr' => 26, + 'line_nr' => 27, 'macro' => '', 'text' => '@image file `image\' (for HTML) not found, using `image.jpg\'', 'type' => 'warning' @@ -2116,6 +2202,7 @@ $result_converted{'xml'}->{'image_formatting'} = '<node name="Top" spaces=" "><n <code>&arobase;image{f--ile,,,alt}</code> <image where="inline"><imagefile>f--ile</imagefile><alttext>alt</alttext></image> <code>&arobase;image{f--ile,,,,e-d-xt}</code> <image where="inline"><imagefile>f--ile</imagefile><imageextension>e--xt</imageextension></image> <code>&arobase;image{f--ile,aze,az,alt,e--xt}</code> <image where="inline"><imagefile>f--ile</imagefile><imagewidth>aze</imagewidth><imageheight>az</imageheight><alttext>alt</alttext><imageextension>e--xt</imageextension></image> +<code>&arobase;image{f--ile,aze,az,alt,</code> <image where="inline"><imagefile>f--ile</imagefile><imagewidth>aze</imagewidth><imageheight>az</imageheight><alttext>alt</alttext><imageextension></imageextension></image> <code>&arobase;image{f-ile,aze,,a--lt}</code> <image where="inline"><imagefile>f-ile</imagefile><imagewidth>aze</imagewidth><alttext>a&textndash;lt</alttext></image> <code>&arobase;image{&arobase;file{f--ile}&arobase;&arobase;&arobase;.,aze,az,alt,&arobase;file{file ext} e--xt&arobase;}</code> <image where="inline"><imagefile><file>f--ile</file>&arobase;&eosperiod;</imagefile><imagewidth>aze</imagewidth><imageheight>az</imageheight><alttext>alt</alttext><imageextension><file>file ext</file> e--xt}</imageextension></image> <image where="inline"><imagefile>image</imagefile></image> <image where="inline"><imagefile>image</imagefile></image> @@ -2149,6 +2236,7 @@ $result_converted{'docbook'}->{'image_formatting'} = '<chapter label="1" id="cha <literal>@image{f--ile,,,alt}</literal> <inlinemediaobject><imageobject><imagedata fileref="f--ile.png" format="PNG"></imagedata></imageobject><textobject><literallayout>Image description""\\.</literallayout></textobject></inlinemediaobject> <literal>@image{f--ile,,,,e-d-xt}</literal> <inlinemediaobject><imageobject><imagedata fileref="f--ile.png" format="PNG"></imagedata></imageobject><textobject><literallayout>Image description""\\.</literallayout></textobject></inlinemediaobject> <literal>@image{f--ile,aze,az,alt,e--xt}</literal> <inlinemediaobject><imageobject><imagedata fileref="f--ile.png" format="PNG"></imagedata></imageobject><textobject><literallayout>Image description""\\.</literallayout></textobject></inlinemediaobject> +<literal>@image{f--ile,aze,az,alt,</literal> <inlinemediaobject><imageobject><imagedata fileref="f--ile.png" format="PNG"></imagedata></imageobject><textobject><literallayout>Image description""\\.</literallayout></textobject></inlinemediaobject> <literal>@image{f-ile,aze,,a--lt}</literal> <inlinemediaobject><imageobject><imagedata fileref="f-ile.jpg" format="JPG"></imagedata></imageobject></inlinemediaobject> <literal>@image{@file{f--ile}@@@.,aze,az,alt,@file{file ext} e--xt@}</literal> <inlinemediaobject><imageobject><imagedata fileref="f--ile@..jpg" format="JPG"></imagedata></imageobject></inlinemediaobject> <inlinemediaobject><imageobject><imagedata fileref="image.jpg" format="JPG"></imagedata></imageobject><textobject><literallayout>aaa @@ -2183,7 +2271,7 @@ $result_converted_errors{'docbook'}->{'image_formatting'} = [ 'error_line' => 'warning: @image file `f-ile\' not found, using `f-ile.jpg\' ', 'file_name' => '', - 'line_nr' => 13, + 'line_nr' => 14, 'macro' => '', 'text' => '@image file `f-ile\' not found, using `f-ile.jpg\'', 'type' => 'warning' @@ -2192,7 +2280,7 @@ $result_converted_errors{'docbook'}->{'image_formatting'} = [ 'error_line' => 'warning: @image file `f--ile@.\' not found, using `f--ile@..jpg\' ', 'file_name' => '', - 'line_nr' => 14, + 'line_nr' => 15, 'macro' => '', 'text' => '@image file `f--ile@.\' not found, using `f--ile@..jpg\'', 'type' => 'warning' @@ -2201,7 +2289,7 @@ $result_converted_errors{'docbook'}->{'image_formatting'} = [ 'error_line' => 'warning: @image file `f-ile\' not found, using `f-ile.jpg\' ', 'file_name' => '', - 'line_nr' => 24, + 'line_nr' => 25, 'macro' => '', 'text' => '@image file `f-ile\' not found, using `f-ile.jpg\'', 'type' => 'warning' @@ -2210,7 +2298,7 @@ $result_converted_errors{'docbook'}->{'image_formatting'} = [ 'error_line' => 'warning: @image file `f--ile@.\' not found, using `f--ile@..jpg\' ', 'file_name' => '', - 'line_nr' => 25, + 'line_nr' => 26, 'macro' => '', 'text' => '@image file `f--ile@.\' not found, using `f--ile@..jpg\'', 'type' => 'warning' @@ -2229,6 +2317,7 @@ $result_converted{'latex_text'}->{'image_formatting'} = '\\label{anchor:Top}% \\texttt{@image\\{f{-}{-}ile{,}{,},alt\\}} \\includegraphics{f--ile} \\texttt{@image\\{f{-}{-}ile{,}{,}{,}{,}e-d-xt\\}} \\includegraphics{f--ile} \\texttt{@image\\{f{-}{-}ile,aze,az,alt,e{-}{-}xt\\}} \\includegraphics[width=aze,height=az]{f--ile} +\\texttt{@image\\{f{-}{-}ile,aze,az,alt,} \\includegraphics[width=aze,height=az]{f--ile} \\texttt{@image\\{f-ile,aze{,}{,}a{-}{-}lt\\}} \\includegraphics[width=aze]{f-ile} \\texttt{@image\\{@file\\{f{-}{-}ile\\}@@@.,aze,az,alt,@file\\{file ext\\}\\ e{-}{-}xt@\\}} \\includegraphics[width=aze,height=az]{f--ile@.} \\includegraphics{image} \\includegraphics{image} @@ -2258,7 +2347,7 @@ $result_converted_errors{'latex_text'}->{'image_formatting'} = [ 'error_line' => 'warning: @image file `f-ile\' (for LaTeX) not found ', 'file_name' => '', - 'line_nr' => 13, + 'line_nr' => 14, 'macro' => '', 'text' => '@image file `f-ile\' (for LaTeX) not found', 'type' => 'warning' @@ -2267,7 +2356,7 @@ $result_converted_errors{'latex_text'}->{'image_formatting'} = [ 'error_line' => 'warning: @image file `f--ile@.\' (for LaTeX) not found ', 'file_name' => '', - 'line_nr' => 14, + 'line_nr' => 15, 'macro' => '', 'text' => '@image file `f--ile@.\' (for LaTeX) not found', 'type' => 'warning' @@ -2276,7 +2365,7 @@ $result_converted_errors{'latex_text'}->{'image_formatting'} = [ 'error_line' => 'warning: @image file `image\' (for LaTeX) not found ', 'file_name' => '', - 'line_nr' => 15, + 'line_nr' => 16, 'macro' => '', 'text' => '@image file `image\' (for LaTeX) not found', 'type' => 'warning' @@ -2285,7 +2374,7 @@ $result_converted_errors{'latex_text'}->{'image_formatting'} = [ 'error_line' => 'warning: @image file `image\' (for LaTeX) not found ', 'file_name' => '', - 'line_nr' => 15, + 'line_nr' => 16, 'macro' => '', 'text' => '@image file `image\' (for LaTeX) not found', 'type' => 'warning' @@ -2294,7 +2383,7 @@ $result_converted_errors{'latex_text'}->{'image_formatting'} = [ 'error_line' => 'warning: @image file `f-ile\' (for LaTeX) not found ', 'file_name' => '', - 'line_nr' => 24, + 'line_nr' => 25, 'macro' => '', 'text' => '@image file `f-ile\' (for LaTeX) not found', 'type' => 'warning' @@ -2303,7 +2392,7 @@ $result_converted_errors{'latex_text'}->{'image_formatting'} = [ 'error_line' => 'warning: @image file `f--ile@.\' (for LaTeX) not found ', 'file_name' => '', - 'line_nr' => 25, + 'line_nr' => 26, 'macro' => '', 'text' => '@image file `f--ile@.\' (for LaTeX) not found', 'type' => 'warning' @@ -2312,7 +2401,7 @@ $result_converted_errors{'latex_text'}->{'image_formatting'} = [ 'error_line' => 'warning: @image file `image\' (for LaTeX) not found ', 'file_name' => '', - 'line_nr' => 26, + 'line_nr' => 27, 'macro' => '', 'text' => '@image file `image\' (for LaTeX) not found', 'type' => 'warning' @@ -2321,7 +2410,7 @@ $result_converted_errors{'latex_text'}->{'image_formatting'} = [ 'error_line' => 'warning: @image file `image\' (for LaTeX) not found ', 'file_name' => '', - 'line_nr' => 26, + 'line_nr' => 27, 'macro' => '', 'text' => '@image file `image\' (for LaTeX) not found', 'type' => 'warning' @@ -2350,7 +2439,8 @@ File: , Node: chap, Prev: Top, Up: Top ‘@image{f--ile}’ ‘@image{f--ile,,,alt}’ -‘@image{f--ile,aze,az,alt,e--xt}’ +‘@image{f--ile,aze,az,alt,e--xt}’ +‘@image{f-ile,aze,,a--lt}’ [a-lt] ‘@image{@file{f--ile}@@@.,aze,az,alt,@file{file ext} e--xt@}’ [alt] aaa bbb ccc aaa diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_commands.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_commands.pl index 3c0c8568f6..a15f296366 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_commands.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_commands.pl @@ -222,7 +222,7 @@ $result_converted{'html_text'}->{'empty_commands'} = ' '; -$result_converted{'latex_text'}->{'empty_commands'} = '{\\huge \\bfseries } +$result_converted{'latex_text'}->{'empty_commands'} = ' \\texttt{}\\footnote{} \\~{} \\verb;; '; diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/direntry_dircategory_info_split.pl b/macros/texinfo/texinfo/tp/t/results/formatting/direntry_dircategory_info_split.pl index d58b36e686..cd6f968501 100644 --- a/macros/texinfo/texinfo/tp/t/results/formatting/direntry_dircategory_info_split.pl +++ b/macros/texinfo/texinfo/tp/t/results/formatting/direntry_dircategory_info_split.pl @@ -107,116 +107,151 @@ $result_trees{'direntry_dircategory_info_split'} = { 'line_nr' => 5, 'macro' => '' } - } - ], - 'type' => 'preamble_before_content' - }, - { - 'args' => [ - { - 'extra' => { - 'spaces_after_argument' => ' -' - }, - 'type' => 'block_line_arg' - } - ], - 'cmdname' => 'direntry', - 'contents' => [ + }, { 'args' => [ { - 'text' => '* ', - 'type' => 'menu_entry_leading_text' - }, - { - 'contents' => [ - { - 'text' => 'foo' - } - ], - 'type' => 'menu_entry_name' - }, - { - 'text' => ': ', - 'type' => 'menu_entry_separator' - }, + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'type' => 'block_line_arg' + } + ], + 'cmdname' => 'direntry', + 'contents' => [ { - 'contents' => [ + 'args' => [ { - 'text' => '(' + 'text' => '* ', + 'type' => 'menu_entry_leading_text' }, { - 'text' => 'foo' + 'contents' => [ + { + 'text' => 'foo' + } + ], + 'type' => 'menu_entry_name' }, { - 'text' => ')' - } - ], - 'type' => 'menu_entry_node' - }, - { - 'text' => '. ', - 'type' => 'menu_entry_separator' - }, - { - 'contents' => [ + 'text' => ': ', + 'type' => 'menu_entry_separator' + }, { 'contents' => [ { - 'text' => '``hello---' + 'text' => '(' + }, + { + 'text' => 'foo' }, { - 'args' => [ + 'text' => ')' + } + ], + 'type' => 'menu_entry_node' + }, + { + 'text' => '. ', + 'type' => 'menu_entry_separator' + }, + { + 'contents' => [ + { + 'contents' => [ + { + 'text' => '``hello---' + }, { - 'contents' => [ + 'args' => [ { - 'text' => 'there' + 'contents' => [ + { + 'text' => 'there' + } + ], + 'type' => 'brace_command_arg' } ], - 'type' => 'brace_command_arg' + 'cmdname' => 'var', + 'source_info' => { + 'file_name' => 'direntry_dircategory.texi', + 'line_nr' => 7, + 'macro' => '' + } + }, + { + 'text' => '?\'\' +' } ], - 'cmdname' => 'var', - 'source_info' => { - 'file_name' => 'direntry_dircategory.texi', - 'line_nr' => 7, - 'macro' => '' - } - }, + 'type' => 'preformatted' + } + ], + 'type' => 'menu_entry_description' + } + ], + 'extra' => { + 'menu_entry_description' => {}, + 'menu_entry_name' => {}, + 'menu_entry_node' => { + 'manual_content' => [ + {} + ] + } + }, + 'source_info' => { + 'file_name' => 'direntry_dircategory.texi', + 'line_nr' => 7, + 'macro' => '' + }, + 'type' => 'menu_entry' + }, + { + 'args' => [ + { + 'contents' => [ { - 'text' => '?\'\' -' + 'text' => 'direntry' } ], - 'type' => 'preformatted' + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'type' => 'line_arg' } ], - 'type' => 'menu_entry_description' + 'cmdname' => 'end', + 'extra' => { + 'spaces_before_argument' => ' ', + 'text_arg' => 'direntry' + }, + 'source_info' => { + 'file_name' => 'direntry_dircategory.texi', + 'line_nr' => 8, + 'macro' => '' + } } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_name' => {}, - 'menu_entry_node' => { - 'manual_content' => [ - {} - ] - } - }, 'source_info' => { 'file_name' => 'direntry_dircategory.texi', - 'line_nr' => 7, + 'line_nr' => 6, 'macro' => '' - }, - 'type' => 'menu_entry' + } + }, + { + 'text' => ' +', + 'type' => 'empty_line' }, { 'args' => [ { 'contents' => [ { - 'text' => 'direntry' + 'text' => 'cat2' } ], 'extra' => { @@ -226,185 +261,150 @@ $result_trees{'direntry_dircategory_info_split'} = { 'type' => 'line_arg' } ], - 'cmdname' => 'end', + 'cmdname' => 'dircategory', 'extra' => { - 'spaces_before_argument' => ' ', - 'text_arg' => 'direntry' + 'spaces_before_argument' => ' ' }, 'source_info' => { 'file_name' => 'direntry_dircategory.texi', - 'line_nr' => 8, + 'line_nr' => 10, 'macro' => '' } - } - ], - 'source_info' => { - 'file_name' => 'direntry_dircategory.texi', - 'line_nr' => 6, - 'macro' => '' - } - }, - { - 'text' => ' -', - 'type' => 'empty_line' - }, - { - 'args' => [ + }, { - 'contents' => [ + 'args' => [ { - 'text' => 'cat2' + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'type' => 'block_line_arg' } ], - 'extra' => { - 'spaces_after_argument' => ' -' - }, - 'type' => 'line_arg' - } - ], - 'cmdname' => 'dircategory', - 'extra' => { - 'spaces_before_argument' => ' ' - }, - 'source_info' => { - 'file_name' => 'direntry_dircategory.texi', - 'line_nr' => 10, - 'macro' => '' - } - }, - { - 'args' => [ - { - 'extra' => { - 'spaces_after_argument' => ' -' - }, - 'type' => 'block_line_arg' - } - ], - 'cmdname' => 'direntry', - 'contents' => [ - { - 'args' => [ - { - 'text' => '* ', - 'type' => 'menu_entry_leading_text' - }, + 'cmdname' => 'direntry', + 'contents' => [ { - 'contents' => [ + 'args' => [ + { + 'text' => '* ', + 'type' => 'menu_entry_leading_text' + }, + { + 'contents' => [ + { + 'text' => 'aaa' + }, + { + 'text' => ' ', + 'type' => 'space_at_end_menu_node' + } + ], + 'type' => 'menu_entry_node' + }, { - 'text' => 'aaa' + 'text' => ':: ', + 'type' => 'menu_entry_separator' }, { - 'text' => ' ', - 'type' => 'space_at_end_menu_node' + 'contents' => [ + { + 'contents' => [ + { + 'text' => 'aaaa +' + }, + { + 'text' => ' bbbbb +' + } + ], + 'type' => 'preformatted' + } + ], + 'type' => 'menu_entry_description' } ], - 'type' => 'menu_entry_node' - }, - { - 'text' => ':: ', - 'type' => 'menu_entry_separator' + 'extra' => { + 'menu_entry_description' => {}, + 'menu_entry_node' => { + 'node_content' => [ + {}, + {} + ], + 'normalized' => 'aaa' + } + }, + 'source_info' => { + 'file_name' => 'direntry_dircategory.texi', + 'line_nr' => 12, + 'macro' => '' + }, + 'type' => 'menu_entry' }, { 'contents' => [ { 'contents' => [ { - 'text' => 'aaaa -' + 'text' => ' +', + 'type' => 'after_menu_description_line' }, { - 'text' => ' bbbbb + 'text' => 'menutitle ' } ], 'type' => 'preformatted' } ], - 'type' => 'menu_entry_description' - } - ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {}, - {} - ], - 'normalized' => 'aaa' - } - }, - 'source_info' => { - 'file_name' => 'direntry_dircategory.texi', - 'line_nr' => 12, - 'macro' => '' - }, - 'type' => 'menu_entry' - }, - { - 'contents' => [ + 'type' => 'menu_comment' + }, { - 'contents' => [ + 'args' => [ { - 'text' => ' -', - 'type' => 'after_menu_description_line' - }, - { - 'text' => 'menutitle + 'contents' => [ + { + 'text' => 'direntry' + } + ], + 'extra' => { + 'spaces_after_argument' => ' ' + }, + 'type' => 'line_arg' } ], - 'type' => 'preformatted' - } - ], - 'type' => 'menu_comment' - }, - { - 'args' => [ - { - 'contents' => [ - { - 'text' => 'direntry' - } - ], + 'cmdname' => 'end', 'extra' => { - 'spaces_after_argument' => ' -' + 'spaces_before_argument' => ' ', + 'text_arg' => 'direntry' }, - 'type' => 'line_arg' + 'source_info' => { + 'file_name' => 'direntry_dircategory.texi', + 'line_nr' => 16, + 'macro' => '' + } } ], - 'cmdname' => 'end', - 'extra' => { - 'spaces_before_argument' => ' ', - 'text_arg' => 'direntry' - }, 'source_info' => { 'file_name' => 'direntry_dircategory.texi', - 'line_nr' => 16, + 'line_nr' => 11, 'macro' => '' } - } - ], - 'source_info' => { - 'file_name' => 'direntry_dircategory.texi', - 'line_nr' => 11, - 'macro' => '' - } - }, - { - 'text' => ' + }, + { + 'text' => ' ', - 'type' => 'empty_line' - }, - { - 'text' => ' + 'type' => 'empty_line' + }, + { + 'text' => ' ', - 'type' => 'empty_line' + 'type' => 'empty_line' + } + ], + 'type' => 'preamble_before_content' } ], 'type' => 'before_node_section' @@ -824,12 +824,12 @@ $result_trees{'direntry_dircategory_info_split'} = { ], 'type' => 'document_root' }; -$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[5]; -$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'menu_entry_name'} = $result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[1]; -$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'menu_entry_node'}{'manual_content'}[0] = $result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[3]{'contents'}[1]; -$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'args'}[3]; -$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[1] = $result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'args'}[1]{'contents'}[1]; +$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'args'}[5]; +$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_name'} = $result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'args'}[1]; +$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node'}{'manual_content'}[0] = $result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'args'}[3]{'contents'}[1]; +$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[3]; +$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[1]{'contents'}[0]; +$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[1] = $result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[1]{'contents'}[1]; $result_trees{'direntry_dircategory_info_split'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'direntry_dircategory_info_split'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'direntry_dircategory_info_split'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'direntry_dircategory_info_split'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'direntry_dircategory_info_split'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'direntry_dircategory_info_split'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[5]; diff --git a/macros/texinfo/texinfo/tp/t/results/html_tests/empty_titlefont.pl b/macros/texinfo/texinfo/tp/t/results/html_tests/empty_titlefont.pl new file mode 100644 index 0000000000..97765bf422 --- /dev/null +++ b/macros/texinfo/texinfo/tp/t/results/html_tests/empty_titlefont.pl @@ -0,0 +1,95 @@ +use vars qw(%result_texis %result_texts %result_trees %result_errors + %result_indices %result_sectioning %result_nodes %result_menus + %result_floats %result_converted %result_converted_errors + %result_elements %result_directions_text %result_indices_sort_strings); + +use utf8; + +$result_trees{'empty_titlefont'} = { + 'contents' => [ + { + 'contents' => [ + { + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'args' => [ + { + 'type' => 'brace_command_arg' + } + ], + 'cmdname' => 'titlefont', + 'source_info' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + } + }, + { + 'text' => ' +' + } + ], + 'type' => 'before_node_section' + } + ], + 'type' => 'document_root' +}; + +$result_texis{'empty_titlefont'} = ' +@titlefont{} +'; + + +$result_texts{'empty_titlefont'} = ' + +'; + +$result_errors{'empty_titlefont'} = []; + + +$result_floats{'empty_titlefont'} = {}; + + + +$result_converted{'html'}->{'empty_titlefont'} = '<!DOCTYPE html> +<html> +<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ --> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> +<title>Untitled Document</title> + +<meta name="description" content="Untitled Document"> +<meta name="keywords" content="Untitled Document"> +<meta name="resource-type" content="document"> +<meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + + + +</head> + +<body lang="en"> + + + + + +</body> +</html> +'; + +$result_converted_errors{'html'}->{'empty_titlefont'} = [ + { + 'error_line' => 'warning: must specify a title with a title command or @top +', + 'file_name' => 'empty_titlefont.texi', + 'text' => 'must specify a title with a title command or @top', + 'type' => 'warning' + } +]; + + +1; diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/empty_arguments.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/empty_arguments.pl new file mode 100644 index 0000000000..840791d0aa --- /dev/null +++ b/macros/texinfo/texinfo/tp/t/results/info_tests/empty_arguments.pl @@ -0,0 +1,136 @@ +use vars qw(%result_texis %result_texts %result_trees %result_errors + %result_indices %result_sectioning %result_nodes %result_menus + %result_floats %result_converted %result_converted_errors + %result_elements %result_directions_text %result_indices_sort_strings); + +use utf8; + +$result_trees{'empty_arguments'} = { + 'contents' => [ + { + 'contents' => [ + { + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'contents' => [ + { + 'args' => [ + { + 'type' => 'brace_command_arg' + } + ], + 'cmdname' => 'strong', + 'source_info' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + } + }, + { + 'text' => ' +' + }, + { + 'args' => [ + { + 'type' => 'brace_command_arg' + }, + { + 'type' => 'brace_command_arg' + } + ], + 'cmdname' => 'uref', + 'source_info' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + } + }, + { + 'text' => ' +' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'a' + } + ], + 'type' => 'brace_command_arg' + }, + { + 'type' => 'brace_command_arg' + } + ], + 'cmdname' => 'abbr', + 'source_info' => { + 'file_name' => '', + 'line_nr' => 4, + 'macro' => '' + } + }, + { + 'text' => ' +' + } + ], + 'type' => 'paragraph' + } + ], + 'type' => 'before_node_section' + } + ], + 'type' => 'document_root' +}; + +$result_texis{'empty_arguments'} = ' +@strong{} +@uref{,} +@abbr{a,} +'; + + +$result_texts{'empty_arguments'} = ' + + +a +'; + +$result_errors{'empty_arguments'} = []; + + +$result_floats{'empty_arguments'} = {}; + + + +$result_converted{'info'}->{'empty_arguments'} = 'This is , produced from . + +** a + + +Tag Table: + +End Tag Table + + +Local Variables: +coding: utf-8 +End: +'; + +$result_converted_errors{'info'}->{'empty_arguments'} = [ + { + 'error_line' => 'warning: document without nodes +', + 'text' => 'document without nodes', + 'type' => 'warning' + } +]; + + +1; diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/empty_caption.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/empty_caption.pl new file mode 100644 index 0000000000..dbc9d1809d --- /dev/null +++ b/macros/texinfo/texinfo/tp/t/results/info_tests/empty_caption.pl @@ -0,0 +1,306 @@ +use vars qw(%result_texis %result_texts %result_trees %result_errors + %result_indices %result_sectioning %result_nodes %result_menus + %result_floats %result_converted %result_converted_errors + %result_elements %result_directions_text %result_indices_sort_strings); + +use utf8; + +$result_trees{'empty_caption'} = { + 'contents' => [ + { + 'contents' => [ + { + 'text' => ' +', + 'type' => 'empty_line' + } + ], + 'type' => 'before_node_section' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'Top' + } + ], + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'node', + 'contents' => [ + { + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'a' + } + ], + 'type' => 'block_line_arg' + }, + { + 'contents' => [ + { + 'text' => 'b' + } + ], + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'type' => 'block_line_arg' + } + ], + 'cmdname' => 'float', + 'contents' => [ + { + 'contents' => [ + { + 'text' => 'aa +' + } + ], + 'type' => 'paragraph' + }, + { + 'args' => [ + { + 'type' => 'brace_command_context' + } + ], + 'cmdname' => 'caption', + 'extra' => { + 'float' => {} + }, + 'source_info' => { + 'file_name' => '', + 'line_nr' => 6, + 'macro' => '' + } + }, + { + 'text' => ' +', + 'type' => 'spaces_after_close_brace' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'float' + } + ], + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'end', + 'extra' => { + 'spaces_before_argument' => ' ', + 'text_arg' => 'float' + }, + 'source_info' => { + 'file_name' => '', + 'line_nr' => 7, + 'macro' => '' + } + } + ], + 'extra' => { + 'caption' => {}, + 'node_content' => [ + {} + ], + 'normalized' => 'b', + 'spaces_before_argument' => ' ', + 'type' => { + 'content' => [ + {} + ], + 'normalized' => 'a' + } + }, + 'source_info' => { + 'file_name' => '', + 'line_nr' => 4, + 'macro' => '' + } + }, + { + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'a' + } + ], + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'listoffloats', + 'extra' => { + 'spaces_before_argument' => ' ', + 'type' => { + 'content' => [ + {} + ], + 'normalized' => 'a' + } + }, + 'source_info' => { + 'file_name' => '', + 'line_nr' => 9, + 'macro' => '' + } + } + ], + 'extra' => { + 'node_content' => [ + {} + ], + 'nodes_manuals' => [ + { + 'node_content' => [ + {} + ], + 'normalized' => 'Top' + } + ], + 'normalized' => 'Top', + 'spaces_before_argument' => ' ' + }, + 'source_info' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + } + } + ], + 'type' => 'document_root' +}; +$result_trees{'empty_caption'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'float'} = $result_trees{'empty_caption'}{'contents'}[1]{'contents'}[1]; +$result_trees{'empty_caption'}{'contents'}[1]{'contents'}[1]{'extra'}{'caption'} = $result_trees{'empty_caption'}{'contents'}[1]{'contents'}[1]{'contents'}[1]; +$result_trees{'empty_caption'}{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'empty_caption'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]; +$result_trees{'empty_caption'}{'contents'}[1]{'contents'}[1]{'extra'}{'type'}{'content'}[0] = $result_trees{'empty_caption'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]; +$result_trees{'empty_caption'}{'contents'}[1]{'contents'}[3]{'extra'}{'type'}{'content'}[0] = $result_trees{'empty_caption'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]; +$result_trees{'empty_caption'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'empty_caption'}{'contents'}[1]{'args'}[0]{'contents'}[0]; +$result_trees{'empty_caption'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'empty_caption'}{'contents'}[1]{'args'}[0]{'contents'}[0]; + +$result_texis{'empty_caption'} = ' +@node Top + +@float a,b +aa +@caption{} +@end float + +@listoffloats a +'; + + +$result_texts{'empty_caption'} = ' + +a, b +aa + +'; + +$result_nodes{'empty_caption'} = { + 'cmdname' => 'node', + 'extra' => { + 'normalized' => 'Top' + } +}; + +$result_menus{'empty_caption'} = { + 'cmdname' => 'node', + 'extra' => { + 'normalized' => 'Top' + } +}; + +$result_errors{'empty_caption'} = []; + + +$result_floats{'empty_caption'} = { + 'a' => [ + { + 'cmdname' => 'float', + 'extra' => { + 'caption' => { + 'cmdname' => 'caption', + 'extra' => { + 'float' => {} + } + }, + 'normalized' => 'b', + 'type' => { + 'content' => [ + { + 'text' => 'a' + } + ], + 'normalized' => 'a' + } + }, + 'structure' => { + 'float_number' => 1 + } + } + ] +}; +$result_floats{'empty_caption'}{'a'}[0]{'extra'}{'caption'}{'extra'}{'float'} = $result_floats{'empty_caption'}{'a'}[0]; + + + +$result_converted{'info'}->{'empty_caption'} = 'This is , produced from . + + +File: , Node: Top, Up: (dir) + +aa + +a 1: +* Menu: + +* a 1: b. + + + +Tag Table: +Node: Top27 +Ref: b61 + +End Tag Table + + +Local Variables: +coding: utf-8 +End: +'; + +1; diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/float_without_type.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/float_without_type.pl new file mode 100644 index 0000000000..11ab617102 --- /dev/null +++ b/macros/texinfo/texinfo/tp/t/results/info_tests/float_without_type.pl @@ -0,0 +1,259 @@ +use vars qw(%result_texis %result_texts %result_trees %result_errors + %result_indices %result_sectioning %result_nodes %result_menus + %result_floats %result_converted %result_converted_errors + %result_elements %result_directions_text %result_indices_sort_strings); + +use utf8; + +$result_trees{'float_without_type'} = { + 'contents' => [ + { + 'contents' => [ + { + 'text' => ' +', + 'type' => 'empty_line' + } + ], + 'type' => 'before_node_section' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'Top' + } + ], + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'node', + 'contents' => [ + { + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'a' + } + ], + 'type' => 'block_line_arg' + }, + { + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'type' => 'block_line_arg' + } + ], + 'cmdname' => 'float', + 'contents' => [ + { + 'contents' => [ + { + 'text' => 'aa +' + } + ], + 'type' => 'paragraph' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'float' + } + ], + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'end', + 'extra' => { + 'spaces_before_argument' => ' ', + 'text_arg' => 'float' + }, + 'source_info' => { + 'file_name' => '', + 'line_nr' => 6, + 'macro' => '' + } + } + ], + 'extra' => { + 'spaces_before_argument' => ' ', + 'type' => { + 'content' => [ + {} + ], + 'normalized' => 'a' + } + }, + 'source_info' => { + 'file_name' => '', + 'line_nr' => 4, + 'macro' => '' + } + }, + { + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'a' + } + ], + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'listoffloats', + 'extra' => { + 'spaces_before_argument' => ' ', + 'type' => { + 'content' => [ + {} + ], + 'normalized' => 'a' + } + }, + 'source_info' => { + 'file_name' => '', + 'line_nr' => 8, + 'macro' => '' + } + } + ], + 'extra' => { + 'node_content' => [ + {} + ], + 'nodes_manuals' => [ + { + 'node_content' => [ + {} + ], + 'normalized' => 'Top' + } + ], + 'normalized' => 'Top', + 'spaces_before_argument' => ' ' + }, + 'source_info' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + } + } + ], + 'type' => 'document_root' +}; +$result_trees{'float_without_type'}{'contents'}[1]{'contents'}[1]{'extra'}{'type'}{'content'}[0] = $result_trees{'float_without_type'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]; +$result_trees{'float_without_type'}{'contents'}[1]{'contents'}[3]{'extra'}{'type'}{'content'}[0] = $result_trees{'float_without_type'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]; +$result_trees{'float_without_type'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'float_without_type'}{'contents'}[1]{'args'}[0]{'contents'}[0]; +$result_trees{'float_without_type'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'float_without_type'}{'contents'}[1]{'args'}[0]{'contents'}[0]; + +$result_texis{'float_without_type'} = ' +@node Top + +@float a, +aa +@end float + +@listoffloats a +'; + + +$result_texts{'float_without_type'} = ' + +a +aa + +'; + +$result_nodes{'float_without_type'} = { + 'cmdname' => 'node', + 'extra' => { + 'normalized' => 'Top' + } +}; + +$result_menus{'float_without_type'} = { + 'cmdname' => 'node', + 'extra' => { + 'normalized' => 'Top' + } +}; + +$result_errors{'float_without_type'} = []; + + +$result_floats{'float_without_type'} = { + 'a' => [ + { + 'cmdname' => 'float', + 'extra' => { + 'type' => { + 'content' => [ + { + 'text' => 'a' + } + ], + 'normalized' => 'a' + } + } + } + ] +}; + + + +$result_converted{'info'}->{'float_without_type'} = 'This is , produced from . + + +File: , Node: Top, Up: (dir) + +aa + +a + +* Menu: + + + + +Tag Table: +Node: Top27 + +End Tag Table + + +Local Variables: +coding: utf-8 +End: +'; + +1; diff --git a/macros/texinfo/texinfo/tp/t/results/morecoverage/formatting_fr.pl b/macros/texinfo/texinfo/tp/t/results/morecoverage/formatting_fr.pl index 5d3766d819..daba7317c8 100644 --- a/macros/texinfo/texinfo/tp/t/results/morecoverage/formatting_fr.pl +++ b/macros/texinfo/texinfo/tp/t/results/morecoverage/formatting_fr.pl @@ -139,122 +139,221 @@ $result_trees{'formatting_fr'} = { 'line_nr' => 4, 'macro' => '' } - } - ], - 'type' => 'preamble_before_content' - }, - { - 'args' => [ - { - 'extra' => { - 'spaces_after_argument' => ' -' - }, - 'type' => 'block_line_arg' - } - ], - 'cmdname' => 'direntry', - 'contents' => [ + }, { 'args' => [ { - 'text' => '* ', - 'type' => 'menu_entry_leading_text' - }, + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'type' => 'block_line_arg' + } + ], + 'cmdname' => 'direntry', + 'contents' => [ { - 'contents' => [ + 'args' => [ { - 'text' => 'Truc' - } - ], - 'type' => 'menu_entry_name' - }, - { - 'text' => ': ', - 'type' => 'menu_entry_separator' - }, - { - 'contents' => [ + 'text' => '* ', + 'type' => 'menu_entry_leading_text' + }, + { + 'contents' => [ + { + 'text' => 'Truc' + } + ], + 'type' => 'menu_entry_name' + }, { - 'text' => '(' + 'text' => ': ', + 'type' => 'menu_entry_separator' }, { - 'text' => 'formatting' + 'contents' => [ + { + 'text' => '(' + }, + { + 'text' => 'formatting' + }, + { + 'text' => ')' + } + ], + 'type' => 'menu_entry_node' }, { - 'text' => ')' - } - ], - 'type' => 'menu_entry_node' - }, - { - 'text' => '. ', - 'type' => 'menu_entry_separator' - }, - { - 'contents' => [ + 'text' => '. ', + 'type' => 'menu_entry_separator' + }, { 'contents' => [ { - 'text' => 'The GNU documentation truc. + 'contents' => [ + { + 'text' => 'The GNU documentation truc. ' + } + ], + 'type' => 'preformatted' } ], - 'type' => 'preformatted' + 'type' => 'menu_entry_description' } ], - 'type' => 'menu_entry_description' - } - ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_name' => {}, - 'menu_entry_node' => { - 'manual_content' => [ - {} - ] - } - }, - 'source_info' => { - 'file_name' => 'formatting.texi', - 'line_nr' => 6, - 'macro' => '' - }, - 'type' => 'menu_entry' - }, - { - 'args' => [ - { - 'text' => '* ', - 'type' => 'menu_entry_leading_text' + 'extra' => { + 'menu_entry_description' => {}, + 'menu_entry_name' => {}, + 'menu_entry_node' => { + 'manual_content' => [ + {} + ] + } + }, + 'source_info' => { + 'file_name' => 'formatting.texi', + 'line_nr' => 6, + 'macro' => '' + }, + 'type' => 'menu_entry' }, { - 'contents' => [ + 'args' => [ { - 'args' => [ + 'text' => '* ', + 'type' => 'menu_entry_leading_text' + }, + { + 'contents' => [ + { + 'args' => [ + { + 'contents' => [ + { + 'cmdname' => '@' + }, + { + 'text' => ' ' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'e' + } + ], + 'type' => 'following_arg' + } + ], + 'cmdname' => '\'', + 'source_info' => { + 'file_name' => 'formatting.texi', + 'line_nr' => 7, + 'macro' => '' + } + }, + { + 'text' => ' ' + }, + { + 'args' => [ + { + 'type' => 'brace_command_arg' + } + ], + 'cmdname' => 'equiv', + 'source_info' => { + 'file_name' => 'formatting.texi', + 'line_nr' => 7, + 'macro' => '' + } + } + ], + 'type' => 'brace_command_arg' + } + ], + 'cmdname' => 'code', + 'source_info' => { + 'file_name' => 'formatting.texi', + 'line_nr' => 7, + 'macro' => '' + } + } + ], + 'type' => 'menu_entry_name' + }, + { + 'text' => ': ', + 'type' => 'menu_entry_separator' + }, + { + 'contents' => [ + { + 'text' => '(' + }, + { + 'text' => 'formatting' + }, + { + 'text' => ')' + } + ], + 'type' => 'menu_entry_node' + }, + { + 'text' => '. ', + 'type' => 'menu_entry_separator' + }, + { + 'contents' => [ { 'contents' => [ { - 'cmdname' => '@' + 'text' => '``' }, { - 'text' => ' ' + 'args' => [ + { + 'contents' => [ + { + 'text' => '--- something' + } + ], + 'type' => 'brace_command_arg' + } + ], + 'cmdname' => 'asis', + 'source_info' => { + 'file_name' => 'formatting.texi', + 'line_nr' => 7, + 'macro' => '' + } + }, + { + 'text' => '\'\' +' + }, + { + 'text' => ' ' }, { 'args' => [ { 'contents' => [ { - 'text' => 'e' + 'text' => 'cmd' } ], - 'type' => 'following_arg' + 'type' => 'brace_command_arg' } ], - 'cmdname' => '\'', + 'cmdname' => 'command', 'source_info' => { 'file_name' => 'formatting.texi', - 'line_nr' => 7, + 'line_nr' => 8, 'macro' => '' } }, @@ -264,182 +363,83 @@ $result_trees{'formatting_fr'} = { { 'args' => [ { - 'type' => 'brace_command_arg' + 'contents' => [ + { + 'text' => 'a' + } + ], + 'type' => 'following_arg' } ], - 'cmdname' => 'equiv', + 'cmdname' => '`', 'source_info' => { 'file_name' => 'formatting.texi', - 'line_nr' => 7, + 'line_nr' => 8, 'macro' => '' } + }, + { + 'text' => ' +' } ], - 'type' => 'brace_command_arg' + 'type' => 'preformatted' } ], - 'cmdname' => 'code', - 'source_info' => { - 'file_name' => 'formatting.texi', - 'line_nr' => 7, - 'macro' => '' - } + 'type' => 'menu_entry_description' } ], - 'type' => 'menu_entry_name' - }, - { - 'text' => ': ', - 'type' => 'menu_entry_separator' - }, - { - 'contents' => [ - { - 'text' => '(' - }, - { - 'text' => 'formatting' - }, - { - 'text' => ')' + 'extra' => { + 'menu_entry_description' => {}, + 'menu_entry_name' => {}, + 'menu_entry_node' => { + 'manual_content' => [ + {} + ] } - ], - 'type' => 'menu_entry_node' - }, - { - 'text' => '. ', - 'type' => 'menu_entry_separator' + }, + 'source_info' => { + 'file_name' => 'formatting.texi', + 'line_nr' => 7, + 'macro' => '' + }, + 'type' => 'menu_entry' }, { - 'contents' => [ + 'args' => [ { 'contents' => [ { - 'text' => '``' - }, - { - 'args' => [ - { - 'contents' => [ - { - 'text' => '--- something' - } - ], - 'type' => 'brace_command_arg' - } - ], - 'cmdname' => 'asis', - 'source_info' => { - 'file_name' => 'formatting.texi', - 'line_nr' => 7, - 'macro' => '' - } - }, - { - 'text' => '\'\' -' - }, - { - 'text' => ' ' - }, - { - 'args' => [ - { - 'contents' => [ - { - 'text' => 'cmd' - } - ], - 'type' => 'brace_command_arg' - } - ], - 'cmdname' => 'command', - 'source_info' => { - 'file_name' => 'formatting.texi', - 'line_nr' => 8, - 'macro' => '' - } - }, - { - 'text' => ' ' - }, - { - 'args' => [ - { - 'contents' => [ - { - 'text' => 'a' - } - ], - 'type' => 'following_arg' - } - ], - 'cmdname' => '`', - 'source_info' => { - 'file_name' => 'formatting.texi', - 'line_nr' => 8, - 'macro' => '' - } - }, - { - 'text' => ' -' + 'text' => 'direntry' } ], - 'type' => 'preformatted' - } - ], - 'type' => 'menu_entry_description' - } - ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_name' => {}, - 'menu_entry_node' => { - 'manual_content' => [ - {} - ] - } - }, - 'source_info' => { - 'file_name' => 'formatting.texi', - 'line_nr' => 7, - 'macro' => '' - }, - 'type' => 'menu_entry' - }, - { - 'args' => [ - { - 'contents' => [ - { - 'text' => 'direntry' + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'type' => 'line_arg' } ], + 'cmdname' => 'end', 'extra' => { - 'spaces_after_argument' => ' -' + 'spaces_before_argument' => ' ', + 'text_arg' => 'direntry' }, - 'type' => 'line_arg' + 'source_info' => { + 'file_name' => 'formatting.texi', + 'line_nr' => 9, + 'macro' => '' + } } ], - 'cmdname' => 'end', - 'extra' => { - 'spaces_before_argument' => ' ', - 'text_arg' => 'direntry' - }, 'source_info' => { 'file_name' => 'formatting.texi', - 'line_nr' => 9, + 'line_nr' => 5, 'macro' => '' } } ], - 'source_info' => { - 'file_name' => 'formatting.texi', - 'line_nr' => 5, - 'macro' => '' - } + 'type' => 'preamble_before_content' } ], 'type' => 'before_node_section' @@ -3064,12 +3064,12 @@ $result_trees{'formatting_fr'} = { ], 'type' => 'document_root' }; -$result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[5]; -$result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'menu_entry_name'} = $result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[1]; -$result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'menu_entry_node'}{'manual_content'}[0] = $result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[3]{'contents'}[1]; -$result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'menu_entry_description'} = $result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[5]; -$result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'menu_entry_name'} = $result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[1]; -$result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'menu_entry_node'}{'manual_content'}[0] = $result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[3]{'contents'}[1]; +$result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'args'}[5]; +$result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_name'} = $result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'args'}[1]; +$result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node'}{'manual_content'}[0] = $result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'args'}[3]{'contents'}[1]; +$result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_description'} = $result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[5]; +$result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_name'} = $result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[1]; +$result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_node'}{'manual_content'}[0] = $result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]; $result_trees{'formatting_fr'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'formatting_fr'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'formatting_fr'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'formatting_fr'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]; diff --git a/macros/texinfo/texinfo/tp/t/results/morecoverage/texi_formatting.pl b/macros/texinfo/texinfo/tp/t/results/morecoverage/texi_formatting.pl index 9515c7ca0b..7a7d4bb5ea 100644 --- a/macros/texinfo/texinfo/tp/t/results/morecoverage/texi_formatting.pl +++ b/macros/texinfo/texinfo/tp/t/results/morecoverage/texi_formatting.pl @@ -139,122 +139,221 @@ $result_trees{'texi_formatting'} = { 'line_nr' => 4, 'macro' => '' } - } - ], - 'type' => 'preamble_before_content' - }, - { - 'args' => [ - { - 'extra' => { - 'spaces_after_argument' => ' -' - }, - 'type' => 'block_line_arg' - } - ], - 'cmdname' => 'direntry', - 'contents' => [ + }, { 'args' => [ { - 'text' => '* ', - 'type' => 'menu_entry_leading_text' - }, + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'type' => 'block_line_arg' + } + ], + 'cmdname' => 'direntry', + 'contents' => [ { - 'contents' => [ + 'args' => [ { - 'text' => 'Truc' - } - ], - 'type' => 'menu_entry_name' - }, - { - 'text' => ': ', - 'type' => 'menu_entry_separator' - }, - { - 'contents' => [ + 'text' => '* ', + 'type' => 'menu_entry_leading_text' + }, + { + 'contents' => [ + { + 'text' => 'Truc' + } + ], + 'type' => 'menu_entry_name' + }, { - 'text' => '(' + 'text' => ': ', + 'type' => 'menu_entry_separator' }, { - 'text' => 'formatting' + 'contents' => [ + { + 'text' => '(' + }, + { + 'text' => 'formatting' + }, + { + 'text' => ')' + } + ], + 'type' => 'menu_entry_node' }, { - 'text' => ')' - } - ], - 'type' => 'menu_entry_node' - }, - { - 'text' => '. ', - 'type' => 'menu_entry_separator' - }, - { - 'contents' => [ + 'text' => '. ', + 'type' => 'menu_entry_separator' + }, { 'contents' => [ { - 'text' => 'The GNU documentation truc. + 'contents' => [ + { + 'text' => 'The GNU documentation truc. ' + } + ], + 'type' => 'preformatted' } ], - 'type' => 'preformatted' + 'type' => 'menu_entry_description' } ], - 'type' => 'menu_entry_description' - } - ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_name' => {}, - 'menu_entry_node' => { - 'manual_content' => [ - {} - ] - } - }, - 'source_info' => { - 'file_name' => 'formatting.texi', - 'line_nr' => 6, - 'macro' => '' - }, - 'type' => 'menu_entry' - }, - { - 'args' => [ - { - 'text' => '* ', - 'type' => 'menu_entry_leading_text' + 'extra' => { + 'menu_entry_description' => {}, + 'menu_entry_name' => {}, + 'menu_entry_node' => { + 'manual_content' => [ + {} + ] + } + }, + 'source_info' => { + 'file_name' => 'formatting.texi', + 'line_nr' => 6, + 'macro' => '' + }, + 'type' => 'menu_entry' }, { - 'contents' => [ + 'args' => [ { - 'args' => [ + 'text' => '* ', + 'type' => 'menu_entry_leading_text' + }, + { + 'contents' => [ + { + 'args' => [ + { + 'contents' => [ + { + 'cmdname' => '@' + }, + { + 'text' => ' ' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'e' + } + ], + 'type' => 'following_arg' + } + ], + 'cmdname' => '\'', + 'source_info' => { + 'file_name' => 'formatting.texi', + 'line_nr' => 7, + 'macro' => '' + } + }, + { + 'text' => ' ' + }, + { + 'args' => [ + { + 'type' => 'brace_command_arg' + } + ], + 'cmdname' => 'equiv', + 'source_info' => { + 'file_name' => 'formatting.texi', + 'line_nr' => 7, + 'macro' => '' + } + } + ], + 'type' => 'brace_command_arg' + } + ], + 'cmdname' => 'code', + 'source_info' => { + 'file_name' => 'formatting.texi', + 'line_nr' => 7, + 'macro' => '' + } + } + ], + 'type' => 'menu_entry_name' + }, + { + 'text' => ': ', + 'type' => 'menu_entry_separator' + }, + { + 'contents' => [ + { + 'text' => '(' + }, + { + 'text' => 'formatting' + }, + { + 'text' => ')' + } + ], + 'type' => 'menu_entry_node' + }, + { + 'text' => '. ', + 'type' => 'menu_entry_separator' + }, + { + 'contents' => [ { 'contents' => [ { - 'cmdname' => '@' + 'text' => '``' }, { - 'text' => ' ' + 'args' => [ + { + 'contents' => [ + { + 'text' => '--- something' + } + ], + 'type' => 'brace_command_arg' + } + ], + 'cmdname' => 'asis', + 'source_info' => { + 'file_name' => 'formatting.texi', + 'line_nr' => 7, + 'macro' => '' + } + }, + { + 'text' => '\'\' +' + }, + { + 'text' => ' ' }, { 'args' => [ { 'contents' => [ { - 'text' => 'e' + 'text' => 'cmd' } ], - 'type' => 'following_arg' + 'type' => 'brace_command_arg' } ], - 'cmdname' => '\'', + 'cmdname' => 'command', 'source_info' => { 'file_name' => 'formatting.texi', - 'line_nr' => 7, + 'line_nr' => 8, 'macro' => '' } }, @@ -264,182 +363,83 @@ $result_trees{'texi_formatting'} = { { 'args' => [ { - 'type' => 'brace_command_arg' + 'contents' => [ + { + 'text' => 'a' + } + ], + 'type' => 'following_arg' } ], - 'cmdname' => 'equiv', + 'cmdname' => '`', 'source_info' => { 'file_name' => 'formatting.texi', - 'line_nr' => 7, + 'line_nr' => 8, 'macro' => '' } + }, + { + 'text' => ' +' } ], - 'type' => 'brace_command_arg' + 'type' => 'preformatted' } ], - 'cmdname' => 'code', - 'source_info' => { - 'file_name' => 'formatting.texi', - 'line_nr' => 7, - 'macro' => '' - } + 'type' => 'menu_entry_description' } ], - 'type' => 'menu_entry_name' - }, - { - 'text' => ': ', - 'type' => 'menu_entry_separator' - }, - { - 'contents' => [ - { - 'text' => '(' - }, - { - 'text' => 'formatting' - }, - { - 'text' => ')' + 'extra' => { + 'menu_entry_description' => {}, + 'menu_entry_name' => {}, + 'menu_entry_node' => { + 'manual_content' => [ + {} + ] } - ], - 'type' => 'menu_entry_node' - }, - { - 'text' => '. ', - 'type' => 'menu_entry_separator' + }, + 'source_info' => { + 'file_name' => 'formatting.texi', + 'line_nr' => 7, + 'macro' => '' + }, + 'type' => 'menu_entry' }, { - 'contents' => [ + 'args' => [ { 'contents' => [ { - 'text' => '``' - }, - { - 'args' => [ - { - 'contents' => [ - { - 'text' => '--- something' - } - ], - 'type' => 'brace_command_arg' - } - ], - 'cmdname' => 'asis', - 'source_info' => { - 'file_name' => 'formatting.texi', - 'line_nr' => 7, - 'macro' => '' - } - }, - { - 'text' => '\'\' -' - }, - { - 'text' => ' ' - }, - { - 'args' => [ - { - 'contents' => [ - { - 'text' => 'cmd' - } - ], - 'type' => 'brace_command_arg' - } - ], - 'cmdname' => 'command', - 'source_info' => { - 'file_name' => 'formatting.texi', - 'line_nr' => 8, - 'macro' => '' - } - }, - { - 'text' => ' ' - }, - { - 'args' => [ - { - 'contents' => [ - { - 'text' => 'a' - } - ], - 'type' => 'following_arg' - } - ], - 'cmdname' => '`', - 'source_info' => { - 'file_name' => 'formatting.texi', - 'line_nr' => 8, - 'macro' => '' - } - }, - { - 'text' => ' -' + 'text' => 'direntry' } ], - 'type' => 'preformatted' - } - ], - 'type' => 'menu_entry_description' - } - ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_name' => {}, - 'menu_entry_node' => { - 'manual_content' => [ - {} - ] - } - }, - 'source_info' => { - 'file_name' => 'formatting.texi', - 'line_nr' => 7, - 'macro' => '' - }, - 'type' => 'menu_entry' - }, - { - 'args' => [ - { - 'contents' => [ - { - 'text' => 'direntry' + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'type' => 'line_arg' } ], + 'cmdname' => 'end', 'extra' => { - 'spaces_after_argument' => ' -' + 'spaces_before_argument' => ' ', + 'text_arg' => 'direntry' }, - 'type' => 'line_arg' + 'source_info' => { + 'file_name' => 'formatting.texi', + 'line_nr' => 9, + 'macro' => '' + } } ], - 'cmdname' => 'end', - 'extra' => { - 'spaces_before_argument' => ' ', - 'text_arg' => 'direntry' - }, 'source_info' => { 'file_name' => 'formatting.texi', - 'line_nr' => 9, + 'line_nr' => 5, 'macro' => '' } } ], - 'source_info' => { - 'file_name' => 'formatting.texi', - 'line_nr' => 5, - 'macro' => '' - } + 'type' => 'preamble_before_content' } ], 'type' => 'before_node_section' @@ -3064,12 +3064,12 @@ $result_trees{'texi_formatting'} = { ], 'type' => 'document_root' }; -$result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[5]; -$result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'menu_entry_name'} = $result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[1]; -$result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'menu_entry_node'}{'manual_content'}[0] = $result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[3]{'contents'}[1]; -$result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'menu_entry_description'} = $result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[5]; -$result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'menu_entry_name'} = $result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[1]; -$result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'menu_entry_node'}{'manual_content'}[0] = $result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[3]{'contents'}[1]; +$result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'args'}[5]; +$result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_name'} = $result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'args'}[1]; +$result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node'}{'manual_content'}[0] = $result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'args'}[3]{'contents'}[1]; +$result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_description'} = $result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[5]; +$result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_name'} = $result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[1]; +$result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_node'}{'manual_content'}[0] = $result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]; $result_trees{'texi_formatting'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'texi_formatting'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'texi_formatting'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'texi_formatting'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]; diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/double_recursive_self_section_node_reference.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/double_recursive_self_section_node_reference.pl new file mode 100644 index 0000000000..6caac8b471 --- /dev/null +++ b/macros/texinfo/texinfo/tp/t/results/sectioning/double_recursive_self_section_node_reference.pl @@ -0,0 +1,471 @@ +use vars qw(%result_texis %result_texts %result_trees %result_errors + %result_indices %result_sectioning %result_nodes %result_menus + %result_floats %result_converted %result_converted_errors + %result_elements %result_directions_text %result_indices_sort_strings); + +use utf8; + +$result_trees{'double_recursive_self_section_node_reference'} = { + 'contents' => [ + { + 'contents' => [ + { + 'contents' => [], + 'type' => 'preamble_before_content' + } + ], + 'type' => 'before_node_section' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'Top' + } + ], + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'node', + 'extra' => { + 'node_content' => [ + {} + ], + 'nodes_manuals' => [ + { + 'node_content' => [ + {} + ], + 'normalized' => 'Top' + } + ], + 'normalized' => 'Top', + 'spaces_before_argument' => ' ' + }, + 'source_info' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + } + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'top' + } + ], + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'top', + 'contents' => [ + { + 'text' => ' +', + 'type' => 'empty_line' + } + ], + 'extra' => { + 'spaces_before_argument' => ' ' + }, + 'source_info' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + } + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'node1' + } + ], + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'node', + 'extra' => { + 'node_content' => [ + {} + ], + 'nodes_manuals' => [ + { + 'node_content' => [ + {} + ], + 'normalized' => 'node1' + } + ], + 'normalized' => 'node1', + 'spaces_before_argument' => ' ' + }, + 'source_info' => { + 'file_name' => '', + 'line_nr' => 4, + 'macro' => '' + } + }, + { + 'args' => [ + { + 'contents' => [ + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'to node1' + } + ], + 'type' => 'brace_command_arg' + } + ], + 'cmdname' => 'ref', + 'extra' => { + 'label' => { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'to ' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'node1' + } + ], + 'type' => 'brace_command_arg' + } + ], + 'cmdname' => 'ref', + 'extra' => { + 'label' => {}, + 'node_argument' => { + 'node_content' => [ + {} + ], + 'normalized' => 'node1' + } + }, + 'source_info' => { + 'file_name' => '', + 'line_nr' => 7, + 'macro' => '' + } + } + ], + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'node', + 'extra' => { + 'node_content' => [ + {}, + {} + ], + 'nodes_manuals' => [ + { + 'node_content' => [ + {}, + {} + ], + 'normalized' => 'to-node1' + } + ], + 'normalized' => 'to-node1', + 'spaces_before_argument' => ' ' + }, + 'source_info' => { + 'file_name' => '', + 'line_nr' => 7, + 'macro' => '' + } + }, + 'node_argument' => { + 'node_content' => [ + {} + ], + 'normalized' => 'to-node1' + } + }, + 'source_info' => { + 'file_name' => '', + 'line_nr' => 5, + 'macro' => '' + } + } + ], + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'chapter', + 'contents' => [ + { + 'text' => ' +', + 'type' => 'empty_line' + } + ], + 'extra' => { + 'spaces_before_argument' => ' ' + }, + 'source_info' => { + 'file_name' => '', + 'line_nr' => 5, + 'macro' => '' + } + }, + {} + ], + 'type' => 'document_root' +}; +$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'double_recursive_self_section_node_reference'}{'contents'}[1]{'args'}[0]{'contents'}[0]; +$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'double_recursive_self_section_node_reference'}{'contents'}[1]{'args'}[0]{'contents'}[0]; +$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'double_recursive_self_section_node_reference'}{'contents'}[3]{'args'}[0]{'contents'}[0]; +$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'double_recursive_self_section_node_reference'}{'contents'}[3]{'args'}[0]{'contents'}[0]; +$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[1]{'extra'}{'label'} = $result_trees{'double_recursive_self_section_node_reference'}{'contents'}[3]; +$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'double_recursive_self_section_node_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]; +$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'label'}{'extra'}{'node_content'}[0] = $result_trees{'double_recursive_self_section_node_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0]; +$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'label'}{'extra'}{'node_content'}[1] = $result_trees{'double_recursive_self_section_node_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[1]; +$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'double_recursive_self_section_node_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0]; +$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[1] = $result_trees{'double_recursive_self_section_node_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[1]; +$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'double_recursive_self_section_node_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]; +$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[5] = $result_trees{'double_recursive_self_section_node_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'label'}; + +$result_texis{'double_recursive_self_section_node_reference'} = '@node Top +@top top + +@node node1 +@chapter @ref{to node1} + +@node to @ref{node1} +'; + + +$result_texts{'double_recursive_self_section_node_reference'} = 'top +*** + +1 to node1 +********** + +'; + +$result_sectioning{'double_recursive_self_section_node_reference'} = { + 'structure' => { + 'section_childs' => [ + { + 'cmdname' => 'top', + 'extra' => { + 'associated_node' => { + 'cmdname' => 'node', + 'extra' => { + 'normalized' => 'Top' + }, + 'structure' => {} + } + }, + 'structure' => { + 'section_childs' => [ + { + 'cmdname' => 'chapter', + 'extra' => { + 'associated_node' => { + 'cmdname' => 'node', + 'extra' => { + 'normalized' => 'node1' + }, + 'structure' => {} + } + }, + 'structure' => { + 'section_level' => 1, + 'section_number' => 1, + 'section_up' => {}, + 'toplevel_prev' => {}, + 'toplevel_up' => {} + } + } + ], + 'section_level' => 0, + 'section_up' => {} + } + } + ], + 'section_level' => -1 + } +}; +$result_sectioning{'double_recursive_self_section_node_reference'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'} = $result_sectioning{'double_recursive_self_section_node_reference'}{'structure'}{'section_childs'}[0]; +$result_sectioning{'double_recursive_self_section_node_reference'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_prev'} = $result_sectioning{'double_recursive_self_section_node_reference'}{'structure'}{'section_childs'}[0]; +$result_sectioning{'double_recursive_self_section_node_reference'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_up'} = $result_sectioning{'double_recursive_self_section_node_reference'}{'structure'}{'section_childs'}[0]; +$result_sectioning{'double_recursive_self_section_node_reference'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'} = $result_sectioning{'double_recursive_self_section_node_reference'}; + +$result_nodes{'double_recursive_self_section_node_reference'} = { + 'cmdname' => 'node', + 'extra' => { + 'associated_section' => { + 'cmdname' => 'top', + 'extra' => {}, + 'structure' => {} + }, + 'normalized' => 'Top' + }, + 'structure' => { + 'node_next' => { + 'cmdname' => 'node', + 'extra' => { + 'associated_section' => { + 'cmdname' => 'chapter', + 'extra' => {}, + 'structure' => { + 'section_number' => 1 + } + }, + 'normalized' => 'node1' + }, + 'structure' => { + 'node_prev' => {}, + 'node_up' => {} + } + } + } +}; +$result_nodes{'double_recursive_self_section_node_reference'}{'structure'}{'node_next'}{'structure'}{'node_prev'} = $result_nodes{'double_recursive_self_section_node_reference'}; +$result_nodes{'double_recursive_self_section_node_reference'}{'structure'}{'node_next'}{'structure'}{'node_up'} = $result_nodes{'double_recursive_self_section_node_reference'}; + +$result_menus{'double_recursive_self_section_node_reference'} = { + 'cmdname' => 'node', + 'extra' => { + 'normalized' => 'Top' + }, + 'structure' => {} +}; + +$result_errors{'double_recursive_self_section_node_reference'} = [ + { + 'error_line' => 'warning: @ref should not appear in @node +', + 'file_name' => '', + 'line_nr' => 7, + 'macro' => '', + 'text' => '@ref should not appear in @node', + 'type' => 'warning' + }, + { + 'error_line' => 'warning: @ref to `to node1\', different from node name `to @ref{node1}\' +', + 'file_name' => '', + 'line_nr' => 5, + 'macro' => '', + 'text' => '@ref to `to node1\', different from node name `to @ref{node1}\'', + 'type' => 'warning' + } +]; + + +$result_floats{'double_recursive_self_section_node_reference'} = {}; + + + +$result_converted{'plaintext'}->{'double_recursive_self_section_node_reference'} = 'top +*** + +1 *note to *note node1:::: +************************** + +'; + +$result_converted_errors{'plaintext'}->{'double_recursive_self_section_node_reference'} = [ + { + 'error_line' => 'warning: @ref node name should not contain `:\' +', + 'file_name' => '', + 'line_nr' => 5, + 'macro' => '', + 'text' => '@ref node name should not contain `:\'', + 'type' => 'warning' + } +]; + + + +$result_converted{'html'}->{'double_recursive_self_section_node_reference'} = '<!DOCTYPE html> +<html> +<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ --> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> +<title>top</title> + +<meta name="description" content="top"> +<meta name="keywords" content="top"> +<meta name="resource-type" content="document"> +<meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + +<link href="#Top" rel="start" title="Top"> + + +</head> + +<body lang="en"> +<div class="top-level-extent" id="Top"> +<div class="nav-panel"> +<p> +Next: <a href="#node1" accesskey="n" rel="next"><a class="ref" href="#to-node1">to <a class="ref" href="#node1">node1</a></a></a> </p> +</div> +<h1 class="top" id="top">top</h1> + +<ul class="mini-toc"> +<li><a href="#node1" accesskey="1"><a class="ref" href="#to-node1">to <a class="ref" href="#node1">node1</a></a></a></li> +</ul> +<hr> +<div class="chapter-level-extent" id="node1"> +<div class="nav-panel"> +<p> +Previous: <a href="#Top" accesskey="p" rel="prev">top</a>, Up: <a href="#Top" accesskey="u" rel="up">top</a> </p> +</div> +<h2 class="chapter" id="to-node1-1">1 <a class="ref" href="#to-node1">to <a class="ref" href="#node1">node1</a></a></h2> + +<hr> +<a class="node-id" id="to-node1"></a><div class="nav-panel"> +<p> + </p> +</div> +<h4 class="node">to <a class="ref" href="#node1"><a class="ref" href="#to-node1">to <a class="ref" href="#node1">node1</a></a></a></h4> +</div> +</div> + + + +</body> +</html> +'; + +1; diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/double_recursive_self_section_reference.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/double_recursive_self_section_reference.pl new file mode 100644 index 0000000000..c37bdb3dcd --- /dev/null +++ b/macros/texinfo/texinfo/tp/t/results/sectioning/double_recursive_self_section_reference.pl @@ -0,0 +1,382 @@ +use vars qw(%result_texis %result_texts %result_trees %result_errors + %result_indices %result_sectioning %result_nodes %result_menus + %result_floats %result_converted %result_converted_errors + %result_elements %result_directions_text %result_indices_sort_strings); + +use utf8; + +$result_trees{'double_recursive_self_section_reference'} = { + 'contents' => [ + { + 'contents' => [ + { + 'contents' => [], + 'type' => 'preamble_before_content' + } + ], + 'type' => 'before_node_section' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'n1' + } + ], + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'node', + 'extra' => { + 'node_content' => [ + {} + ], + 'nodes_manuals' => [ + { + 'node_content' => [ + {} + ], + 'normalized' => 'n1' + } + ], + 'normalized' => 'n1', + 'spaces_before_argument' => ' ' + }, + 'source_info' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + } + }, + { + 'args' => [ + { + 'contents' => [ + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'n2' + } + ], + 'type' => 'brace_command_arg' + } + ], + 'cmdname' => 'ref', + 'extra' => { + 'label' => { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'n2' + } + ], + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'node', + 'extra' => { + 'node_content' => [ + {} + ], + 'nodes_manuals' => [ + { + 'node_content' => [ + {} + ], + 'normalized' => 'n2' + } + ], + 'normalized' => 'n2', + 'spaces_before_argument' => ' ' + }, + 'source_info' => { + 'file_name' => '', + 'line_nr' => 4, + 'macro' => '' + } + }, + 'node_argument' => { + 'node_content' => [ + {} + ], + 'normalized' => 'n2' + } + }, + 'source_info' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + } + } + ], + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'chapter', + 'contents' => [ + { + 'text' => ' +', + 'type' => 'empty_line' + } + ], + 'extra' => { + 'spaces_before_argument' => ' ' + }, + 'source_info' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + } + }, + {}, + { + 'args' => [ + { + 'contents' => [ + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'n1' + } + ], + 'type' => 'brace_command_arg' + } + ], + 'cmdname' => 'ref', + 'extra' => { + 'label' => {}, + 'node_argument' => { + 'node_content' => [ + {} + ], + 'normalized' => 'n1' + } + }, + 'source_info' => { + 'file_name' => '', + 'line_nr' => 5, + 'macro' => '' + } + } + ], + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'chapter', + 'extra' => { + 'spaces_before_argument' => ' ' + }, + 'source_info' => { + 'file_name' => '', + 'line_nr' => 5, + 'macro' => '' + } + } + ], + 'type' => 'document_root' +}; +$result_trees{'double_recursive_self_section_reference'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'double_recursive_self_section_reference'}{'contents'}[1]{'args'}[0]{'contents'}[0]; +$result_trees{'double_recursive_self_section_reference'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'double_recursive_self_section_reference'}{'contents'}[1]{'args'}[0]{'contents'}[0]; +$result_trees{'double_recursive_self_section_reference'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'label'}{'extra'}{'node_content'}[0] = $result_trees{'double_recursive_self_section_reference'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0]; +$result_trees{'double_recursive_self_section_reference'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'double_recursive_self_section_reference'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0]; +$result_trees{'double_recursive_self_section_reference'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'double_recursive_self_section_reference'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]; +$result_trees{'double_recursive_self_section_reference'}{'contents'}[3] = $result_trees{'double_recursive_self_section_reference'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'label'}; +$result_trees{'double_recursive_self_section_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'label'} = $result_trees{'double_recursive_self_section_reference'}{'contents'}[1]; +$result_trees{'double_recursive_self_section_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'double_recursive_self_section_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]; + +$result_texis{'double_recursive_self_section_reference'} = '@node n1 +@chapter @ref{n2} + +@node n2 +@chapter @ref{n1} +'; + + +$result_texts{'double_recursive_self_section_reference'} = '1 n2 +**** + +2 n1 +**** +'; + +$result_sectioning{'double_recursive_self_section_reference'} = { + 'structure' => { + 'section_childs' => [ + { + 'cmdname' => 'chapter', + 'extra' => { + 'associated_node' => { + 'cmdname' => 'node', + 'extra' => { + 'normalized' => 'n1' + }, + 'structure' => {} + } + }, + 'structure' => { + 'section_level' => 1, + 'section_number' => 1, + 'section_up' => {} + } + }, + { + 'cmdname' => 'chapter', + 'extra' => { + 'associated_node' => { + 'cmdname' => 'node', + 'extra' => { + 'normalized' => 'n2' + }, + 'structure' => {} + } + }, + 'structure' => { + 'section_level' => 1, + 'section_number' => 2, + 'section_prev' => {}, + 'section_up' => {}, + 'toplevel_prev' => {} + } + } + ], + 'section_level' => 0 + } +}; +$result_sectioning{'double_recursive_self_section_reference'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'} = $result_sectioning{'double_recursive_self_section_reference'}; +$result_sectioning{'double_recursive_self_section_reference'}{'structure'}{'section_childs'}[1]{'structure'}{'section_prev'} = $result_sectioning{'double_recursive_self_section_reference'}{'structure'}{'section_childs'}[0]; +$result_sectioning{'double_recursive_self_section_reference'}{'structure'}{'section_childs'}[1]{'structure'}{'section_up'} = $result_sectioning{'double_recursive_self_section_reference'}; +$result_sectioning{'double_recursive_self_section_reference'}{'structure'}{'section_childs'}[1]{'structure'}{'toplevel_prev'} = $result_sectioning{'double_recursive_self_section_reference'}{'structure'}{'section_childs'}[0]; + +$result_nodes{'double_recursive_self_section_reference'} = { + 'cmdname' => 'node', + 'extra' => { + 'associated_section' => { + 'cmdname' => 'chapter', + 'extra' => {}, + 'structure' => { + 'section_number' => 1 + } + }, + 'normalized' => 'n1' + }, + 'structure' => { + 'node_next' => { + 'cmdname' => 'node', + 'extra' => { + 'associated_section' => { + 'cmdname' => 'chapter', + 'extra' => {}, + 'structure' => { + 'section_number' => 2 + } + }, + 'normalized' => 'n2' + }, + 'structure' => { + 'node_prev' => {} + } + } + } +}; +$result_nodes{'double_recursive_self_section_reference'}{'structure'}{'node_next'}{'structure'}{'node_prev'} = $result_nodes{'double_recursive_self_section_reference'}; + +$result_menus{'double_recursive_self_section_reference'} = { + 'cmdname' => 'node', + 'extra' => { + 'normalized' => 'n1' + }, + 'structure' => {} +}; + +$result_errors{'double_recursive_self_section_reference'} = []; + + +$result_floats{'double_recursive_self_section_reference'} = {}; + + + +$result_converted{'plaintext'}->{'double_recursive_self_section_reference'} = '1 *note n2:: +************ + +2 *note n1:: +************ + +'; + + +$result_converted{'html'}->{'double_recursive_self_section_reference'} = '<!DOCTYPE html> +<html> +<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ --> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> +<title>Untitled Document</title> + +<meta name="description" content="Untitled Document"> +<meta name="keywords" content="Untitled Document"> +<meta name="resource-type" content="document"> +<meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + +<link href="#n1" rel="start" title="n1"> + + +</head> + +<body lang="en"> +<div class="chapter-level-extent" id="n1"> +<div class="nav-panel"> +<p> +Next: <a href="#n2" accesskey="n" rel="next"><a class="ref" href="#n1"><a class="ref" href="#n2">n2</a></a></a> </p> +</div> +<h2 class="chapter" id="n2-1">1 <a class="ref" href="#n2"><a class="ref" href="#n1"><a class="ref" href="#n2">n2</a></a></a></h2> + +<hr> +</div> +<div class="chapter-level-extent" id="n2"> +<div class="nav-panel"> +<p> +Previous: <a href="#n1" accesskey="p" rel="prev"><a class="ref" href="#n2">n2</a></a> </p> +</div> +<h2 class="chapter" id="n1-1">2 <a class="ref" href="#n1"><a class="ref" href="#n2">n2</a></a></h2> +</div> + + + +</body> +</html> +'; + +$result_converted_errors{'html'}->{'double_recursive_self_section_reference'} = [ + { + 'error_line' => 'warning: must specify a title with a title command or @top +', + 'text' => 'must specify a title with a title command or @top', + 'type' => 'warning' + } +]; + + +1; diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/recursive_self_section_reference.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/recursive_self_section_reference.pl new file mode 100644 index 0000000000..6804000625 --- /dev/null +++ b/macros/texinfo/texinfo/tp/t/results/sectioning/recursive_self_section_reference.pl @@ -0,0 +1,223 @@ +use vars qw(%result_texis %result_texts %result_trees %result_errors + %result_indices %result_sectioning %result_nodes %result_menus + %result_floats %result_converted %result_converted_errors + %result_elements %result_directions_text %result_indices_sort_strings); + +use utf8; + +$result_trees{'recursive_self_section_reference'} = { + 'contents' => [ + { + 'contents' => [ + { + 'contents' => [], + 'type' => 'preamble_before_content' + } + ], + 'type' => 'before_node_section' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'sharp' + } + ], + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'node', + 'extra' => { + 'node_content' => [ + {} + ], + 'nodes_manuals' => [ + { + 'node_content' => [ + {} + ], + 'normalized' => 'sharp' + } + ], + 'normalized' => 'sharp', + 'spaces_before_argument' => ' ' + }, + 'source_info' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + } + }, + { + 'args' => [ + { + 'contents' => [ + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'sharp' + } + ], + 'type' => 'brace_command_arg' + } + ], + 'cmdname' => 'ref', + 'extra' => { + 'label' => {}, + 'node_argument' => { + 'node_content' => [ + {} + ], + 'normalized' => 'sharp' + } + }, + 'source_info' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + } + }, + { + 'text' => ' tuple' + } + ], + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'chapter', + 'extra' => { + 'spaces_before_argument' => ' ' + }, + 'source_info' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + } + } + ], + 'type' => 'document_root' +}; +$result_trees{'recursive_self_section_reference'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'recursive_self_section_reference'}{'contents'}[1]{'args'}[0]{'contents'}[0]; +$result_trees{'recursive_self_section_reference'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'recursive_self_section_reference'}{'contents'}[1]{'args'}[0]{'contents'}[0]; +$result_trees{'recursive_self_section_reference'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'label'} = $result_trees{'recursive_self_section_reference'}{'contents'}[1]; +$result_trees{'recursive_self_section_reference'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'recursive_self_section_reference'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]; + +$result_texis{'recursive_self_section_reference'} = '@node sharp +@chapter @ref{sharp} tuple +'; + + +$result_texts{'recursive_self_section_reference'} = '1 sharp tuple +************* +'; + +$result_sectioning{'recursive_self_section_reference'} = { + 'structure' => { + 'section_childs' => [ + { + 'cmdname' => 'chapter', + 'extra' => { + 'associated_node' => { + 'cmdname' => 'node', + 'extra' => { + 'normalized' => 'sharp' + } + } + }, + 'structure' => { + 'section_level' => 1, + 'section_number' => 1, + 'section_up' => {} + } + } + ], + 'section_level' => 0 + } +}; +$result_sectioning{'recursive_self_section_reference'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'} = $result_sectioning{'recursive_self_section_reference'}; + +$result_nodes{'recursive_self_section_reference'} = { + 'cmdname' => 'node', + 'extra' => { + 'associated_section' => { + 'cmdname' => 'chapter', + 'extra' => {}, + 'structure' => { + 'section_number' => 1 + } + }, + 'normalized' => 'sharp' + } +}; + +$result_menus{'recursive_self_section_reference'} = { + 'cmdname' => 'node', + 'extra' => { + 'normalized' => 'sharp' + } +}; + +$result_errors{'recursive_self_section_reference'} = []; + + +$result_floats{'recursive_self_section_reference'} = {}; + + + +$result_converted{'plaintext'}->{'recursive_self_section_reference'} = '1 *note sharp:: tuple +********************* + +'; + + +$result_converted{'html'}->{'recursive_self_section_reference'} = '<!DOCTYPE html> +<html> +<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ --> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> +<title>Untitled Document</title> + +<meta name="description" content="Untitled Document"> +<meta name="keywords" content="Untitled Document"> +<meta name="resource-type" content="document"> +<meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + +<link href="#sharp" rel="start" title="sharp"> + + +</head> + +<body lang="en"> +<div class="chapter-level-extent" id="sharp"> +<h2 class="chapter" id="sharp-tuple">1 <a class="ref" href="#sharp">sharp</a> tuple</h2> +</div> + + + +</body> +</html> +'; + +$result_converted_errors{'html'}->{'recursive_self_section_reference'} = [ + { + 'error_line' => 'warning: must specify a title with a title command or @top +', + 'text' => 'must specify a title with a title command or @top', + 'type' => 'warning' + } +]; + + +1; |