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/tests | |
parent | 77362f5f4b083c21c2044b0c54d228da42804c72 (diff) |
CTAN sync 202212020304
Diffstat (limited to 'macros/texinfo/texinfo/tp/tests')
155 files changed, 911 insertions, 650 deletions
diff --git a/macros/texinfo/texinfo/tp/tests/coverage_macro.texi b/macros/texinfo/texinfo/tp/tests/coverage_macro.texi index 61625a3101..3e74954790 100644 --- a/macros/texinfo/texinfo/tp/tests/coverage_macro.texi +++ b/macros/texinfo/texinfo/tp/tests/coverage_macro.texi @@ -1039,6 +1039,7 @@ Invalid use of @@':@* @code{@@image@{f--ile,l--i@}} @image{f--ile,l--i} @code{@@image@{f--ile,,l--e@}} @image{f--ile,,l--e} @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@{@@file@{f--ile@}@@@@@@.,aze,az,alt,@@file@{.file ext@} e--xt@@@}} @image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}} @c It is not reliable to use @verb inside other Texinfo constructs diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting/formatting.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting/formatting.html index b19ddf3488..7b585d3c1c 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting/formatting.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting/formatting.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile @@ -1850,6 +1851,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -2927,6 +2929,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -4060,6 +4063,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -5135,6 +5139,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -6352,6 +6357,7 @@ Invalid use of @': <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> <code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/anchor.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/anchor.html index 19eea1b795..d8732d61a9 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/anchor.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/anchor.html @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/chapter.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/chapter.html index cf162cd1a6..be63c0b2cf 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/chapter.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/chapter.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile @@ -1846,6 +1847,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -2921,6 +2923,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -4138,6 +4141,7 @@ Invalid use of @': <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> <code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/chapter2.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/chapter2.html index e5209ebe86..1cf6b6112f 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/chapter2.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/chapter2.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting.html index f6eed90d4f..92d64bfda5 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile @@ -1834,6 +1835,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -2911,6 +2913,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html index 29a0f9a59b..c1bb29c032 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html index f86dfe7438..6eaa989b50 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html index 06b181018c..592f774290 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/index.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/index.html index 1f6ca32432..6222e5063a 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/index.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/index.html @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html index ab452ca68a..de94b0f213 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/subsection.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/subsection.html index 109535a4f6..23f995693b 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/subsection.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/subsection.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html index 4ae610921b..7e3f160fb0 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html index 071c7a14f8..acf4f74b8c 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_docbook/formatting.xml b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_docbook/formatting.xml index cadca11fad..e3885efb68 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_docbook/formatting.xml +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_docbook/formatting.xml @@ -789,6 +789,8 @@ aaa</literallayout></textobject></inlinemediaobject> aaa</literallayout></textobject></inlinemediaobject> <literal>@image{f--ile,aze,az,alt,.e--xt}</literal> <inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" format="JPG"></imagedata></imageobject><imageobject><imagedata fileref="f--ile.png" format="PNG"></imagedata></imageobject><textobject><literallayout>ggg aaa</literallayout></textobject></inlinemediaobject> +<literal>@image{f--ile,aze,az,alt,</literal> <inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" format="JPG"></imagedata></imageobject><imageobject><imagedata fileref="f--ile.png" format="PNG"></imagedata></imageobject><textobject><literallayout>ggg +aaa</literallayout></textobject></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> </para> <!-- It is not reliable to use @verb inside other Texinfo constructs --> @@ -1704,6 +1706,8 @@ aaa</literallayout></textobject></inlinemediaobject> aaa</literallayout></textobject></inlinemediaobject> <literal>@image{f--ile,aze,az,alt,.e--xt}</literal> <inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" format="JPG"></imagedata></imageobject><imageobject><imagedata fileref="f--ile.png" format="PNG"></imagedata></imageobject><textobject><literallayout>ggg aaa</literallayout></textobject></inlinemediaobject> +<literal>@image{f--ile,aze,az,alt,</literal> <inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" format="JPG"></imagedata></imageobject><imageobject><imagedata fileref="f--ile.png" format="PNG"></imagedata></imageobject><textobject><literallayout>ggg +aaa</literallayout></textobject></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> </para> <!-- It is not reliable to use @verb inside other Texinfo constructs --> @@ -2606,6 +2610,8 @@ aaa</literallayout></textobject></inlinemediaobject> aaa</literallayout></textobject></inlinemediaobject> <literal>@image{f--ile,aze,az,alt,.e--xt}</literal> <inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" format="JPG"></imagedata></imageobject><imageobject><imagedata fileref="f--ile.png" format="PNG"></imagedata></imageobject><textobject><literallayout>ggg aaa</literallayout></textobject></inlinemediaobject> +<literal>@image{f--ile,aze,az,alt,</literal> <inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" format="JPG"></imagedata></imageobject><imageobject><imagedata fileref="f--ile.png" format="PNG"></imagedata></imageobject><textobject><literallayout>ggg +aaa</literallayout></textobject></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> </para> <!-- It is not reliable to use @verb inside other Texinfo constructs --> @@ -3500,6 +3506,8 @@ aaa</literallayout></textobject></inlinemediaobject> aaa</literallayout></textobject></inlinemediaobject> <literal>@image{f--ile,aze,az,alt,.e--xt}</literal> <inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" format="JPG"></imagedata></imageobject><imageobject><imagedata fileref="f--ile.png" format="PNG"></imagedata></imageobject><textobject><literallayout>ggg aaa</literallayout></textobject></inlinemediaobject> +<literal>@image{f--ile,aze,az,alt,</literal> <inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" format="JPG"></imagedata></imageobject><imageobject><imagedata fileref="f--ile.png" format="PNG"></imagedata></imageobject><textobject><literallayout>ggg +aaa</literallayout></textobject></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> <!-- It is not reliable to use @verb inside other Texinfo constructs --> diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html index 5e184f38f9..d63198389e 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile @@ -1850,6 +1851,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -2927,6 +2929,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -4060,6 +4063,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -5135,6 +5139,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -6352,6 +6357,7 @@ Invalid use of @': <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> <code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/formatting.opf b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/formatting.opf index f839cfb513..49a4c8ef39 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/formatting.opf +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/formatting.opf @@ -13,41 +13,46 @@ <item id="unit1" media-type="application/xhtml+xml" href="xhtml/formatting.xhtml"/> <item id="unit2" media-type="application/xhtml+xml" href="xhtml/chapter.xhtml"/> <item id="unit3" media-type="application/xhtml+xml" href="xhtml/chapter2.xhtml"/> - <item id="image1" media-type="e--xt/image" href="images/10-f--ile.e--xt"/> - <item id="image2" media-type="image/png" href="images/14-f--ile.png"/> - <item id="image3" media-type="image/png" href="images/15-f--ile.png"/> - <item id="image4" media-type="e--xt/image" href="images/16-f--ile.e--xt"/> - <item id="image5" media-type="image/png" href="images/17-f--ile.png"/> - <item id="image6" media-type="image/png" href="images/18-f--ile.png"/> - <item id="image7" media-type="e--xt/image" href="images/19-f--ile.e--xt"/> - <item id="image8" media-type="e--xt/image" href="images/21-f--ile.e--xt"/> - <item id="image9" media-type="image/png" href="images/25-f--ile.png"/> - <item id="image10" media-type="image/png" href="images/26-f--ile.png"/> - <item id="image11" media-type="e--xt/image" href="images/27-f--ile.e--xt"/> - <item id="image12" media-type="image/png" href="images/28-f--ile.png"/> - <item id="image13" media-type="image/png" href="images/29-f--ile.png"/> - <item id="image14" media-type="image/png" href="images/3-f--ile.png"/> - <item id="image15" media-type="e--xt/image" href="images/30-f--ile.e--xt"/> + <item id="image1" media-type="e--xt/image" href="images/11-f--ile.e--xt"/> + <item id="image2" media-type="image/png" href="images/15-f--ile.png"/> + <item id="image3" media-type="image/png" href="images/16-f--ile.png"/> + <item id="image4" media-type="e--xt/image" href="images/17-f--ile.e--xt"/> + <item id="image5" media-type="image/png" href="images/18-f--ile.png"/> + <item id="image6" media-type="image/png" href="images/19-f--ile.png"/> + <item id="image7" media-type="e--xt/image" href="images/20-f--ile.e--xt"/> + <item id="image8" media-type="image/png" href="images/21-f--ile.png"/> + <item id="image9" media-type="e--xt/image" href="images/23-f--ile.e--xt"/> + <item id="image10" media-type="image/png" href="images/27-f--ile.png"/> + <item id="image11" media-type="image/png" href="images/28-f--ile.png"/> + <item id="image12" media-type="e--xt/image" href="images/29-f--ile.e--xt"/> + <item id="image13" media-type="image/png" href="images/3-f--ile.png"/> + <item id="image14" media-type="image/png" href="images/30-f--ile.png"/> + <item id="image15" media-type="image/png" href="images/31-f--ile.png"/> <item id="image16" media-type="e--xt/image" href="images/32-f--ile.e--xt"/> - <item id="image17" media-type="image/png" href="images/36-f--ile.png"/> - <item id="image18" media-type="image/png" href="images/37-f--ile.png"/> - <item id="image19" media-type="e--xt/image" href="images/38-f--ile.e--xt"/> - <item id="image20" media-type="image/png" href="images/39-f--ile.png"/> - <item id="image21" media-type="image/png" href="images/4-f--ile.png"/> - <item id="image22" media-type="image/png" href="images/40-f--ile.png"/> - <item id="image23" media-type="e--xt/image" href="images/41-f--ile.e--xt"/> - <item id="image24" media-type="e--xt/image" href="images/43-f--ile.e--xt"/> - <item id="image25" media-type="image/png" href="images/47-f--ile.png"/> - <item id="image26" media-type="image/png" href="images/48-f--ile.png"/> - <item id="image27" media-type="e--xt/image" href="images/49-f--ile.e--xt"/> + <item id="image17" media-type="image/png" href="images/33-f--ile.png"/> + <item id="image18" media-type="e--xt/image" href="images/35-f--ile.e--xt"/> + <item id="image19" media-type="image/png" href="images/39-f--ile.png"/> + <item id="image20" media-type="image/png" href="images/4-f--ile.png"/> + <item id="image21" media-type="image/png" href="images/40-f--ile.png"/> + <item id="image22" media-type="e--xt/image" href="images/41-f--ile.e--xt"/> + <item id="image23" media-type="image/png" href="images/42-f--ile.png"/> + <item id="image24" media-type="image/png" href="images/43-f--ile.png"/> + <item id="image25" media-type="e--xt/image" href="images/44-f--ile.e--xt"/> + <item id="image26" media-type="image/png" href="images/45-f--ile.png"/> + <item id="image27" media-type="e--xt/image" href="images/47-f--ile.e--xt"/> <item id="image28" media-type="e--xt/image" href="images/5-f--ile.e--xt"/> - <item id="image29" media-type="image/png" href="images/50-f--ile.png"/> - <item id="image30" media-type="image/png" href="images/51-f--ile.png"/> - <item id="image31" media-type="e--xt/image" href="images/52-f--ile.e--xt"/> - <item id="image32" media-type="e--xt/image" href="images/54-f--ile.e--xt"/> - <item id="image33" media-type="image/png" href="images/6-f--ile.png"/> - <item id="image34" media-type="image/png" href="images/7-f--ile.png"/> - <item id="image35" media-type="e--xt/image" href="images/8-f--ile.e--xt"/> + <item id="image29" media-type="image/png" href="images/51-f--ile.png"/> + <item id="image30" media-type="image/png" href="images/52-f--ile.png"/> + <item id="image31" media-type="e--xt/image" href="images/53-f--ile.e--xt"/> + <item id="image32" media-type="image/png" href="images/54-f--ile.png"/> + <item id="image33" media-type="image/png" href="images/55-f--ile.png"/> + <item id="image34" media-type="e--xt/image" href="images/56-f--ile.e--xt"/> + <item id="image35" media-type="image/png" href="images/57-f--ile.png"/> + <item id="image36" media-type="e--xt/image" href="images/59-f--ile.e--xt"/> + <item id="image37" media-type="image/png" href="images/6-f--ile.png"/> + <item id="image38" media-type="image/png" href="images/7-f--ile.png"/> + <item id="image39" media-type="e--xt/image" href="images/8-f--ile.e--xt"/> + <item id="image40" media-type="image/png" href="images/9-f--ile.png"/> </manifest> <spine> <itemref idref="unit1"/> diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/10-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/11-f--ile.e--xt index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/10-f--ile.e--xt +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/11-f--ile.e--xt diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/14-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/16-f--ile.png index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/14-f--ile.png +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/16-f--ile.png diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/16-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/17-f--ile.e--xt index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/16-f--ile.e--xt +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/17-f--ile.e--xt diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/17-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/19-f--ile.png index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/17-f--ile.png +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/19-f--ile.png diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/19-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/20-f--ile.e--xt index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/19-f--ile.e--xt +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/20-f--ile.e--xt diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/21-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/21-f--ile.png index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/21-f--ile.e--xt +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/21-f--ile.png diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/25-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/23-f--ile.e--xt index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/25-f--ile.png +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/23-f--ile.e--xt diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/26-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/27-f--ile.png index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/26-f--ile.png +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/27-f--ile.png diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/27-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/29-f--ile.e--xt index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/27-f--ile.e--xt +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/29-f--ile.e--xt diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/29-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/30-f--ile.png index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/29-f--ile.png +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/30-f--ile.png diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/30-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/31-f--ile.png index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/30-f--ile.e--xt +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/31-f--ile.png diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/36-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/33-f--ile.png index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/36-f--ile.png +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/33-f--ile.png diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/37-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/35-f--ile.e--xt index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/37-f--ile.png +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/35-f--ile.e--xt diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/38-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/42-f--ile.png index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/38-f--ile.e--xt +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/42-f--ile.png diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/43-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/43-f--ile.png index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/43-f--ile.e--xt +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/43-f--ile.png diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/47-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/44-f--ile.e--xt index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/47-f--ile.png +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/44-f--ile.e--xt diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/48-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/45-f--ile.png index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/48-f--ile.png +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/45-f--ile.png diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/49-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/47-f--ile.e--xt index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/49-f--ile.e--xt +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/47-f--ile.e--xt diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/50-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/52-f--ile.png index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/50-f--ile.png +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/52-f--ile.png diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/52-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/53-f--ile.e--xt index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/52-f--ile.e--xt +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/53-f--ile.e--xt diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/54-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/54-f--ile.png index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/54-f--ile.e--xt +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/54-f--ile.png diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/10-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/55-f--ile.png index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/10-f--ile.e--xt +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/55-f--ile.png diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/14-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/56-f--ile.e--xt index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/14-f--ile.png +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/56-f--ile.e--xt diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/16-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/57-f--ile.png index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/16-f--ile.e--xt +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/57-f--ile.png diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/17-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/59-f--ile.e--xt index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/17-f--ile.png +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/59-f--ile.e--xt diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/19-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/9-f--ile.png index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/19-f--ile.e--xt +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/9-f--ile.png diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml index 690dcef58f..7dbe1ec543 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile @@ -1837,19 +1838,20 @@ html '' <code class="code">@image{,,2--xt}</code> <code class="code">@image{,,,3--xt}</code> </p> -<p><code class="code">@image{f-ile,aze,,a--lt}</code> <img class="image" src="../images/23-f-ilejpg" alt="a–lt"/> -<code class="code">@image{f-ile,,,alt@verb{:jk _" %}}</code> <img class="image" src="../images/24-f-ilejpg" alt="altjk _" %@"/> +<p><code class="code">@image{f-ile,aze,,a--lt}</code> <img class="image" src="../images/25-f-ilejpg" alt="a–lt"/> +<code class="code">@image{f-ile,,,alt@verb{:jk _" %}}</code> <img class="image" src="../images/26-f-ilejpg" alt="altjk _" %@"/> </p> -<p><code class="code">@image{f--ile}</code> <img class="image" src="../images/25-f--ile.png" alt="f--ile"/> -<code class="code">@image{f--ile,,,alt}</code> <img class="image" src="../images/26-f--ile.png" alt="alt"/> -<code class="code">@image{f--ile,,,,.e-d-xt}</code> <img class="image" src="../images/27-f--ile.e--xt" alt="f--ile"/> -<code class="code">@image{f--ile,l--i}</code> <img class="image" src="../images/28-f--ile.png" alt="f--ile"/> -<code class="code">@image{f--ile,,l--e}</code> <img class="image" src="../images/29-f--ile.png" alt="f--ile"/> -<code class="code">@image{f--ile,aze,az,alt,.e--xt}</code> <img class="image" src="../images/30-f--ile.e--xt" alt="alt"/> -<code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img class="image" src="../images/31-f--ile_0040..file-ext-e--xt_007d" alt="alt"/> +<p><code class="code">@image{f--ile}</code> <img class="image" src="../images/27-f--ile.png" alt="f--ile"/> +<code class="code">@image{f--ile,,,alt}</code> <img class="image" src="../images/28-f--ile.png" alt="alt"/> +<code class="code">@image{f--ile,,,,.e-d-xt}</code> <img class="image" src="../images/29-f--ile.e--xt" alt="f--ile"/> +<code class="code">@image{f--ile,l--i}</code> <img class="image" src="../images/30-f--ile.png" alt="f--ile"/> +<code class="code">@image{f--ile,,l--e}</code> <img class="image" src="../images/31-f--ile.png" alt="f--ile"/> +<code class="code">@image{f--ile,aze,az,alt,.e--xt}</code> <img class="image" src="../images/32-f--ile.e--xt" alt="alt"/> +<code class="code">@image{f--ile,aze,az,alt,</code> <img class="image" src="../images/33-f--ile.png" alt="alt"/> +<code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img class="image" src="../images/34-f--ile_0040..file-ext-e--xt_007d" alt="alt"/> </p> -<p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="../images/32-f--ile.e--xt" alt="jk _" %@ in b ""/> -<code class="code">@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> <img class="image" src="../images/33-filejk-__0022-_0025_0040jpg" alt="altjk _" %@"/> +<p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="../images/35-f--ile.e--xt" alt="jk _" %@ in b ""/> +<code class="code">@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> <img class="image" src="../images/36-filejk-__0022-_0025_0040jpg" alt="altjk _" %@"/> </p> @@ -2912,19 +2914,20 @@ html '' <code class="code">@image{,,2--xt}</code> <code class="code">@image{,,,3--xt}</code> </p> -<p><code class="code">@image{f-ile,aze,,a--lt}</code> <img class="image" src="../images/34-f-ilejpg" alt="a–lt"/> -<code class="code">@image{f-ile,,,alt@verb{:jk _" %}}</code> <img class="image" src="../images/35-f-ilejpg" alt="altjk _" %@"/> +<p><code class="code">@image{f-ile,aze,,a--lt}</code> <img class="image" src="../images/37-f-ilejpg" alt="a–lt"/> +<code class="code">@image{f-ile,,,alt@verb{:jk _" %}}</code> <img class="image" src="../images/38-f-ilejpg" alt="altjk _" %@"/> </p> -<p><code class="code">@image{f--ile}</code> <img class="image" src="../images/36-f--ile.png" alt="f--ile"/> -<code class="code">@image{f--ile,,,alt}</code> <img class="image" src="../images/37-f--ile.png" alt="alt"/> -<code class="code">@image{f--ile,,,,.e-d-xt}</code> <img class="image" src="../images/38-f--ile.e--xt" alt="f--ile"/> -<code class="code">@image{f--ile,l--i}</code> <img class="image" src="../images/39-f--ile.png" alt="f--ile"/> -<code class="code">@image{f--ile,,l--e}</code> <img class="image" src="../images/40-f--ile.png" alt="f--ile"/> -<code class="code">@image{f--ile,aze,az,alt,.e--xt}</code> <img class="image" src="../images/41-f--ile.e--xt" alt="alt"/> -<code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img class="image" src="../images/42-f--ile_0040..file-ext-e--xt_007d" alt="alt"/> +<p><code class="code">@image{f--ile}</code> <img class="image" src="../images/39-f--ile.png" alt="f--ile"/> +<code class="code">@image{f--ile,,,alt}</code> <img class="image" src="../images/40-f--ile.png" alt="alt"/> +<code class="code">@image{f--ile,,,,.e-d-xt}</code> <img class="image" src="../images/41-f--ile.e--xt" alt="f--ile"/> +<code class="code">@image{f--ile,l--i}</code> <img class="image" src="../images/42-f--ile.png" alt="f--ile"/> +<code class="code">@image{f--ile,,l--e}</code> <img class="image" src="../images/43-f--ile.png" alt="f--ile"/> +<code class="code">@image{f--ile,aze,az,alt,.e--xt}</code> <img class="image" src="../images/44-f--ile.e--xt" alt="alt"/> +<code class="code">@image{f--ile,aze,az,alt,</code> <img class="image" src="../images/45-f--ile.png" alt="alt"/> +<code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img class="image" src="../images/46-f--ile_0040..file-ext-e--xt_007d" alt="alt"/> </p> -<p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="../images/43-f--ile.e--xt" alt="jk _" %@ in b ""/> -<code class="code">@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> <img class="image" src="../images/44-filejk-__0022-_0025_0040jpg" alt="altjk _" %@"/> +<p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="../images/47-f--ile.e--xt" alt="jk _" %@ in b ""/> +<code class="code">@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> <img class="image" src="../images/48-filejk-__0022-_0025_0040jpg" alt="altjk _" %@"/> </p> @@ -4129,19 +4132,20 @@ Invalid use of @': <code class="code">@image{,,2--xt}</code> <code class="code">@image{,,,3--xt}</code> -<code class="code">@image{f-ile,aze,,a--lt}</code> <img class="image" src="../images/45-f-ilejpg" alt="a–lt"/> -<code class="code">@image{f-ile,,,alt@verb{:jk _" %}}</code> <img class="image" src="../images/46-f-ilejpg" alt="altjk _" %@"/> +<code class="code">@image{f-ile,aze,,a--lt}</code> <img class="image" src="../images/49-f-ilejpg" alt="a–lt"/> +<code class="code">@image{f-ile,,,alt@verb{:jk _" %}}</code> <img class="image" src="../images/50-f-ilejpg" alt="altjk _" %@"/> -<code class="code">@image{f--ile}</code> <img class="image" src="../images/47-f--ile.png" alt="f--ile"/> -<code class="code">@image{f--ile,,,alt}</code> <img class="image" src="../images/48-f--ile.png" alt="alt"/> -<code class="code">@image{f--ile,,,,.e-d-xt}</code> <img class="image" src="../images/49-f--ile.e--xt" alt="f--ile"/> -<code class="code">@image{f--ile,l--i}</code> <img class="image" src="../images/50-f--ile.png" alt="f--ile"/> -<code class="code">@image{f--ile,,l--e}</code> <img class="image" src="../images/51-f--ile.png" alt="f--ile"/> -<code class="code">@image{f--ile,aze,az,alt,.e--xt}</code> <img class="image" src="../images/52-f--ile.e--xt" alt="alt"/> -<code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img class="image" src="../images/53-f--ile_0040..file-ext-e--xt_007d" alt="alt"/> +<code class="code">@image{f--ile}</code> <img class="image" src="../images/51-f--ile.png" alt="f--ile"/> +<code class="code">@image{f--ile,,,alt}</code> <img class="image" src="../images/52-f--ile.png" alt="alt"/> +<code class="code">@image{f--ile,,,,.e-d-xt}</code> <img class="image" src="../images/53-f--ile.e--xt" alt="f--ile"/> +<code class="code">@image{f--ile,l--i}</code> <img class="image" src="../images/54-f--ile.png" alt="f--ile"/> +<code class="code">@image{f--ile,,l--e}</code> <img class="image" src="../images/55-f--ile.png" alt="f--ile"/> +<code class="code">@image{f--ile,aze,az,alt,.e--xt}</code> <img class="image" src="../images/56-f--ile.e--xt" alt="alt"/> +<code class="code">@image{f--ile,aze,az,alt,</code> <img class="image" src="../images/57-f--ile.png" alt="alt"/> +<code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img class="image" src="../images/58-f--ile_0040..file-ext-e--xt_007d" alt="alt"/> -<code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="../images/54-f--ile.e--xt" alt="jk _" %@ in b ""/> -<code class="code">@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> <img class="image" src="../images/55-filejk-__0022-_0025_0040jpg" alt="altjk _" %@"/> +<code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="../images/59-f--ile.e--xt" alt="jk _" %@ in b ""/> +<code class="code">@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> <img class="image" src="../images/60-filejk-__0022-_0025_0040jpg" alt="altjk _" %@"/> diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml index 0cf9d95f2f..b590b0887b 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml index 0eff7ca737..94fbf701b7 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile @@ -1833,10 +1834,11 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="../images/6-f--ile.png" alt="f--ile"/> <code class="code">@image{f--ile,,l--e}</code> <img class="image" src="../images/7-f--ile.png" alt="f--ile"/> <code class="code">@image{f--ile,aze,az,alt,.e--xt}</code> <img class="image" src="../images/8-f--ile.e--xt" alt="alt"/> -<code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img class="image" src="../images/9-f--ile_0040..file-ext-e--xt_007d" alt="alt"/> +<code class="code">@image{f--ile,aze,az,alt,</code> <img class="image" src="../images/9-f--ile.png" alt="alt"/> +<code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img class="image" src="../images/10-f--ile_0040..file-ext-e--xt_007d" alt="alt"/> </p> -<p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="../images/10-f--ile.e--xt" alt="jk _" %@ in b ""/> -<code class="code">@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> <img class="image" src="../images/11-filejk-__0022-_0025_0040jpg" alt="altjk _" %@"/> +<p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="../images/11-f--ile.e--xt" alt="jk _" %@ in b ""/> +<code class="code">@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> <img class="image" src="../images/12-filejk-__0022-_0025_0040jpg" alt="altjk _" %@"/> </p> <strong class="author">author</strong><br/> @@ -2901,19 +2903,20 @@ html '' <code class="code">@image{,,2--xt}</code> <code class="code">@image{,,,3--xt}</code> </p> -<p><code class="code">@image{f-ile,aze,,a--lt}</code> <img class="image" src="../images/12-f-ilejpg" alt="a–lt"/> -<code class="code">@image{f-ile,,,alt@verb{:jk _" %}}</code> <img class="image" src="../images/13-f-ilejpg" alt="altjk _" %@"/> +<p><code class="code">@image{f-ile,aze,,a--lt}</code> <img class="image" src="../images/13-f-ilejpg" alt="a–lt"/> +<code class="code">@image{f-ile,,,alt@verb{:jk _" %}}</code> <img class="image" src="../images/14-f-ilejpg" alt="altjk _" %@"/> </p> -<p><code class="code">@image{f--ile}</code> <img class="image" src="../images/14-f--ile.png" alt="f--ile"/> -<code class="code">@image{f--ile,,,alt}</code> <img class="image" src="../images/15-f--ile.png" alt="alt"/> -<code class="code">@image{f--ile,,,,.e-d-xt}</code> <img class="image" src="../images/16-f--ile.e--xt" alt="f--ile"/> -<code class="code">@image{f--ile,l--i}</code> <img class="image" src="../images/17-f--ile.png" alt="f--ile"/> -<code class="code">@image{f--ile,,l--e}</code> <img class="image" src="../images/18-f--ile.png" alt="f--ile"/> -<code class="code">@image{f--ile,aze,az,alt,.e--xt}</code> <img class="image" src="../images/19-f--ile.e--xt" alt="alt"/> -<code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img class="image" src="../images/20-f--ile_0040..file-ext-e--xt_007d" alt="alt"/> +<p><code class="code">@image{f--ile}</code> <img class="image" src="../images/15-f--ile.png" alt="f--ile"/> +<code class="code">@image{f--ile,,,alt}</code> <img class="image" src="../images/16-f--ile.png" alt="alt"/> +<code class="code">@image{f--ile,,,,.e-d-xt}</code> <img class="image" src="../images/17-f--ile.e--xt" alt="f--ile"/> +<code class="code">@image{f--ile,l--i}</code> <img class="image" src="../images/18-f--ile.png" alt="f--ile"/> +<code class="code">@image{f--ile,,l--e}</code> <img class="image" src="../images/19-f--ile.png" alt="f--ile"/> +<code class="code">@image{f--ile,aze,az,alt,.e--xt}</code> <img class="image" src="../images/20-f--ile.e--xt" alt="alt"/> +<code class="code">@image{f--ile,aze,az,alt,</code> <img class="image" src="../images/21-f--ile.png" alt="alt"/> +<code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img class="image" src="../images/22-f--ile_0040..file-ext-e--xt_007d" alt="alt"/> </p> -<p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="../images/21-f--ile.e--xt" alt="jk _" %@ in b ""/> -<code class="code">@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> <img class="image" src="../images/22-filejk-__0022-_0025_0040jpg" alt="altjk _" %@"/> +<p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="../images/23-f--ile.e--xt" alt="jk _" %@ in b ""/> +<code class="code">@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> <img class="image" src="../images/24-filejk-__0022-_0025_0040jpg" alt="altjk _" %@"/> </p> diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml index 92ed71d103..823b95993a 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml index 5ee030114a..10b8366e04 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml index 636f1808af..c9c2be2b35 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml index d73614b7b3..96df16bf61 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/formatting.opf b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/formatting.opf index 94fa5a55a6..075d3baed5 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/formatting.opf +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/formatting.opf @@ -18,41 +18,46 @@ <item id="unit6" media-type="application/xhtml+xml" href="xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml" properties="scripted"/> <item id="unit7" media-type="application/xhtml+xml" href="xhtml/chapter2.xhtml" properties="scripted"/> <item id="jsweblabels" media-type="application/xhtml+xml" href="xhtml/js_licenses.xhtml"/> - <item id="image1" media-type="e--xt/image" href="images/10-f--ile.e--xt"/> - <item id="image2" media-type="image/png" href="images/14-f--ile.png"/> - <item id="image3" media-type="image/png" href="images/15-f--ile.png"/> - <item id="image4" media-type="e--xt/image" href="images/16-f--ile.e--xt"/> - <item id="image5" media-type="image/png" href="images/17-f--ile.png"/> - <item id="image6" media-type="image/png" href="images/18-f--ile.png"/> - <item id="image7" media-type="e--xt/image" href="images/19-f--ile.e--xt"/> - <item id="image8" media-type="e--xt/image" href="images/21-f--ile.e--xt"/> - <item id="image9" media-type="image/png" href="images/25-f--ile.png"/> - <item id="image10" media-type="image/png" href="images/26-f--ile.png"/> - <item id="image11" media-type="e--xt/image" href="images/27-f--ile.e--xt"/> - <item id="image12" media-type="image/png" href="images/28-f--ile.png"/> - <item id="image13" media-type="image/png" href="images/29-f--ile.png"/> - <item id="image14" media-type="image/png" href="images/3-f--ile.png"/> - <item id="image15" media-type="e--xt/image" href="images/30-f--ile.e--xt"/> + <item id="image1" media-type="e--xt/image" href="images/11-f--ile.e--xt"/> + <item id="image2" media-type="image/png" href="images/15-f--ile.png"/> + <item id="image3" media-type="image/png" href="images/16-f--ile.png"/> + <item id="image4" media-type="e--xt/image" href="images/17-f--ile.e--xt"/> + <item id="image5" media-type="image/png" href="images/18-f--ile.png"/> + <item id="image6" media-type="image/png" href="images/19-f--ile.png"/> + <item id="image7" media-type="e--xt/image" href="images/20-f--ile.e--xt"/> + <item id="image8" media-type="image/png" href="images/21-f--ile.png"/> + <item id="image9" media-type="e--xt/image" href="images/23-f--ile.e--xt"/> + <item id="image10" media-type="image/png" href="images/27-f--ile.png"/> + <item id="image11" media-type="image/png" href="images/28-f--ile.png"/> + <item id="image12" media-type="e--xt/image" href="images/29-f--ile.e--xt"/> + <item id="image13" media-type="image/png" href="images/3-f--ile.png"/> + <item id="image14" media-type="image/png" href="images/30-f--ile.png"/> + <item id="image15" media-type="image/png" href="images/31-f--ile.png"/> <item id="image16" media-type="e--xt/image" href="images/32-f--ile.e--xt"/> - <item id="image17" media-type="image/png" href="images/36-f--ile.png"/> - <item id="image18" media-type="image/png" href="images/37-f--ile.png"/> - <item id="image19" media-type="e--xt/image" href="images/38-f--ile.e--xt"/> - <item id="image20" media-type="image/png" href="images/39-f--ile.png"/> - <item id="image21" media-type="image/png" href="images/4-f--ile.png"/> - <item id="image22" media-type="image/png" href="images/40-f--ile.png"/> - <item id="image23" media-type="e--xt/image" href="images/41-f--ile.e--xt"/> - <item id="image24" media-type="e--xt/image" href="images/43-f--ile.e--xt"/> - <item id="image25" media-type="image/png" href="images/47-f--ile.png"/> - <item id="image26" media-type="image/png" href="images/48-f--ile.png"/> - <item id="image27" media-type="e--xt/image" href="images/49-f--ile.e--xt"/> + <item id="image17" media-type="image/png" href="images/33-f--ile.png"/> + <item id="image18" media-type="e--xt/image" href="images/35-f--ile.e--xt"/> + <item id="image19" media-type="image/png" href="images/39-f--ile.png"/> + <item id="image20" media-type="image/png" href="images/4-f--ile.png"/> + <item id="image21" media-type="image/png" href="images/40-f--ile.png"/> + <item id="image22" media-type="e--xt/image" href="images/41-f--ile.e--xt"/> + <item id="image23" media-type="image/png" href="images/42-f--ile.png"/> + <item id="image24" media-type="image/png" href="images/43-f--ile.png"/> + <item id="image25" media-type="e--xt/image" href="images/44-f--ile.e--xt"/> + <item id="image26" media-type="image/png" href="images/45-f--ile.png"/> + <item id="image27" media-type="e--xt/image" href="images/47-f--ile.e--xt"/> <item id="image28" media-type="e--xt/image" href="images/5-f--ile.e--xt"/> - <item id="image29" media-type="image/png" href="images/50-f--ile.png"/> - <item id="image30" media-type="image/png" href="images/51-f--ile.png"/> - <item id="image31" media-type="e--xt/image" href="images/52-f--ile.e--xt"/> - <item id="image32" media-type="e--xt/image" href="images/54-f--ile.e--xt"/> - <item id="image33" media-type="image/png" href="images/6-f--ile.png"/> - <item id="image34" media-type="image/png" href="images/7-f--ile.png"/> - <item id="image35" media-type="e--xt/image" href="images/8-f--ile.e--xt"/> + <item id="image29" media-type="image/png" href="images/51-f--ile.png"/> + <item id="image30" media-type="image/png" href="images/52-f--ile.png"/> + <item id="image31" media-type="e--xt/image" href="images/53-f--ile.e--xt"/> + <item id="image32" media-type="image/png" href="images/54-f--ile.png"/> + <item id="image33" media-type="image/png" href="images/55-f--ile.png"/> + <item id="image34" media-type="e--xt/image" href="images/56-f--ile.e--xt"/> + <item id="image35" media-type="image/png" href="images/57-f--ile.png"/> + <item id="image36" media-type="e--xt/image" href="images/59-f--ile.e--xt"/> + <item id="image37" media-type="image/png" href="images/6-f--ile.png"/> + <item id="image38" media-type="image/png" href="images/7-f--ile.png"/> + <item id="image39" media-type="e--xt/image" href="images/8-f--ile.e--xt"/> + <item id="image40" media-type="image/png" href="images/9-f--ile.png"/> <item id="infojs1" media-type="text/css" href="js/info.css"/> <item id="infojs2" media-type="text/javascript" href="js/info.js"/> <item id="infojs3" media-type="text/javascript" href="js/modernizr.js"/> diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/21-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/11-f--ile.e--xt index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/21-f--ile.e--xt +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/11-f--ile.e--xt diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/25-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/16-f--ile.png index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/25-f--ile.png +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/16-f--ile.png diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/26-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/17-f--ile.e--xt index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/26-f--ile.png +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/17-f--ile.e--xt diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/27-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/19-f--ile.png index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/27-f--ile.e--xt +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/19-f--ile.png diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/29-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/20-f--ile.e--xt index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/29-f--ile.png +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/20-f--ile.e--xt diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/30-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/21-f--ile.png index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/30-f--ile.e--xt +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/21-f--ile.png diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/36-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/23-f--ile.e--xt index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/36-f--ile.png +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/23-f--ile.e--xt diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/37-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/27-f--ile.png index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/37-f--ile.png +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/27-f--ile.png diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/38-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/29-f--ile.e--xt index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/38-f--ile.e--xt +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/29-f--ile.e--xt diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/43-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/30-f--ile.png index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/43-f--ile.e--xt +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/30-f--ile.png diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/47-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/31-f--ile.png index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/47-f--ile.png +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/31-f--ile.png diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/48-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/33-f--ile.png index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/48-f--ile.png +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/33-f--ile.png diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/49-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/35-f--ile.e--xt index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/49-f--ile.e--xt +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/35-f--ile.e--xt diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/50-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/42-f--ile.png index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/50-f--ile.png +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/42-f--ile.png diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/52-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/43-f--ile.png index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/52-f--ile.e--xt +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/43-f--ile.png diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/54-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/44-f--ile.e--xt index e69de29bb2..e69de29bb2 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/54-f--ile.e--xt +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/44-f--ile.e--xt diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/45-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/45-f--ile.png new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/45-f--ile.png diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/47-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/47-f--ile.e--xt new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/47-f--ile.e--xt diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/52-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/52-f--ile.png new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/52-f--ile.png diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/53-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/53-f--ile.e--xt new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/53-f--ile.e--xt diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/54-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/54-f--ile.png new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/54-f--ile.png diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/55-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/55-f--ile.png new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/55-f--ile.png diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/56-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/56-f--ile.e--xt new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/56-f--ile.e--xt diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/57-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/57-f--ile.png new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/57-f--ile.png diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/59-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/59-f--ile.e--xt new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/59-f--ile.e--xt diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/9-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/9-f--ile.png new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/9-f--ile.png diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/js/info.css b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/js/info.css index 14537b67ad..ac0e596484 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/js/info.css +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/js/info.css @@ -141,6 +141,10 @@ div.toc ul ul { margin-left: 1em; } +div.toc-sidebar a { + text-decoration: none; +} + div.toc a[toc-current] { font-weight: bold } @@ -226,6 +230,10 @@ table#keyboard-shortcuts th { right: 0; } +.text-input input { + width: 25em; +} + .error { background-color: orange; padding: 5px; diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/js/info.js b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/js/info.js index 69c5ad95f3..521d14ed68 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/js/info.js +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/js/info.js @@ -1,5 +1,5 @@ /* info.js - Javascript UI for Texinfo manuals - Copyright (C) 2017-2019 Free Software Foundation, Inc. + Copyright (C) 2017-2022 Free Software Foundation, Inc. This file is part of GNU Texinfo. @@ -35,7 +35,7 @@ SCREEN_MIN_WIDTH: 700, LOCAL_HTML_PAGE_PATTERN: "^([^:/]*[.](html|htm|xhtml))?([#].*)?$", SHOW_SIDEBAR_HTML: '<span class="hide-icon">⇛</span>', - HIDE_SIDEBAR_HTML: '<span class="hide-icon">⇚</span><span class="hide-text">Hide sidebar</span>', + HIDE_SIDEBAR_HTML: '<span class="hide-icon">⇚</span><span class="hide-text"></span>', SHOW_SIDEBAR_TOOLTIP: 'Show navigation sidebar', HIDE_SIDEBAR_TOOLTIP: 'Hide navigation sidebar', @@ -120,7 +120,7 @@ @arg {string} linkid - link identifier @arg {string|false} [history] - method name that will be applied on the 'window.history' object. */ - set_current_url: function (linkid, history, clicked = false) { + set_current_url: function (linkid, history, clicked) { if (undef_or_null (history)) history = "pushState"; return { type: "current-url", url: linkid, @@ -146,10 +146,32 @@ /** @arg {NodeListOf<Element>} links */ cache_index_links: function (links) { var dict = {}; + var text0 = "", text1 = ""; // for subentries for (var i = 0; i < links.length; i += 1) { var link = links[i]; - dict[link.textContent] = href_hash (link_href (link)); + var link_cl = link.classList; + var text = link.textContent; + if (link_cl.contains("index-entry-level-2")) + { + text = text0 + "; " + text1 + "; " + text; + } + else if (link_cl.contains("index-entry-level-1")) + { + text1 = text; + text = text0 + "; " + text; + } + else + { + text0 = text; + } + + if ((link = link.parentElement.parentElement.lastChild) + && link.classList.contains("printindex-index-section") + && (link = link.firstChild)) + { + dict[text] = href_hash (link_href (link)); + } } return { type: "cache-index-links", links: dict }; }, @@ -1177,7 +1199,7 @@ store.dispatch ({ type: "iframe-ready", id: config.INDEX_ID }); store.dispatch ({ type: "echo", - msg: "Welcome to Texinfo documentation viewer 6.1, type '?' for help." + msg: "Welcome to Texinfo documentation viewer 7.0.1, type '?' for help." }); /* Call user hook. */ @@ -1356,6 +1378,8 @@ add_header (elem) { var h1 = document.querySelector ("h1.settitle"); + if (!h1) + h1 = document.querySelector ("h1.top"); if (h1) { var a = document.createElement ("a"); @@ -1455,8 +1479,9 @@ if (linkid_contains_index (linkid)) { /* Scan links that should be added to the index. */ - var index_links = document.querySelectorAll ("td[valign=top] a"); - store.dispatch (actions.cache_index_links (index_links)); + var index_entries = document.querySelectorAll + ("td.printindex-index-entry a"); + store.dispatch (actions.cache_index_links (index_entries)); } add_icons (); diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml index 3c9e9e3233..0c07ea4173 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile @@ -1838,19 +1839,20 @@ html '' <code class="code">@image{,,2--xt}</code> <code class="code">@image{,,,3--xt}</code> </p> -<p><code class="code">@image{f-ile,aze,,a--lt}</code> <img class="image" src="../images/23-f-ilejpg" alt="a–lt"/> -<code class="code">@image{f-ile,,,alt@verb{:jk _" %}}</code> <img class="image" src="../images/24-f-ilejpg" alt="altjk _" %@"/> +<p><code class="code">@image{f-ile,aze,,a--lt}</code> <img class="image" src="../images/25-f-ilejpg" alt="a–lt"/> +<code class="code">@image{f-ile,,,alt@verb{:jk _" %}}</code> <img class="image" src="../images/26-f-ilejpg" alt="altjk _" %@"/> </p> -<p><code class="code">@image{f--ile}</code> <img class="image" src="../images/25-f--ile.png" alt="f--ile"/> -<code class="code">@image{f--ile,,,alt}</code> <img class="image" src="../images/26-f--ile.png" alt="alt"/> -<code class="code">@image{f--ile,,,,.e-d-xt}</code> <img class="image" src="../images/27-f--ile.e--xt" alt="f--ile"/> -<code class="code">@image{f--ile,l--i}</code> <img class="image" src="../images/28-f--ile.png" alt="f--ile"/> -<code class="code">@image{f--ile,,l--e}</code> <img class="image" src="../images/29-f--ile.png" alt="f--ile"/> -<code class="code">@image{f--ile,aze,az,alt,.e--xt}</code> <img class="image" src="../images/30-f--ile.e--xt" alt="alt"/> -<code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img class="image" src="../images/31-f--ile_0040..file-ext-e--xt_007d" alt="alt"/> +<p><code class="code">@image{f--ile}</code> <img class="image" src="../images/27-f--ile.png" alt="f--ile"/> +<code class="code">@image{f--ile,,,alt}</code> <img class="image" src="../images/28-f--ile.png" alt="alt"/> +<code class="code">@image{f--ile,,,,.e-d-xt}</code> <img class="image" src="../images/29-f--ile.e--xt" alt="f--ile"/> +<code class="code">@image{f--ile,l--i}</code> <img class="image" src="../images/30-f--ile.png" alt="f--ile"/> +<code class="code">@image{f--ile,,l--e}</code> <img class="image" src="../images/31-f--ile.png" alt="f--ile"/> +<code class="code">@image{f--ile,aze,az,alt,.e--xt}</code> <img class="image" src="../images/32-f--ile.e--xt" alt="alt"/> +<code class="code">@image{f--ile,aze,az,alt,</code> <img class="image" src="../images/33-f--ile.png" alt="alt"/> +<code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img class="image" src="../images/34-f--ile_0040..file-ext-e--xt_007d" alt="alt"/> </p> -<p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="../images/32-f--ile.e--xt" alt="jk _" %@ in b ""/> -<code class="code">@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> <img class="image" src="../images/33-filejk-__0022-_0025_0040jpg" alt="altjk _" %@"/> +<p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="../images/35-f--ile.e--xt" alt="jk _" %@ in b ""/> +<code class="code">@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> <img class="image" src="../images/36-filejk-__0022-_0025_0040jpg" alt="altjk _" %@"/> </p> @@ -2913,19 +2915,20 @@ html '' <code class="code">@image{,,2--xt}</code> <code class="code">@image{,,,3--xt}</code> </p> -<p><code class="code">@image{f-ile,aze,,a--lt}</code> <img class="image" src="../images/34-f-ilejpg" alt="a–lt"/> -<code class="code">@image{f-ile,,,alt@verb{:jk _" %}}</code> <img class="image" src="../images/35-f-ilejpg" alt="altjk _" %@"/> +<p><code class="code">@image{f-ile,aze,,a--lt}</code> <img class="image" src="../images/37-f-ilejpg" alt="a–lt"/> +<code class="code">@image{f-ile,,,alt@verb{:jk _" %}}</code> <img class="image" src="../images/38-f-ilejpg" alt="altjk _" %@"/> </p> -<p><code class="code">@image{f--ile}</code> <img class="image" src="../images/36-f--ile.png" alt="f--ile"/> -<code class="code">@image{f--ile,,,alt}</code> <img class="image" src="../images/37-f--ile.png" alt="alt"/> -<code class="code">@image{f--ile,,,,.e-d-xt}</code> <img class="image" src="../images/38-f--ile.e--xt" alt="f--ile"/> -<code class="code">@image{f--ile,l--i}</code> <img class="image" src="../images/39-f--ile.png" alt="f--ile"/> -<code class="code">@image{f--ile,,l--e}</code> <img class="image" src="../images/40-f--ile.png" alt="f--ile"/> -<code class="code">@image{f--ile,aze,az,alt,.e--xt}</code> <img class="image" src="../images/41-f--ile.e--xt" alt="alt"/> -<code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img class="image" src="../images/42-f--ile_0040..file-ext-e--xt_007d" alt="alt"/> +<p><code class="code">@image{f--ile}</code> <img class="image" src="../images/39-f--ile.png" alt="f--ile"/> +<code class="code">@image{f--ile,,,alt}</code> <img class="image" src="../images/40-f--ile.png" alt="alt"/> +<code class="code">@image{f--ile,,,,.e-d-xt}</code> <img class="image" src="../images/41-f--ile.e--xt" alt="f--ile"/> +<code class="code">@image{f--ile,l--i}</code> <img class="image" src="../images/42-f--ile.png" alt="f--ile"/> +<code class="code">@image{f--ile,,l--e}</code> <img class="image" src="../images/43-f--ile.png" alt="f--ile"/> +<code class="code">@image{f--ile,aze,az,alt,.e--xt}</code> <img class="image" src="../images/44-f--ile.e--xt" alt="alt"/> +<code class="code">@image{f--ile,aze,az,alt,</code> <img class="image" src="../images/45-f--ile.png" alt="alt"/> +<code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img class="image" src="../images/46-f--ile_0040..file-ext-e--xt_007d" alt="alt"/> </p> -<p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="../images/43-f--ile.e--xt" alt="jk _" %@ in b ""/> -<code class="code">@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> <img class="image" src="../images/44-filejk-__0022-_0025_0040jpg" alt="altjk _" %@"/> +<p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="../images/47-f--ile.e--xt" alt="jk _" %@ in b ""/> +<code class="code">@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> <img class="image" src="../images/48-filejk-__0022-_0025_0040jpg" alt="altjk _" %@"/> </p> @@ -4130,19 +4133,20 @@ Invalid use of @': <code class="code">@image{,,2--xt}</code> <code class="code">@image{,,,3--xt}</code> -<code class="code">@image{f-ile,aze,,a--lt}</code> <img class="image" src="../images/45-f-ilejpg" alt="a–lt"/> -<code class="code">@image{f-ile,,,alt@verb{:jk _" %}}</code> <img class="image" src="../images/46-f-ilejpg" alt="altjk _" %@"/> +<code class="code">@image{f-ile,aze,,a--lt}</code> <img class="image" src="../images/49-f-ilejpg" alt="a–lt"/> +<code class="code">@image{f-ile,,,alt@verb{:jk _" %}}</code> <img class="image" src="../images/50-f-ilejpg" alt="altjk _" %@"/> -<code class="code">@image{f--ile}</code> <img class="image" src="../images/47-f--ile.png" alt="f--ile"/> -<code class="code">@image{f--ile,,,alt}</code> <img class="image" src="../images/48-f--ile.png" alt="alt"/> -<code class="code">@image{f--ile,,,,.e-d-xt}</code> <img class="image" src="../images/49-f--ile.e--xt" alt="f--ile"/> -<code class="code">@image{f--ile,l--i}</code> <img class="image" src="../images/50-f--ile.png" alt="f--ile"/> -<code class="code">@image{f--ile,,l--e}</code> <img class="image" src="../images/51-f--ile.png" alt="f--ile"/> -<code class="code">@image{f--ile,aze,az,alt,.e--xt}</code> <img class="image" src="../images/52-f--ile.e--xt" alt="alt"/> -<code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img class="image" src="../images/53-f--ile_0040..file-ext-e--xt_007d" alt="alt"/> +<code class="code">@image{f--ile}</code> <img class="image" src="../images/51-f--ile.png" alt="f--ile"/> +<code class="code">@image{f--ile,,,alt}</code> <img class="image" src="../images/52-f--ile.png" alt="alt"/> +<code class="code">@image{f--ile,,,,.e-d-xt}</code> <img class="image" src="../images/53-f--ile.e--xt" alt="f--ile"/> +<code class="code">@image{f--ile,l--i}</code> <img class="image" src="../images/54-f--ile.png" alt="f--ile"/> +<code class="code">@image{f--ile,,l--e}</code> <img class="image" src="../images/55-f--ile.png" alt="f--ile"/> +<code class="code">@image{f--ile,aze,az,alt,.e--xt}</code> <img class="image" src="../images/56-f--ile.e--xt" alt="alt"/> +<code class="code">@image{f--ile,aze,az,alt,</code> <img class="image" src="../images/57-f--ile.png" alt="alt"/> +<code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img class="image" src="../images/58-f--ile_0040..file-ext-e--xt_007d" alt="alt"/> -<code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="../images/54-f--ile.e--xt" alt="jk _" %@ in b ""/> -<code class="code">@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> <img class="image" src="../images/55-filejk-__0022-_0025_0040jpg" alt="altjk _" %@"/> +<code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="../images/59-f--ile.e--xt" alt="jk _" %@ in b ""/> +<code class="code">@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> <img class="image" src="../images/60-filejk-__0022-_0025_0040jpg" alt="altjk _" %@"/> diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml index d858fa979c..7cc0bbe4ff 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml index 5237bf3ea6..8af4b5d722 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile @@ -1835,10 +1836,11 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="../images/6-f--ile.png" alt="f--ile"/> <code class="code">@image{f--ile,,l--e}</code> <img class="image" src="../images/7-f--ile.png" alt="f--ile"/> <code class="code">@image{f--ile,aze,az,alt,.e--xt}</code> <img class="image" src="../images/8-f--ile.e--xt" alt="alt"/> -<code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img class="image" src="../images/9-f--ile_0040..file-ext-e--xt_007d" alt="alt"/> +<code class="code">@image{f--ile,aze,az,alt,</code> <img class="image" src="../images/9-f--ile.png" alt="alt"/> +<code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img class="image" src="../images/10-f--ile_0040..file-ext-e--xt_007d" alt="alt"/> </p> -<p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="../images/10-f--ile.e--xt" alt="jk _" %@ in b ""/> -<code class="code">@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> <img class="image" src="../images/11-filejk-__0022-_0025_0040jpg" alt="altjk _" %@"/> +<p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="../images/11-f--ile.e--xt" alt="jk _" %@ in b ""/> +<code class="code">@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> <img class="image" src="../images/12-filejk-__0022-_0025_0040jpg" alt="altjk _" %@"/> </p> <strong class="author">author</strong><br/> @@ -2903,19 +2905,20 @@ html '' <code class="code">@image{,,2--xt}</code> <code class="code">@image{,,,3--xt}</code> </p> -<p><code class="code">@image{f-ile,aze,,a--lt}</code> <img class="image" src="../images/12-f-ilejpg" alt="a–lt"/> -<code class="code">@image{f-ile,,,alt@verb{:jk _" %}}</code> <img class="image" src="../images/13-f-ilejpg" alt="altjk _" %@"/> +<p><code class="code">@image{f-ile,aze,,a--lt}</code> <img class="image" src="../images/13-f-ilejpg" alt="a–lt"/> +<code class="code">@image{f-ile,,,alt@verb{:jk _" %}}</code> <img class="image" src="../images/14-f-ilejpg" alt="altjk _" %@"/> </p> -<p><code class="code">@image{f--ile}</code> <img class="image" src="../images/14-f--ile.png" alt="f--ile"/> -<code class="code">@image{f--ile,,,alt}</code> <img class="image" src="../images/15-f--ile.png" alt="alt"/> -<code class="code">@image{f--ile,,,,.e-d-xt}</code> <img class="image" src="../images/16-f--ile.e--xt" alt="f--ile"/> -<code class="code">@image{f--ile,l--i}</code> <img class="image" src="../images/17-f--ile.png" alt="f--ile"/> -<code class="code">@image{f--ile,,l--e}</code> <img class="image" src="../images/18-f--ile.png" alt="f--ile"/> -<code class="code">@image{f--ile,aze,az,alt,.e--xt}</code> <img class="image" src="../images/19-f--ile.e--xt" alt="alt"/> -<code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img class="image" src="../images/20-f--ile_0040..file-ext-e--xt_007d" alt="alt"/> +<p><code class="code">@image{f--ile}</code> <img class="image" src="../images/15-f--ile.png" alt="f--ile"/> +<code class="code">@image{f--ile,,,alt}</code> <img class="image" src="../images/16-f--ile.png" alt="alt"/> +<code class="code">@image{f--ile,,,,.e-d-xt}</code> <img class="image" src="../images/17-f--ile.e--xt" alt="f--ile"/> +<code class="code">@image{f--ile,l--i}</code> <img class="image" src="../images/18-f--ile.png" alt="f--ile"/> +<code class="code">@image{f--ile,,l--e}</code> <img class="image" src="../images/19-f--ile.png" alt="f--ile"/> +<code class="code">@image{f--ile,aze,az,alt,.e--xt}</code> <img class="image" src="../images/20-f--ile.e--xt" alt="alt"/> +<code class="code">@image{f--ile,aze,az,alt,</code> <img class="image" src="../images/21-f--ile.png" alt="alt"/> +<code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img class="image" src="../images/22-f--ile_0040..file-ext-e--xt_007d" alt="alt"/> </p> -<p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="../images/21-f--ile.e--xt" alt="jk _" %@ in b ""/> -<code class="code">@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> <img class="image" src="../images/22-filejk-__0022-_0025_0040jpg" alt="altjk _" %@"/> +<p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="../images/23-f--ile.e--xt" alt="jk _" %@ in b ""/> +<code class="code">@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> <img class="image" src="../images/24-filejk-__0022-_0025_0040jpg" alt="altjk _" %@"/> </p> diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml index 5667d09fd9..a48b59e231 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml index 6858c07d69..055f5a7576 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml index e2bce7d4dd..666cabe9b1 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml index 435c4bd0df..6284272b7c 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml index 8ad0ed307a..812e907f47 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml index 8058f19b99..08efc54868 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml index 070dba5776..e99a64defd 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml index f5e5e1842b..c6968d2247 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/anchor.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/anchor.html index 58e8ff9a82..2eac27e922 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/anchor.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/anchor.html @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/chapter.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/chapter.html index 20d7b600c7..2df2150732 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/chapter.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/chapter.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile @@ -1865,6 +1866,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -2940,6 +2942,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -4153,6 +4156,7 @@ Invalid use of @': <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> <code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/chapter2.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/chapter2.html index 1967af8151..c7358eeba4 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/chapter2.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/chapter2.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html index 792de3cfaa..1d43ba4665 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html index dfd7eb4297..4f19e2fb88 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html index 5591c7c854..a00bcb40cf 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/index.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/index.html index 1f876396f7..bac8d2bced 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/index.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/index.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html index d50ed8023e..aded9374ff 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/subsection.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/subsection.html index a421540d66..5f3e077660 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/subsection.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/subsection.html @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html index 3638f5c5c2..fb465ab541 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html index 6b9beaa1fa..b50df0a305 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html index e92de14c54..728253dc17 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile @@ -1850,6 +1851,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -2927,6 +2929,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -4060,6 +4063,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -5135,6 +5139,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -6352,6 +6357,7 @@ Invalid use of @': <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> <code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html/formatting.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html/formatting.html index b19ddf3488..7b585d3c1c 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html/formatting.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html/formatting.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile @@ -1850,6 +1851,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -2927,6 +2929,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -4060,6 +4063,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -5135,6 +5139,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -6352,6 +6357,7 @@ Invalid use of @': <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> <code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html32/formatting.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html32/formatting.html index 4ca8811576..5a0af855dd 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html32/formatting.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html32/formatting.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile @@ -1786,6 +1787,7 @@ html '' <code>@image{f--ile,l--i}</code> <img src="f--ile.png" alt="f--ile"> <code>@image{f--ile,,l--e}</code> <img src="f--ile.png" alt="f--ile"> <code>@image{f--ile,aze,az,alt,.e--xt}</code> <img src="f--ile.e--xt" alt="alt"> +<code>@image{f--ile,aze,az,alt,</code> <img src="f--ile.png" alt="alt"> <code>@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img src="f--ile%40..file%20ext%20e--xt%7d" alt="alt"> </p> <p><code>@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -2837,6 +2839,7 @@ html '' <code>@image{f--ile,l--i}</code> <img src="f--ile.png" alt="f--ile"> <code>@image{f--ile,,l--e}</code> <img src="f--ile.png" alt="f--ile"> <code>@image{f--ile,aze,az,alt,.e--xt}</code> <img src="f--ile.e--xt" alt="alt"> +<code>@image{f--ile,aze,az,alt,</code> <img src="f--ile.png" alt="alt"> <code>@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img src="f--ile%40..file%20ext%20e--xt%7d" alt="alt"> </p> <p><code>@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -3944,6 +3947,7 @@ html '' <code>@image{f--ile,l--i}</code> <img src="f--ile.png" alt="f--ile"> <code>@image{f--ile,,l--e}</code> <img src="f--ile.png" alt="f--ile"> <code>@image{f--ile,aze,az,alt,.e--xt}</code> <img src="f--ile.e--xt" alt="alt"> +<code>@image{f--ile,aze,az,alt,</code> <img src="f--ile.png" alt="alt"> <code>@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img src="f--ile%40..file%20ext%20e--xt%7d" alt="alt"> </p> <p><code>@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -4993,6 +4997,7 @@ html '' <code>@image{f--ile,l--i}</code> <img src="f--ile.png" alt="f--ile"> <code>@image{f--ile,,l--e}</code> <img src="f--ile.png" alt="f--ile"> <code>@image{f--ile,aze,az,alt,.e--xt}</code> <img src="f--ile.e--xt" alt="alt"> +<code>@image{f--ile,aze,az,alt,</code> <img src="f--ile.png" alt="alt"> <code>@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img src="f--ile%40..file%20ext%20e--xt%7d" alt="alt"> </p> <p><code>@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -6183,6 +6188,7 @@ Invalid use of @': <code>@image{f--ile,l--i}</code> <img src="f--ile.png" alt="f--ile"> <code>@image{f--ile,,l--e}</code> <img src="f--ile.png" alt="f--ile"> <code>@image{f--ile,aze,az,alt,.e--xt}</code> <img src="f--ile.e--xt" alt="alt"> +<code>@image{f--ile,aze,az,alt,</code> <img src="f--ile.png" alt="alt"> <code>@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img src="f--ile%40..file%20ext%20e--xt%7d" alt="alt"> <code>@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img src="f--ile.e--xt" alt="jk _" %@ in b ""> diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html index 2c3379a299..3468d34a7f 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile @@ -1904,6 +1905,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -2979,6 +2981,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -4196,6 +4199,7 @@ Invalid use of @': <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> <code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html index 19eea1b795..d8732d61a9 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html index cbe15ee7f7..f030643246 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile @@ -1866,6 +1867,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -2941,6 +2943,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -4158,6 +4161,7 @@ Invalid use of @': <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> <code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html index b4241e0b5d..bc1878eb2b 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html index 89f4a75041..f8d8908f2c 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html index 1e3fbc606d..545aa91a8e 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html index d22ca217a9..c785c63044 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html index fdcc1de8a8..40d0599933 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/index.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/index.html index db31439ac6..187dd71529 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/index.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/index.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile @@ -1839,6 +1840,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -2916,6 +2918,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html index b97e8a4699..f80e25130b 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html index 9cd9a9b677..0e43bd3a8c 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html index 02ef65c92b..e413d27a15 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html index e63bbdcfc0..b804676cfb 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_info/formatting.info b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_info/formatting.info index 8d8c787308..85613a77bf 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_info/formatting.info +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_info/formatting.info @@ -582,6 +582,7 @@ aaa" aaa" aaa" '@image{f--ile,aze,az,alt,.e--xt}' +aaa" aaa" '@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}' [alt] @@ -1292,6 +1293,7 @@ aaa" aaa" aaa" '@image{f--ile,aze,az,alt,.e--xt}' +aaa" aaa" '@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}' [alt] @@ -1959,6 +1961,7 @@ aaa" aaa" aaa" '@image{f--ile,aze,az,alt,.e--xt}' +aaa" aaa" '@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}' [alt] @@ -2795,6 +2798,8 @@ aaa" aaa" @image{f--ile,aze,az,alt,.e--xt} aaa" + @image{f--ile,aze,az,alt, +aaa" @image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@} [alt] @image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt} @@ -2895,14 +2900,14 @@ aaa" * Menu: -* truc: chapter. (line 2172) +* truc: chapter. (line 2173) codeidx * Menu: -* a INDEX---ENTRY tẽ --- î: chapter. (line 2172) +* a INDEX---ENTRY tẽ --- î: chapter. (line 2173) cp @@ -2915,20 +2920,20 @@ aaa" * -option: chapter. (line 28) * -option <1>: chapter. (line 688) * -option <2>: chapter. (line 1359) -* .: chapter. (line 2172) -* ?: chapter. (line 2172) -* a: chapter. (line 2172) -* aaa, bbb: chapter. (line 2172) -* a--a: chapter. (line 2172) +* .: chapter. (line 2173) +* ?: chapter. (line 2173) +* a: chapter. (line 2173) +* aaa, bbb: chapter. (line 2173) +* a--a: chapter. (line 2173) * a--asis: chapter. (line 500) * a--asis <1>: chapter. (line 1160) * a--asis <2>: chapter. (line 1958) * b: chapter. (line 501) * b <1>: chapter. (line 1161) * b <2>: chapter. (line 1959) -* b--b, c--c: chapter. (line 2172) +* b--b, c--c: chapter. (line 2173) * counting entry: chapter. (line 4) -* d--dd, e--ee, f--ff: chapter. (line 2172) +* d--dd, e--ee, f--ff: chapter. (line 2173) * d--efcv_name: chapter. (line 341) * d--efcv_name <1>: chapter. (line 344) * d--efcv_name <2>: chapter. (line 1001) @@ -2971,13 +2976,13 @@ aaa" * d--efvr_name: chapter. (line 317) * d--efvr_name <1>: chapter. (line 977) * d--efvr_name <2>: chapter. (line 1775) -* g--gg, h--hh jjj, k--kk, l--ll: chapter. (line 2172) +* g--gg, h--hh jjj, k--kk, l--ll: chapter. (line 2173) * index entry between item and itemx: chapter. (line 505) * index entry between item and itemx <1>: chapter. (line 623) * index entry between item and itemx <2>: chapter. (line 1165) * index entry between item and itemx <3>: chapter. (line 1283) * index entry between item and itemx <4>: chapter. (line 1963) -* index entry between item and itemx <5>: chapter. (line 2113) +* index entry between item and itemx <5>: chapter. (line 2114) * index entry in footnote: chapter. (line 4) * index entry within deffn: chapter. (line 292) * index entry within deffn <1>: chapter. (line 952) @@ -2988,8 +2993,8 @@ aaa" * index entry within multitable: chapter. (line 225) * index entry within multitable <1>: chapter. (line 885) * index entry within multitable <2>: chapter. (line 1682) -* t-ruc: chapter. (line 2172) -* T-ruc: chapter. (line 2172) +* t-ruc: chapter. (line 2173) +* T-ruc: chapter. (line 2173) * vtable i--tem code kbdinputstyle: chapter. (line 127) * vtable i--tem code kbdinputstyle <1>: chapter. (line 787) * vtable i--tem code kbdinputstyle <2>: chapter. (line 1582) @@ -3029,8 +3034,8 @@ aaa" * --foption: chapter. (line 28) * --foption <1>: chapter. (line 688) * --foption <2>: chapter. (line 1359) -* .: chapter. (line 2172) -* ?: chapter. (line 2172) +* .: chapter. (line 2173) +* ?: chapter. (line 2173) * ``: chapter. (line 28) * `` <1>: chapter. (line 688) * `` <2>: chapter. (line 1359) @@ -3042,11 +3047,11 @@ aaa" * a <5>: chapter. (line 1282) * a <6>: chapter. (line 1761) * a <7>: chapter. (line 1962) -* a <8>: chapter. (line 2112) -* a <9>: chapter. (line 2172) +* a <8>: chapter. (line 2113) +* a <9>: chapter. (line 2173) * after: chapter. (line 633) * after <1>: chapter. (line 1293) -* after <2>: chapter. (line 2123) +* after <2>: chapter. (line 2124) * arg2: chapter. (line 424) * arg2 <1>: chapter. (line 1084) * arg2 <2>: chapter. (line 1884) @@ -3055,7 +3060,7 @@ aaa" * b <2>: chapter. (line 1165) * b <3>: chapter. (line 1283) * b <4>: chapter. (line 1963) -* b <5>: chapter. (line 2113) +* b <5>: chapter. (line 2114) * bidule machin: chapter. (line 300) * bidule machin <1>: chapter. (line 960) * bidule machin <2>: chapter. (line 1756) @@ -3122,16 +3127,16 @@ aaa" * deffnx <3>: chapter. (line 971) * deffnx <4>: chapter. (line 1762) * deffnx <5>: chapter. (line 1768) -* f---aa: chapter. (line 2172) -* f---bb, f---cc: chapter. (line 2172) -* f---ddd, f---eee, ffff: chapter. (line 2172) -* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter. (line 2172) +* f---aa: chapter. (line 2173) +* f---bb, f---cc: chapter. (line 2173) +* f---ddd, f---eee, ffff: chapter. (line 2173) +* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter. (line 2173) * followed: chapter. (line 303) * followed <1>: chapter. (line 631) * followed <2>: chapter. (line 963) * followed <3>: chapter. (line 1291) * followed <4>: chapter. (line 1759) -* followed <5>: chapter. (line 2121) +* followed <5>: chapter. (line 2122) * I: chapter. (line 291) * I <1>: chapter. (line 313) * I <2>: chapter. (line 951) @@ -3146,7 +3151,7 @@ aaa" * id ule <2>: chapter. (line 1752) * INVALID: chapter. (line 635) * INVALID <1>: chapter. (line 1295) -* INVALID <2>: chapter. (line 2125) +* INVALID <2>: chapter. (line 2126) * log trap: chapter. (line 293) * log trap <1>: chapter. (line 953) * log trap <2>: chapter. (line 1749) @@ -3170,10 +3175,10 @@ aaa" * machin <11>: chapter. (line 1290) * machin <12>: chapter. (line 1755) * machin <13>: chapter. (line 1757) -* machin <14>: chapter. (line 2117) -* machin <15>: chapter. (line 2118) -* machin <16>: chapter. (line 2119) -* machin <17>: chapter. (line 2120) +* machin <14>: chapter. (line 2118) +* machin <15>: chapter. (line 2119) +* machin <16>: chapter. (line 2120) +* machin <17>: chapter. (line 2121) * n--ame: chapter. (line 320) * n--ame <1>: chapter. (line 323) * n--ame <2>: chapter. (line 980) @@ -3183,15 +3188,15 @@ aaa" * name2: chapter. (line 398) * name2 <1>: chapter. (line 1058) * name2 <2>: chapter. (line 1857) -* t--ruc: chapter. (line 2172) -* T--ruc: chapter. (line 2172) +* t--ruc: chapter. (line 2173) +* T--ruc: chapter. (line 2173) * truc: chapter. (line 292) * truc <1>: chapter. (line 314) * truc <2>: chapter. (line 952) * truc <3>: chapter. (line 974) * truc <4>: chapter. (line 1748) * truc <5>: chapter. (line 1771) -* xxx, zzz: chapter. (line 2172) +* xxx, zzz: chapter. (line 2173) vr @@ -3294,20 +3299,20 @@ chapter 2 * -option: chapter. (line 28) * -option <1>: chapter. (line 688) * -option <2>: chapter. (line 1359) -* .: chapter. (line 2172) -* ?: chapter. (line 2172) -* a: chapter. (line 2172) -* aaa, bbb: chapter. (line 2172) -* a--a: chapter. (line 2172) +* .: chapter. (line 2173) +* ?: chapter. (line 2173) +* a: chapter. (line 2173) +* aaa, bbb: chapter. (line 2173) +* a--a: chapter. (line 2173) * a--asis: chapter. (line 500) * a--asis <1>: chapter. (line 1160) * a--asis <2>: chapter. (line 1958) * b: chapter. (line 501) * b <1>: chapter. (line 1161) * b <2>: chapter. (line 1959) -* b--b, c--c: chapter. (line 2172) -* counting entry: chapter. (line 2522) -* d--dd, e--ee, f--ff: chapter. (line 2172) +* b--b, c--c: chapter. (line 2173) +* counting entry: chapter. (line 2523) +* d--dd, e--ee, f--ff: chapter. (line 2173) * d--efcv_name: chapter. (line 341) * d--efcv_name <1>: chapter. (line 344) * d--efcv_name <2>: chapter. (line 1001) @@ -3350,14 +3355,14 @@ chapter 2 * d--efvr_name: chapter. (line 317) * d--efvr_name <1>: chapter. (line 977) * d--efvr_name <2>: chapter. (line 1775) -* g--gg, h--hh jjj, k--kk, l--ll: chapter. (line 2172) +* g--gg, h--hh jjj, k--kk, l--ll: chapter. (line 2173) * index entry between item and itemx: chapter. (line 505) * index entry between item and itemx <1>: chapter. (line 623) * index entry between item and itemx <2>: chapter. (line 1165) * index entry between item and itemx <3>: chapter. (line 1283) * index entry between item and itemx <4>: chapter. (line 1963) -* index entry between item and itemx <5>: chapter. (line 2113) -* index entry in footnote: chapter. (line 2517) +* index entry between item and itemx <5>: chapter. (line 2114) +* index entry in footnote: chapter. (line 2518) * index entry within deffn: chapter. (line 292) * index entry within deffn <1>: chapter. (line 952) * index entry within deffn <2>: chapter. (line 1748) @@ -3367,8 +3372,8 @@ chapter 2 * index entry within multitable: chapter. (line 225) * index entry within multitable <1>: chapter. (line 885) * index entry within multitable <2>: chapter. (line 1682) -* t-ruc: chapter. (line 2172) -* T-ruc: chapter. (line 2172) +* t-ruc: chapter. (line 2173) +* T-ruc: chapter. (line 2173) * vtable i--tem code kbdinputstyle: chapter. (line 127) * vtable i--tem code kbdinputstyle <1>: chapter. (line 787) * vtable i--tem code kbdinputstyle <2>: chapter. (line 1582) @@ -3406,8 +3411,8 @@ chapter 2 * --foption: chapter. (line 28) * --foption <1>: chapter. (line 688) * --foption <2>: chapter. (line 1359) -* .: chapter. (line 2172) -* ?: chapter. (line 2172) +* .: chapter. (line 2173) +* ?: chapter. (line 2173) * ``: chapter. (line 28) * `` <1>: chapter. (line 688) * `` <2>: chapter. (line 1359) @@ -3419,11 +3424,11 @@ chapter 2 * a <5>: chapter. (line 1282) * a <6>: chapter. (line 1761) * a <7>: chapter. (line 1962) -* a <8>: chapter. (line 2112) -* a <9>: chapter. (line 2172) +* a <8>: chapter. (line 2113) +* a <9>: chapter. (line 2173) * after: chapter. (line 633) * after <1>: chapter. (line 1293) -* after <2>: chapter. (line 2123) +* after <2>: chapter. (line 2124) * arg2: chapter. (line 424) * arg2 <1>: chapter. (line 1084) * arg2 <2>: chapter. (line 1884) @@ -3432,7 +3437,7 @@ chapter 2 * b <2>: chapter. (line 1165) * b <3>: chapter. (line 1283) * b <4>: chapter. (line 1963) -* b <5>: chapter. (line 2113) +* b <5>: chapter. (line 2114) * bidule machin: chapter. (line 300) * bidule machin <1>: chapter. (line 960) * bidule machin <2>: chapter. (line 1756) @@ -3499,16 +3504,16 @@ chapter 2 * deffnx <3>: chapter. (line 971) * deffnx <4>: chapter. (line 1762) * deffnx <5>: chapter. (line 1768) -* f---aa: chapter. (line 2172) -* f---bb, f---cc: chapter. (line 2172) -* f---ddd, f---eee, ffff: chapter. (line 2172) -* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter. (line 2172) +* f---aa: chapter. (line 2173) +* f---bb, f---cc: chapter. (line 2173) +* f---ddd, f---eee, ffff: chapter. (line 2173) +* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter. (line 2173) * followed: chapter. (line 303) * followed <1>: chapter. (line 631) * followed <2>: chapter. (line 963) * followed <3>: chapter. (line 1291) * followed <4>: chapter. (line 1759) -* followed <5>: chapter. (line 2121) +* followed <5>: chapter. (line 2122) * I: chapter. (line 291) * I <1>: chapter. (line 313) * I <2>: chapter. (line 951) @@ -3523,7 +3528,7 @@ chapter 2 * id ule <2>: chapter. (line 1752) * INVALID: chapter. (line 635) * INVALID <1>: chapter. (line 1295) -* INVALID <2>: chapter. (line 2125) +* INVALID <2>: chapter. (line 2126) * log trap: chapter. (line 293) * log trap <1>: chapter. (line 953) * log trap <2>: chapter. (line 1749) @@ -3547,10 +3552,10 @@ chapter 2 * machin <11>: chapter. (line 1290) * machin <12>: chapter. (line 1755) * machin <13>: chapter. (line 1757) -* machin <14>: chapter. (line 2117) -* machin <15>: chapter. (line 2118) -* machin <16>: chapter. (line 2119) -* machin <17>: chapter. (line 2120) +* machin <14>: chapter. (line 2118) +* machin <15>: chapter. (line 2119) +* machin <16>: chapter. (line 2120) +* machin <17>: chapter. (line 2121) * n--ame: chapter. (line 320) * n--ame <1>: chapter. (line 323) * n--ame <2>: chapter. (line 980) @@ -3560,35 +3565,35 @@ chapter 2 * name2: chapter. (line 398) * name2 <1>: chapter. (line 1058) * name2 <2>: chapter. (line 1857) -* t--ruc: chapter. (line 2172) -* T--ruc: chapter. (line 2172) +* t--ruc: chapter. (line 2173) +* T--ruc: chapter. (line 2173) * truc: chapter. (line 292) * truc <1>: chapter. (line 314) * truc <2>: chapter. (line 952) * truc <3>: chapter. (line 974) * truc <4>: chapter. (line 1748) * truc <5>: chapter. (line 1771) -* xxx, zzz: chapter. (line 2172) +* xxx, zzz: chapter. (line 2173) Tag Table: -Node: Top18466 -Node: chapter18651 -Ref: chapter-Footnote-196760 -Ref: chapter-Footnote-296780 -Ref: chapter-Footnote-396801 -Ref: chapter-Footnote-496821 -Ref: chapter-Footnote-596842 -Ref: chapter-Footnote-696862 -Ref: chapter-Footnote-796883 -Ref: chapter-Footnote-896921 -Node: s--ect,ion96941 -Node: subsection97144 -Ref: anchor97325 -Node: subsubsection ``simple-double--97325 -Node: subsubsection three---four----''97525 -Node: chapter297697 +Node: Top18548 +Node: chapter18733 +Ref: chapter-Footnote-197091 +Ref: chapter-Footnote-297111 +Ref: chapter-Footnote-397132 +Ref: chapter-Footnote-497152 +Ref: chapter-Footnote-597173 +Ref: chapter-Footnote-697193 +Ref: chapter-Footnote-797214 +Ref: chapter-Footnote-897252 +Node: s--ect,ion97272 +Node: subsection97475 +Ref: anchor97656 +Node: subsubsection ``simple-double--97656 +Node: subsubsection three---four----''97856 +Node: chapter298028 End Tag Table diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_inline_css/formatting.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_inline_css/formatting.html index c65d5e044b..71b8432a0c 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_inline_css/formatting.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_inline_css/formatting.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile @@ -1812,6 +1813,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -2889,6 +2891,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -4022,6 +4025,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -5097,6 +5101,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -6314,6 +6319,7 @@ Invalid use of @': <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> <code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_latex/formatting.tex b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_latex/formatting.tex index 6c16a66b7f..a8486a3c59 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_latex/formatting.tex +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_latex/formatting.tex @@ -91,6 +91,11 @@ roundcorner=10pt} + + + + + \begin{document} \frontmatter @@ -1571,6 +1576,7 @@ Invalid use of @':\leavevmode{}\\ \texttt{@image\{f{-}{-}ile,l{-}{-}i\}} \includegraphics[width=l--i]{f--ile} \texttt{@image\{f{-}{-}ile{,}{,}l{-}{-}e\}} \includegraphics[height=l--e]{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\{@file\{f{-}{-}ile\}@@@.,aze,az,alt,@file\{.file ext\}\ e{-}{-}xt@\}} \includegraphics[width=aze,height=az]{f--ile@.} \texttt{@image\{f{-}{-}ile,aze,az,@verb\{:jk \_" \%@:\}\ @b\{in b "\},e{-}{-}xt\}} \includegraphics[width=aze,height=az]{f--ile} @@ -3220,6 +3226,7 @@ Invalid use of @':\leavevmode{}\\ \texttt{@image\{f{-}{-}ile,l{-}{-}i\}} \includegraphics[width=l--i]{f--ile} \texttt{@image\{f{-}{-}ile{,}{,}l{-}{-}e\}} \includegraphics[height=l--e]{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\{@file\{f{-}{-}ile\}@@@.,aze,az,alt,@file\{.file ext\}\ e{-}{-}xt@\}} \includegraphics[width=aze,height=az]{f--ile@.} \texttt{@image\{f{-}{-}ile,aze,az,@verb\{:jk \_" \%@:\}\ @b\{in b "\},e{-}{-}xt\}} \includegraphics[width=aze,height=az]{f--ile} @@ -3411,11 +3418,6 @@ g--roupe \pagestyle{single}% \mainmatter \tableofcontents\newpage - - - - - \label{anchor:Top}% \chapter{{chapter}} \label{anchor:chapter}% @@ -4890,6 +4892,7 @@ Invalid use of @':\leavevmode{}\\ \texttt{@image\{f{-}{-}ile,l{-}{-}i\}} \includegraphics[width=l--i]{f--ile} \texttt{@image\{f{-}{-}ile{,}{,}l{-}{-}e\}} \includegraphics[height=l--e]{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\{@file\{f{-}{-}ile\}@@@.,aze,az,alt,@file\{.file ext\}\ e{-}{-}xt@\}} \includegraphics[width=aze,height=az]{f--ile@.} \texttt{@image\{f{-}{-}ile,aze,az,@verb\{:jk \_" \%@:\}\ @b\{in b "\},e{-}{-}xt\}} \includegraphics[width=aze,height=az]{f--ile} @@ -6538,6 +6541,7 @@ Invalid use of @':\leavevmode{}\\ \texttt{@image\{f{-}{-}ile,l{-}{-}i\}} \includegraphics[width=l--i]{f--ile} \texttt{@image\{f{-}{-}ile{,}{,}l{-}{-}e\}} \includegraphics[height=l--e]{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\{@file\{f{-}{-}ile\}@@@.,aze,az,alt,@file\{.file ext\}\ e{-}{-}xt@\}} \includegraphics[width=aze,height=az]{f--ile@.} \texttt{@image\{f{-}{-}ile,aze,az,@verb\{:jk \_" \%@:\}\ @b\{in b "\},e{-}{-}xt\}} \includegraphics[width=aze,height=az]{f--ile} @@ -8655,6 +8659,7 @@ Invalid use of @':\leavevmode{}\\ \texttt{@image\{f{-}{-}ile,l{-}{-}i\}}\ \includegraphics[width=l--i]{f--ile} \texttt{@image\{f{-}{-}ile{,}{,}l{-}{-}e\}}\ \includegraphics[height=l--e]{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\{@file\{f{-}{-}ile\}@@@.,aze,az,alt,@file\{.file ext\}\ e{-}{-}xt@\}}\ \includegraphics[width=aze,height=az]{f--ile@.} \texttt{@image\{f{-}{-}ile,aze,az,@verb\{:jk \_" \%@:\}\ @b\{in b "\},e{-}{-}xt\}}\ \includegraphics[width=aze,height=az]{f--ile} diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_macro_expand/formatting.texi b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_macro_expand/formatting.texi index 72896e67c0..629c3d19e8 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_macro_expand/formatting.texi +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_macro_expand/formatting.texi @@ -1056,6 +1056,7 @@ Invalid use of @@':@* @code{@@image@{f--ile,l--i@}} @image{f--ile,l--i} @code{@@image@{f--ile,,l--e@}} @image{f--ile,,l--e} @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@{@@file@{f--ile@}@@@@@@.,aze,az,alt,@@file@{.file ext@} e--xt@@@}} @image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}} @c It is not reliable to use @verb inside other Texinfo constructs @@ -2201,6 +2202,7 @@ Invalid use of @@':@* @code{@@image@{f--ile,l--i@}} @image{f--ile,l--i} @code{@@image@{f--ile,,l--e@}} @image{f--ile,,l--e} @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@{@@file@{f--ile@}@@@@@@.,aze,az,alt,@@file@{.file ext@} e--xt@@@}} @image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}} @c It is not reliable to use @verb inside other Texinfo constructs @@ -3350,6 +3352,7 @@ Invalid use of @@':@* @code{@@image@{f--ile,l--i@}} @image{f--ile,l--i} @code{@@image@{f--ile,,l--e@}} @image{f--ile,,l--e} @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@{@@file@{f--ile@}@@@@@@.,aze,az,alt,@@file@{.file ext@} e--xt@@@}} @image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}} @c It is not reliable to use @verb inside other Texinfo constructs @@ -4525,6 +4528,7 @@ Invalid use of @@':@* @code{@@image@{f--ile,l--i@}} @image{f--ile,l--i} @code{@@image@{f--ile,,l--e@}} @image{f--ile,,l--e} @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@{@@file@{f--ile@}@@@@@@.,aze,az,alt,@@file@{.file ext@} e--xt@@@}} @image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}} @c It is not reliable to use @verb inside other Texinfo constructs @@ -5681,6 +5685,7 @@ Invalid use of @@':@* @code{@@image@{f--ile,l--i@}} @image{f--ile,l--i} @code{@@image@{f--ile,,l--e@}} @image{f--ile,,l--e} @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@{@@file@{f--ile@}@@@@@@.,aze,az,alt,@@file@{.file ext@} e--xt@@@}} @image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}} @c It is not reliable to use @verb inside other Texinfo constructs diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_mathjax/formatting.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_mathjax/formatting.html index 7df1f66798..352697fc96 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_mathjax/formatting.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_mathjax/formatting.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile @@ -1858,6 +1859,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -2933,6 +2935,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -4064,6 +4067,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -5137,6 +5141,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -6352,6 +6357,7 @@ Invalid use of @': <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> <code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/anchor.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/anchor.html index 19eea1b795..d8732d61a9 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/anchor.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/anchor.html @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/chapter.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/chapter.html index cbe15ee7f7..f030643246 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/chapter.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/chapter.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile @@ -1866,6 +1867,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -2941,6 +2943,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -4158,6 +4161,7 @@ Invalid use of @': <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> <code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/chapter2.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/chapter2.html index b4241e0b5d..bc1878eb2b 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/chapter2.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/chapter2.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html index 89f4a75041..f8d8908f2c 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html index 1e3fbc606d..545aa91a8e 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html index d22ca217a9..c785c63044 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html index fdcc1de8a8..40d0599933 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/index.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/index.html index db31439ac6..187dd71529 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/index.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/index.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile @@ -1839,6 +1840,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -2916,6 +2918,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html index b97e8a4699..f80e25130b 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsection.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsection.html index 9cd9a9b677..0e43bd3a8c 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsection.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsection.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html index 02ef65c92b..e413d27a15 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html index e63bbdcfc0..b804676cfb 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html index 2cb8452876..9cb1408fef 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile @@ -1850,6 +1851,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -2927,6 +2929,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -4060,6 +4063,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -5135,6 +5139,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -6352,6 +6357,7 @@ Invalid use of @': <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> <code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt index 3b07b4487c..aa5e4696fd 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt @@ -595,6 +595,7 @@ aaa '@image{f--ile,l--i}' ggg aaa '@image{f--ile,,l--e}' ggg aaa '@image{f--ile,aze,az,alt,.e--xt}' ggg +aaa '@image{f--ile,aze,az,alt,' ggg aaa '@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}' [alt] @@ -1262,6 +1263,7 @@ aaa '@image{f--ile,l--i}' ggg aaa '@image{f--ile,,l--e}' ggg aaa '@image{f--ile,aze,az,alt,.e--xt}' ggg +aaa '@image{f--ile,aze,az,alt,' ggg aaa '@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}' [alt] @@ -2098,6 +2100,8 @@ aaa aaa @image{f--ile,aze,az,alt,.e--xt} ggg aaa + @image{f--ile,aze,az,alt, ggg +aaa @image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@} [alt] @image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt} ggg @@ -2197,300 +2201,300 @@ aaa * Menu: -* truc: chapter. (line 2193) +* truc: chapter. (line 2197) codeidx * Menu: -* a INDEX---ENTRY tẽ --- î: chapter. (line 2193) +* a INDEX---ENTRY tẽ --- î: chapter. (line 2197) cp * Menu: * ": chapter. (line 28) -* " <1>: chapter. (line 695) -* " <2>: chapter. (line 1373) +* " <1>: chapter. (line 696) +* " <2>: chapter. (line 1375) * -option: chapter. (line 28) -* -option <1>: chapter. (line 695) -* -option <2>: chapter. (line 1373) -* .: chapter. (line 2193) -* ?: chapter. (line 2193) -* a: chapter. (line 2193) -* aaa, bbb: chapter. (line 2193) -* a--a: chapter. (line 2193) +* -option <1>: chapter. (line 696) +* -option <2>: chapter. (line 1375) +* .: chapter. (line 2197) +* ?: chapter. (line 2197) +* a: chapter. (line 2197) +* aaa, bbb: chapter. (line 2197) +* a--a: chapter. (line 2197) * a--asis: chapter. (line 500) -* a--asis <1>: chapter. (line 1167) -* a--asis <2>: chapter. (line 1972) +* a--asis <1>: chapter. (line 1168) +* a--asis <2>: chapter. (line 1974) * b: chapter. (line 501) -* b <1>: chapter. (line 1168) -* b <2>: chapter. (line 1973) -* b--b, c--c: chapter. (line 2193) +* b <1>: chapter. (line 1169) +* b <2>: chapter. (line 1975) +* b--b, c--c: chapter. (line 2197) * counting entry: chapter. (line 0) -* d--dd, e--ee, f--ff: chapter. (line 2193) +* d--dd, e--ee, f--ff: chapter. (line 2197) * d--efcv_name: chapter. (line 341) * d--efcv_name <1>: chapter. (line 344) -* d--efcv_name <2>: chapter. (line 1008) -* d--efcv_name <3>: chapter. (line 1011) -* d--efcv_name <4>: chapter. (line 1813) -* d--efcv_name <5>: chapter. (line 1816) +* d--efcv_name <2>: chapter. (line 1009) +* d--efcv_name <3>: chapter. (line 1012) +* d--efcv_name <4>: chapter. (line 1815) +* d--efcv_name <5>: chapter. (line 1818) * d--efivar_name of c--lass: chapter. (line 386) -* d--efivar_name of c--lass <1>: chapter. (line 1053) -* d--efivar_name of c--lass <2>: chapter. (line 1858) +* d--efivar_name of c--lass <1>: chapter. (line 1054) +* d--efivar_name of c--lass <2>: chapter. (line 1860) * d--efopt_name: chapter. (line 377) -* d--efopt_name <1>: chapter. (line 1044) -* d--efopt_name <2>: chapter. (line 1849) +* d--efopt_name <1>: chapter. (line 1045) +* d--efopt_name <2>: chapter. (line 1851) * d--eftypecv_name of c--lass: chapter. (line 347) * d--eftypecv_name of c--lass <1>: chapter. (line 350) -* d--eftypecv_name of c--lass <2>: chapter. (line 1014) -* d--eftypecv_name of c--lass <3>: chapter. (line 1017) -* d--eftypecv_name of c--lass <4>: chapter. (line 1819) -* d--eftypecv_name of c--lass <5>: chapter. (line 1822) +* d--eftypecv_name of c--lass <2>: chapter. (line 1015) +* d--eftypecv_name of c--lass <3>: chapter. (line 1018) +* d--eftypecv_name of c--lass <4>: chapter. (line 1821) +* d--eftypecv_name of c--lass <5>: chapter. (line 1824) * d--eftypecv_name2 of c--lass2: chapter. (line 418) * d--eftypecv_name2 of c--lass2 <1>: chapter. (line 421) -* d--eftypecv_name2 of c--lass2 <2>: chapter. (line 1085) -* d--eftypecv_name2 of c--lass2 <3>: chapter. (line 1088) -* d--eftypecv_name2 of c--lass2 <4>: chapter. (line 1891) -* d--eftypecv_name2 of c--lass2 <5>: chapter. (line 1894) +* d--eftypecv_name2 of c--lass2 <2>: chapter. (line 1086) +* d--eftypecv_name2 of c--lass2 <3>: chapter. (line 1089) +* d--eftypecv_name2 of c--lass2 <4>: chapter. (line 1893) +* d--eftypecv_name2 of c--lass2 <5>: chapter. (line 1896) * d--eftypeivar_name of c--lass: chapter. (line 389) -* d--eftypeivar_name of c--lass <1>: chapter. (line 1056) -* d--eftypeivar_name of c--lass <2>: chapter. (line 1861) +* d--eftypeivar_name of c--lass <1>: chapter. (line 1057) +* d--eftypeivar_name of c--lass <2>: chapter. (line 1863) * d--eftypevar_name: chapter. (line 383) -* d--eftypevar_name <1>: chapter. (line 1050) -* d--eftypevar_name <2>: chapter. (line 1855) +* d--eftypevar_name <1>: chapter. (line 1051) +* d--eftypevar_name <2>: chapter. (line 1857) * d--eftypevr_name: chapter. (line 338) -* d--eftypevr_name <1>: chapter. (line 1005) -* d--eftypevr_name <2>: chapter. (line 1810) +* d--eftypevr_name <1>: chapter. (line 1006) +* d--eftypevr_name <2>: chapter. (line 1812) * d--efvar_name: chapter. (line 371) * d--efvar_name <1>: chapter. (line 374) -* d--efvar_name <2>: chapter. (line 1038) -* d--efvar_name <3>: chapter. (line 1041) -* d--efvar_name <4>: chapter. (line 1843) -* d--efvar_name <5>: chapter. (line 1846) +* d--efvar_name <2>: chapter. (line 1039) +* d--efvar_name <3>: chapter. (line 1042) +* d--efvar_name <4>: chapter. (line 1845) +* d--efvar_name <5>: chapter. (line 1848) * d--efvr_name: chapter. (line 317) -* d--efvr_name <1>: chapter. (line 984) -* d--efvr_name <2>: chapter. (line 1789) -* g--gg, h--hh jjj, k--kk, l--ll: chapter. (line 2193) +* d--efvr_name <1>: chapter. (line 985) +* d--efvr_name <2>: chapter. (line 1791) +* g--gg, h--hh jjj, k--kk, l--ll: chapter. (line 2197) * index entry between item and itemx: chapter. (line 505) -* index entry between item and itemx <1>: chapter. (line 630) -* index entry between item and itemx <2>: chapter. (line 1172) -* index entry between item and itemx <3>: chapter. (line 1297) -* index entry between item and itemx <4>: chapter. (line 1977) -* index entry between item and itemx <5>: chapter. (line 2134) +* index entry between item and itemx <1>: chapter. (line 631) +* index entry between item and itemx <2>: chapter. (line 1173) +* index entry between item and itemx <3>: chapter. (line 1299) +* index entry between item and itemx <4>: chapter. (line 1979) +* index entry between item and itemx <5>: chapter. (line 2138) * index entry in footnote: chapter. (line 0) * index entry within deffn: chapter. (line 292) -* index entry within deffn <1>: chapter. (line 959) -* index entry within deffn <2>: chapter. (line 1762) +* index entry within deffn <1>: chapter. (line 960) +* index entry within deffn <2>: chapter. (line 1764) * index entry within itemize: chapter. (line 203) -* index entry within itemize <1>: chapter. (line 870) -* index entry within itemize <2>: chapter. (line 1673) +* index entry within itemize <1>: chapter. (line 871) +* index entry within itemize <2>: chapter. (line 1675) * index entry within multitable: chapter. (line 225) -* index entry within multitable <1>: chapter. (line 892) -* index entry within multitable <2>: chapter. (line 1696) -* t-ruc: chapter. (line 2193) -* T-ruc: chapter. (line 2193) +* index entry within multitable <1>: chapter. (line 893) +* index entry within multitable <2>: chapter. (line 1698) +* t-ruc: chapter. (line 2197) +* T-ruc: chapter. (line 2197) * vtable i--tem code kbdinputstyle: chapter. (line 127) -* vtable i--tem code kbdinputstyle <1>: chapter. (line 794) -* vtable i--tem code kbdinputstyle <2>: chapter. (line 1596) +* vtable i--tem code kbdinputstyle <1>: chapter. (line 795) +* vtable i--tem code kbdinputstyle <2>: chapter. (line 1598) * vtable i--tem default kbdinputstyle: chapter. (line 122) -* vtable i--tem default kbdinputstyle <1>: chapter. (line 789) -* vtable i--tem default kbdinputstyle <2>: chapter. (line 1591) +* vtable i--tem default kbdinputstyle <1>: chapter. (line 790) +* vtable i--tem default kbdinputstyle <2>: chapter. (line 1593) * vtable i--tem distinct kbdinputstyle: chapter. (line 137) -* vtable i--tem distinct kbdinputstyle <1>: chapter. (line 804) -* vtable i--tem distinct kbdinputstyle <2>: chapter. (line 1606) +* vtable i--tem distinct kbdinputstyle <1>: chapter. (line 805) +* vtable i--tem distinct kbdinputstyle <2>: chapter. (line 1608) * vtable i--tem example kbdinputstyle: chapter. (line 132) -* vtable i--tem example kbdinputstyle <1>: chapter. (line 799) -* vtable i--tem example kbdinputstyle <2>: chapter. (line 1601) +* vtable i--tem example kbdinputstyle <1>: chapter. (line 800) +* vtable i--tem example kbdinputstyle <2>: chapter. (line 1603) * vtable i--tem in example code kbdinputstyle: chapter. (line 129) -* vtable i--tem in example code kbdinputstyle <1>: chapter. (line 796) -* vtable i--tem in example code kbdinputstyle <2>: chapter. (line 1598) +* vtable i--tem in example code kbdinputstyle <1>: chapter. (line 797) +* vtable i--tem in example code kbdinputstyle <2>: chapter. (line 1600) * vtable i--tem in example default kbdinputstyle: chapter. (line 124) * vtable i--tem in example default kbdinputstyle <1>: chapter. - (line 791) + (line 792) * vtable i--tem in example default kbdinputstyle <2>: chapter. - (line 1593) + (line 1595) * vtable i--tem in example distinct kbdinputstyle: chapter. (line 139) * vtable i--tem in example distinct kbdinputstyle <1>: chapter. - (line 806) + (line 807) * vtable i--tem in example distinct kbdinputstyle <2>: chapter. - (line 1608) + (line 1610) * vtable i--tem in example example kbdinputstyle: chapter. (line 134) * vtable i--tem in example example kbdinputstyle <1>: chapter. - (line 801) + (line 802) * vtable i--tem in example example kbdinputstyle <2>: chapter. - (line 1603) + (line 1605) fn * Menu: * --foption: chapter. (line 28) -* --foption <1>: chapter. (line 695) -* --foption <2>: chapter. (line 1373) -* .: chapter. (line 2193) -* ?: chapter. (line 2193) +* --foption <1>: chapter. (line 696) +* --foption <2>: chapter. (line 1375) +* .: chapter. (line 2197) +* ?: chapter. (line 2197) * ``: chapter. (line 28) -* `` <1>: chapter. (line 695) -* `` <2>: chapter. (line 1373) +* `` <1>: chapter. (line 696) +* `` <2>: chapter. (line 1375) * a: chapter. (line 305) * a <1>: chapter. (line 504) -* a <2>: chapter. (line 629) -* a <3>: chapter. (line 972) -* a <4>: chapter. (line 1171) -* a <5>: chapter. (line 1296) -* a <6>: chapter. (line 1775) -* a <7>: chapter. (line 1976) -* a <8>: chapter. (line 2133) -* a <9>: chapter. (line 2193) -* after: chapter. (line 640) -* after <1>: chapter. (line 1307) -* after <2>: chapter. (line 2144) +* a <2>: chapter. (line 630) +* a <3>: chapter. (line 973) +* a <4>: chapter. (line 1172) +* a <5>: chapter. (line 1298) +* a <6>: chapter. (line 1777) +* a <7>: chapter. (line 1978) +* a <8>: chapter. (line 2137) +* a <9>: chapter. (line 2197) +* after: chapter. (line 641) +* after <1>: chapter. (line 1309) +* after <2>: chapter. (line 2148) * arg2: chapter. (line 424) -* arg2 <1>: chapter. (line 1091) -* arg2 <2>: chapter. (line 1898) +* arg2 <1>: chapter. (line 1092) +* arg2 <2>: chapter. (line 1900) * b: chapter. (line 505) -* b <1>: chapter. (line 630) -* b <2>: chapter. (line 1172) -* b <3>: chapter. (line 1297) -* b <4>: chapter. (line 1977) -* b <5>: chapter. (line 2134) +* b <1>: chapter. (line 631) +* b <2>: chapter. (line 1173) +* b <3>: chapter. (line 1299) +* b <4>: chapter. (line 1979) +* b <5>: chapter. (line 2138) * bidule machin: chapter. (line 300) -* bidule machin <1>: chapter. (line 967) -* bidule machin <2>: chapter. (line 1770) +* bidule machin <1>: chapter. (line 968) +* bidule machin <2>: chapter. (line 1772) * d--effn_name: chapter. (line 284) -* d--effn_name <1>: chapter. (line 951) -* d--effn_name <2>: chapter. (line 1754) +* d--effn_name <1>: chapter. (line 952) +* d--effn_name <2>: chapter. (line 1756) * d--efmac_name: chapter. (line 365) -* d--efmac_name <1>: chapter. (line 1032) -* d--efmac_name <2>: chapter. (line 1837) +* d--efmac_name <1>: chapter. (line 1033) +* d--efmac_name <2>: chapter. (line 1839) * d--efmethod_name on c--lass: chapter. (line 392) -* d--efmethod_name on c--lass <1>: chapter. (line 1059) -* d--efmethod_name on c--lass <2>: chapter. (line 1864) +* d--efmethod_name on c--lass <1>: chapter. (line 1060) +* d--efmethod_name on c--lass <2>: chapter. (line 1866) * d--efop_name on c--lass: chapter. (line 353) * d--efop_name on c--lass <1>: chapter. (line 356) -* d--efop_name on c--lass <2>: chapter. (line 1020) -* d--efop_name on c--lass <3>: chapter. (line 1023) -* d--efop_name on c--lass <4>: chapter. (line 1825) -* d--efop_name on c--lass <5>: chapter. (line 1828) +* d--efop_name on c--lass <2>: chapter. (line 1021) +* d--efop_name on c--lass <3>: chapter. (line 1024) +* d--efop_name on c--lass <4>: chapter. (line 1827) +* d--efop_name on c--lass <5>: chapter. (line 1830) * d--efspec_name: chapter. (line 368) -* d--efspec_name <1>: chapter. (line 1035) -* d--efspec_name <2>: chapter. (line 1840) +* d--efspec_name <1>: chapter. (line 1036) +* d--efspec_name <2>: chapter. (line 1842) * d--eftypefn_name: chapter. (line 326) * d--eftypefn_name <1>: chapter. (line 329) -* d--eftypefn_name <2>: chapter. (line 993) -* d--eftypefn_name <3>: chapter. (line 996) -* d--eftypefn_name <4>: chapter. (line 1798) -* d--eftypefn_name <5>: chapter. (line 1801) +* d--eftypefn_name <2>: chapter. (line 994) +* d--eftypefn_name <3>: chapter. (line 997) +* d--eftypefn_name <4>: chapter. (line 1800) +* d--eftypefn_name <5>: chapter. (line 1803) * d--eftypefn_name2: chapter. (line 403) -* d--eftypefn_name2 <1>: chapter. (line 1070) -* d--eftypefn_name2 <2>: chapter. (line 1876) +* d--eftypefn_name2 <1>: chapter. (line 1071) +* d--eftypefn_name2 <2>: chapter. (line 1878) * d--eftypefun_name: chapter. (line 380) -* d--eftypefun_name <1>: chapter. (line 1047) -* d--eftypefun_name <2>: chapter. (line 1852) +* d--eftypefun_name <1>: chapter. (line 1048) +* d--eftypefun_name <2>: chapter. (line 1854) * d--eftypemethod_name on c--lass: chapter. (line 395) -* d--eftypemethod_name on c--lass <1>: chapter. (line 1062) -* d--eftypemethod_name on c--lass <2>: chapter. (line 1867) +* d--eftypemethod_name on c--lass <1>: chapter. (line 1063) +* d--eftypemethod_name on c--lass <2>: chapter. (line 1869) * d--eftypeop_name on c--lass: chapter. (line 332) * d--eftypeop_name on c--lass <1>: chapter. (line 335) -* d--eftypeop_name on c--lass <2>: chapter. (line 999) -* d--eftypeop_name on c--lass <3>: chapter. (line 1002) -* d--eftypeop_name on c--lass <4>: chapter. (line 1804) -* d--eftypeop_name on c--lass <5>: chapter. (line 1807) +* d--eftypeop_name on c--lass <2>: chapter. (line 1000) +* d--eftypeop_name on c--lass <3>: chapter. (line 1003) +* d--eftypeop_name on c--lass <4>: chapter. (line 1806) +* d--eftypeop_name on c--lass <5>: chapter. (line 1809) * d--eftypeop_name2 on c--lass2: chapter. (line 408) * d--eftypeop_name2 on c--lass2 <1>: chapter. (line 413) -* d--eftypeop_name2 on c--lass2 <2>: chapter. (line 1075) -* d--eftypeop_name2 on c--lass2 <3>: chapter. (line 1080) -* d--eftypeop_name2 on c--lass2 <4>: chapter. (line 1881) -* d--eftypeop_name2 on c--lass2 <5>: chapter. (line 1886) +* d--eftypeop_name2 on c--lass2 <2>: chapter. (line 1076) +* d--eftypeop_name2 on c--lass2 <3>: chapter. (line 1081) +* d--eftypeop_name2 on c--lass2 <4>: chapter. (line 1883) +* d--eftypeop_name2 on c--lass2 <5>: chapter. (line 1888) * d--efun_name: chapter. (line 362) -* d--efun_name <1>: chapter. (line 1029) -* d--efun_name <2>: chapter. (line 1834) +* d--efun_name <1>: chapter. (line 1030) +* d--efun_name <2>: chapter. (line 1836) * de--ffn_name: chapter. (line 287) -* de--ffn_name <1>: chapter. (line 954) -* de--ffn_name <2>: chapter. (line 1757) +* de--ffn_name <1>: chapter. (line 955) +* de--ffn_name <2>: chapter. (line 1759) * deffn: chapter. (line 308) * deffn <1>: chapter. (line 310) -* deffn <2>: chapter. (line 975) -* deffn <3>: chapter. (line 977) -* deffn <4>: chapter. (line 1779) -* deffn <5>: chapter. (line 1781) +* deffn <2>: chapter. (line 976) +* deffn <3>: chapter. (line 978) +* deffn <4>: chapter. (line 1781) +* deffn <5>: chapter. (line 1783) * deffnx: chapter. (line 306) * deffnx <1>: chapter. (line 311) -* deffnx <2>: chapter. (line 973) -* deffnx <3>: chapter. (line 978) -* deffnx <4>: chapter. (line 1776) -* deffnx <5>: chapter. (line 1782) -* f---aa: chapter. (line 2193) -* f---bb, f---cc: chapter. (line 2193) -* f---ddd, f---eee, ffff: chapter. (line 2193) -* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter. (line 2193) +* deffnx <2>: chapter. (line 974) +* deffnx <3>: chapter. (line 979) +* deffnx <4>: chapter. (line 1778) +* deffnx <5>: chapter. (line 1784) +* f---aa: chapter. (line 2197) +* f---bb, f---cc: chapter. (line 2197) +* f---ddd, f---eee, ffff: chapter. (line 2197) +* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter. (line 2197) * followed: chapter. (line 303) -* followed <1>: chapter. (line 638) -* followed <2>: chapter. (line 970) -* followed <3>: chapter. (line 1305) -* followed <4>: chapter. (line 1773) -* followed <5>: chapter. (line 2142) +* followed <1>: chapter. (line 639) +* followed <2>: chapter. (line 971) +* followed <3>: chapter. (line 1307) +* followed <4>: chapter. (line 1775) +* followed <5>: chapter. (line 2146) * I: chapter. (line 291) * I <1>: chapter. (line 313) -* I <2>: chapter. (line 958) -* I <3>: chapter. (line 980) -* I <4>: chapter. (line 1761) -* I <5>: chapter. (line 1784) +* I <2>: chapter. (line 959) +* I <3>: chapter. (line 981) +* I <4>: chapter. (line 1763) +* I <5>: chapter. (line 1786) * id i ule: chapter. (line 297) -* id i ule <1>: chapter. (line 964) -* id i ule <2>: chapter. (line 1767) +* id i ule <1>: chapter. (line 965) +* id i ule <2>: chapter. (line 1769) * id ule: chapter. (line 296) -* id ule <1>: chapter. (line 963) -* id ule <2>: chapter. (line 1766) -* INVALID: chapter. (line 642) -* INVALID <1>: chapter. (line 1309) -* INVALID <2>: chapter. (line 2146) +* id ule <1>: chapter. (line 964) +* id ule <2>: chapter. (line 1768) +* INVALID: chapter. (line 643) +* INVALID <1>: chapter. (line 1311) +* INVALID <2>: chapter. (line 2150) * log trap: chapter. (line 293) -* log trap <1>: chapter. (line 960) -* log trap <2>: chapter. (line 1763) +* log trap <1>: chapter. (line 961) +* log trap <2>: chapter. (line 1765) * log trap1: chapter. (line 294) -* log trap1 <1>: chapter. (line 961) -* log trap1 <2>: chapter. (line 1764) +* log trap1 <1>: chapter. (line 962) +* log trap1 <2>: chapter. (line 1766) * log trap2: chapter. (line 295) -* log trap2 <1>: chapter. (line 962) -* log trap2 <2>: chapter. (line 1765) +* log trap2 <1>: chapter. (line 963) +* log trap2 <2>: chapter. (line 1767) * machin: chapter. (line 299) * machin <1>: chapter. (line 301) -* machin <2>: chapter. (line 634) -* machin <3>: chapter. (line 635) -* machin <4>: chapter. (line 636) -* machin <5>: chapter. (line 637) -* machin <6>: chapter. (line 966) -* machin <7>: chapter. (line 968) -* machin <8>: chapter. (line 1301) -* machin <9>: chapter. (line 1302) -* machin <10>: chapter. (line 1303) -* machin <11>: chapter. (line 1304) -* machin <12>: chapter. (line 1769) -* machin <13>: chapter. (line 1771) -* machin <14>: chapter. (line 2138) -* machin <15>: chapter. (line 2139) -* machin <16>: chapter. (line 2140) -* machin <17>: chapter. (line 2141) +* machin <2>: chapter. (line 635) +* machin <3>: chapter. (line 636) +* machin <4>: chapter. (line 637) +* machin <5>: chapter. (line 638) +* machin <6>: chapter. (line 967) +* machin <7>: chapter. (line 969) +* machin <8>: chapter. (line 1303) +* machin <9>: chapter. (line 1304) +* machin <10>: chapter. (line 1305) +* machin <11>: chapter. (line 1306) +* machin <12>: chapter. (line 1771) +* machin <13>: chapter. (line 1773) +* machin <14>: chapter. (line 2142) +* machin <15>: chapter. (line 2143) +* machin <16>: chapter. (line 2144) +* machin <17>: chapter. (line 2145) * n--ame: chapter. (line 320) * n--ame <1>: chapter. (line 323) -* n--ame <2>: chapter. (line 987) -* n--ame <3>: chapter. (line 990) -* n--ame <4>: chapter. (line 1792) -* n--ame <5>: chapter. (line 1795) +* n--ame <2>: chapter. (line 988) +* n--ame <3>: chapter. (line 991) +* n--ame <4>: chapter. (line 1794) +* n--ame <5>: chapter. (line 1797) * name2: chapter. (line 398) -* name2 <1>: chapter. (line 1065) -* name2 <2>: chapter. (line 1871) -* t--ruc: chapter. (line 2193) -* T--ruc: chapter. (line 2193) +* name2 <1>: chapter. (line 1066) +* name2 <2>: chapter. (line 1873) +* t--ruc: chapter. (line 2197) +* T--ruc: chapter. (line 2197) * truc: chapter. (line 292) * truc <1>: chapter. (line 314) -* truc <2>: chapter. (line 959) -* truc <3>: chapter. (line 981) -* truc <4>: chapter. (line 1762) -* truc <5>: chapter. (line 1785) -* xxx, zzz: chapter. (line 2193) +* truc <2>: chapter. (line 960) +* truc <3>: chapter. (line 982) +* truc <4>: chapter. (line 1764) +* truc <5>: chapter. (line 1787) +* xxx, zzz: chapter. (line 2197) vr @@ -2503,8 +2507,8 @@ aaa * Menu: * d--eftp_name: chapter. (line 359) -* d--eftp_name <1>: chapter. (line 1026) -* d--eftp_name <2>: chapter. (line 1831) +* d--eftp_name <1>: chapter. (line 1027) +* d--eftp_name <2>: chapter. (line 1833) (8) @@ -2549,285 +2553,285 @@ chapter 2 * Menu: * ": chapter. (line 28) -* " <1>: chapter. (line 695) -* " <2>: chapter. (line 1373) +* " <1>: chapter. (line 696) +* " <2>: chapter. (line 1375) * -option: chapter. (line 28) -* -option <1>: chapter. (line 695) -* -option <2>: chapter. (line 1373) -* .: chapter. (line 2193) -* ?: chapter. (line 2193) -* a: chapter. (line 2193) -* aaa, bbb: chapter. (line 2193) -* a--a: chapter. (line 2193) +* -option <1>: chapter. (line 696) +* -option <2>: chapter. (line 1375) +* .: chapter. (line 2197) +* ?: chapter. (line 2197) +* a: chapter. (line 2197) +* aaa, bbb: chapter. (line 2197) +* a--a: chapter. (line 2197) * a--asis: chapter. (line 500) -* a--asis <1>: chapter. (line 1167) -* a--asis <2>: chapter. (line 1972) +* a--asis <1>: chapter. (line 1168) +* a--asis <2>: chapter. (line 1974) * b: chapter. (line 501) -* b <1>: chapter. (line 1168) -* b <2>: chapter. (line 1973) -* b--b, c--c: chapter. (line 2193) -* counting entry: chapter. (line 2530) -* d--dd, e--ee, f--ff: chapter. (line 2193) +* b <1>: chapter. (line 1169) +* b <2>: chapter. (line 1975) +* b--b, c--c: chapter. (line 2197) +* counting entry: chapter. (line 2534) +* d--dd, e--ee, f--ff: chapter. (line 2197) * d--efcv_name: chapter. (line 341) * d--efcv_name <1>: chapter. (line 344) -* d--efcv_name <2>: chapter. (line 1008) -* d--efcv_name <3>: chapter. (line 1011) -* d--efcv_name <4>: chapter. (line 1813) -* d--efcv_name <5>: chapter. (line 1816) +* d--efcv_name <2>: chapter. (line 1009) +* d--efcv_name <3>: chapter. (line 1012) +* d--efcv_name <4>: chapter. (line 1815) +* d--efcv_name <5>: chapter. (line 1818) * d--efivar_name of c--lass: chapter. (line 386) -* d--efivar_name of c--lass <1>: chapter. (line 1053) -* d--efivar_name of c--lass <2>: chapter. (line 1858) +* d--efivar_name of c--lass <1>: chapter. (line 1054) +* d--efivar_name of c--lass <2>: chapter. (line 1860) * d--efopt_name: chapter. (line 377) -* d--efopt_name <1>: chapter. (line 1044) -* d--efopt_name <2>: chapter. (line 1849) +* d--efopt_name <1>: chapter. (line 1045) +* d--efopt_name <2>: chapter. (line 1851) * d--eftypecv_name of c--lass: chapter. (line 347) * d--eftypecv_name of c--lass <1>: chapter. (line 350) -* d--eftypecv_name of c--lass <2>: chapter. (line 1014) -* d--eftypecv_name of c--lass <3>: chapter. (line 1017) -* d--eftypecv_name of c--lass <4>: chapter. (line 1819) -* d--eftypecv_name of c--lass <5>: chapter. (line 1822) +* d--eftypecv_name of c--lass <2>: chapter. (line 1015) +* d--eftypecv_name of c--lass <3>: chapter. (line 1018) +* d--eftypecv_name of c--lass <4>: chapter. (line 1821) +* d--eftypecv_name of c--lass <5>: chapter. (line 1824) * d--eftypecv_name2 of c--lass2: chapter. (line 418) * d--eftypecv_name2 of c--lass2 <1>: chapter. (line 421) -* d--eftypecv_name2 of c--lass2 <2>: chapter. (line 1085) -* d--eftypecv_name2 of c--lass2 <3>: chapter. (line 1088) -* d--eftypecv_name2 of c--lass2 <4>: chapter. (line 1891) -* d--eftypecv_name2 of c--lass2 <5>: chapter. (line 1894) +* d--eftypecv_name2 of c--lass2 <2>: chapter. (line 1086) +* d--eftypecv_name2 of c--lass2 <3>: chapter. (line 1089) +* d--eftypecv_name2 of c--lass2 <4>: chapter. (line 1893) +* d--eftypecv_name2 of c--lass2 <5>: chapter. (line 1896) * d--eftypeivar_name of c--lass: chapter. (line 389) -* d--eftypeivar_name of c--lass <1>: chapter. (line 1056) -* d--eftypeivar_name of c--lass <2>: chapter. (line 1861) +* d--eftypeivar_name of c--lass <1>: chapter. (line 1057) +* d--eftypeivar_name of c--lass <2>: chapter. (line 1863) * d--eftypevar_name: chapter. (line 383) -* d--eftypevar_name <1>: chapter. (line 1050) -* d--eftypevar_name <2>: chapter. (line 1855) +* d--eftypevar_name <1>: chapter. (line 1051) +* d--eftypevar_name <2>: chapter. (line 1857) * d--eftypevr_name: chapter. (line 338) -* d--eftypevr_name <1>: chapter. (line 1005) -* d--eftypevr_name <2>: chapter. (line 1810) +* d--eftypevr_name <1>: chapter. (line 1006) +* d--eftypevr_name <2>: chapter. (line 1812) * d--efvar_name: chapter. (line 371) * d--efvar_name <1>: chapter. (line 374) -* d--efvar_name <2>: chapter. (line 1038) -* d--efvar_name <3>: chapter. (line 1041) -* d--efvar_name <4>: chapter. (line 1843) -* d--efvar_name <5>: chapter. (line 1846) +* d--efvar_name <2>: chapter. (line 1039) +* d--efvar_name <3>: chapter. (line 1042) +* d--efvar_name <4>: chapter. (line 1845) +* d--efvar_name <5>: chapter. (line 1848) * d--efvr_name: chapter. (line 317) -* d--efvr_name <1>: chapter. (line 984) -* d--efvr_name <2>: chapter. (line 1789) -* g--gg, h--hh jjj, k--kk, l--ll: chapter. (line 2193) +* d--efvr_name <1>: chapter. (line 985) +* d--efvr_name <2>: chapter. (line 1791) +* g--gg, h--hh jjj, k--kk, l--ll: chapter. (line 2197) * index entry between item and itemx: chapter. (line 505) -* index entry between item and itemx <1>: chapter. (line 630) -* index entry between item and itemx <2>: chapter. (line 1172) -* index entry between item and itemx <3>: chapter. (line 1297) -* index entry between item and itemx <4>: chapter. (line 1977) -* index entry between item and itemx <5>: chapter. (line 2134) -* index entry in footnote: chapter. (line 2525) +* index entry between item and itemx <1>: chapter. (line 631) +* index entry between item and itemx <2>: chapter. (line 1173) +* index entry between item and itemx <3>: chapter. (line 1299) +* index entry between item and itemx <4>: chapter. (line 1979) +* index entry between item and itemx <5>: chapter. (line 2138) +* index entry in footnote: chapter. (line 2529) * index entry within deffn: chapter. (line 292) -* index entry within deffn <1>: chapter. (line 959) -* index entry within deffn <2>: chapter. (line 1762) +* index entry within deffn <1>: chapter. (line 960) +* index entry within deffn <2>: chapter. (line 1764) * index entry within itemize: chapter. (line 203) -* index entry within itemize <1>: chapter. (line 870) -* index entry within itemize <2>: chapter. (line 1673) +* index entry within itemize <1>: chapter. (line 871) +* index entry within itemize <2>: chapter. (line 1675) * index entry within multitable: chapter. (line 225) -* index entry within multitable <1>: chapter. (line 892) -* index entry within multitable <2>: chapter. (line 1696) -* t-ruc: chapter. (line 2193) -* T-ruc: chapter. (line 2193) +* index entry within multitable <1>: chapter. (line 893) +* index entry within multitable <2>: chapter. (line 1698) +* t-ruc: chapter. (line 2197) +* T-ruc: chapter. (line 2197) * vtable i--tem code kbdinputstyle: chapter. (line 127) -* vtable i--tem code kbdinputstyle <1>: chapter. (line 794) -* vtable i--tem code kbdinputstyle <2>: chapter. (line 1596) +* vtable i--tem code kbdinputstyle <1>: chapter. (line 795) +* vtable i--tem code kbdinputstyle <2>: chapter. (line 1598) * vtable i--tem default kbdinputstyle: chapter. (line 122) -* vtable i--tem default kbdinputstyle <1>: chapter. (line 789) -* vtable i--tem default kbdinputstyle <2>: chapter. (line 1591) +* vtable i--tem default kbdinputstyle <1>: chapter. (line 790) +* vtable i--tem default kbdinputstyle <2>: chapter. (line 1593) * vtable i--tem distinct kbdinputstyle: chapter. (line 137) -* vtable i--tem distinct kbdinputstyle <1>: chapter. (line 804) -* vtable i--tem distinct kbdinputstyle <2>: chapter. (line 1606) +* vtable i--tem distinct kbdinputstyle <1>: chapter. (line 805) +* vtable i--tem distinct kbdinputstyle <2>: chapter. (line 1608) * vtable i--tem example kbdinputstyle: chapter. (line 132) -* vtable i--tem example kbdinputstyle <1>: chapter. (line 799) -* vtable i--tem example kbdinputstyle <2>: chapter. (line 1601) +* vtable i--tem example kbdinputstyle <1>: chapter. (line 800) +* vtable i--tem example kbdinputstyle <2>: chapter. (line 1603) * vtable i--tem in example code kbdinputstyle: chapter. (line 129) -* vtable i--tem in example code kbdinputstyle <1>: chapter. (line 796) -* vtable i--tem in example code kbdinputstyle <2>: chapter. (line 1598) +* vtable i--tem in example code kbdinputstyle <1>: chapter. (line 797) +* vtable i--tem in example code kbdinputstyle <2>: chapter. (line 1600) * vtable i--tem in example default kbdinputstyle: chapter. (line 124) * vtable i--tem in example default kbdinputstyle <1>: chapter. - (line 791) + (line 792) * vtable i--tem in example default kbdinputstyle <2>: chapter. - (line 1593) + (line 1595) * vtable i--tem in example distinct kbdinputstyle: chapter. (line 139) * vtable i--tem in example distinct kbdinputstyle <1>: chapter. - (line 806) + (line 807) * vtable i--tem in example distinct kbdinputstyle <2>: chapter. - (line 1608) + (line 1610) * vtable i--tem in example example kbdinputstyle: chapter. (line 134) * vtable i--tem in example example kbdinputstyle <1>: chapter. - (line 801) + (line 802) * vtable i--tem in example example kbdinputstyle <2>: chapter. - (line 1603) + (line 1605) * Menu: * --foption: chapter. (line 28) -* --foption <1>: chapter. (line 695) -* --foption <2>: chapter. (line 1373) -* .: chapter. (line 2193) -* ?: chapter. (line 2193) +* --foption <1>: chapter. (line 696) +* --foption <2>: chapter. (line 1375) +* .: chapter. (line 2197) +* ?: chapter. (line 2197) * ``: chapter. (line 28) -* `` <1>: chapter. (line 695) -* `` <2>: chapter. (line 1373) +* `` <1>: chapter. (line 696) +* `` <2>: chapter. (line 1375) * a: chapter. (line 305) * a <1>: chapter. (line 504) -* a <2>: chapter. (line 629) -* a <3>: chapter. (line 972) -* a <4>: chapter. (line 1171) -* a <5>: chapter. (line 1296) -* a <6>: chapter. (line 1775) -* a <7>: chapter. (line 1976) -* a <8>: chapter. (line 2133) -* a <9>: chapter. (line 2193) -* after: chapter. (line 640) -* after <1>: chapter. (line 1307) -* after <2>: chapter. (line 2144) +* a <2>: chapter. (line 630) +* a <3>: chapter. (line 973) +* a <4>: chapter. (line 1172) +* a <5>: chapter. (line 1298) +* a <6>: chapter. (line 1777) +* a <7>: chapter. (line 1978) +* a <8>: chapter. (line 2137) +* a <9>: chapter. (line 2197) +* after: chapter. (line 641) +* after <1>: chapter. (line 1309) +* after <2>: chapter. (line 2148) * arg2: chapter. (line 424) -* arg2 <1>: chapter. (line 1091) -* arg2 <2>: chapter. (line 1898) +* arg2 <1>: chapter. (line 1092) +* arg2 <2>: chapter. (line 1900) * b: chapter. (line 505) -* b <1>: chapter. (line 630) -* b <2>: chapter. (line 1172) -* b <3>: chapter. (line 1297) -* b <4>: chapter. (line 1977) -* b <5>: chapter. (line 2134) +* b <1>: chapter. (line 631) +* b <2>: chapter. (line 1173) +* b <3>: chapter. (line 1299) +* b <4>: chapter. (line 1979) +* b <5>: chapter. (line 2138) * bidule machin: chapter. (line 300) -* bidule machin <1>: chapter. (line 967) -* bidule machin <2>: chapter. (line 1770) +* bidule machin <1>: chapter. (line 968) +* bidule machin <2>: chapter. (line 1772) * d--effn_name: chapter. (line 284) -* d--effn_name <1>: chapter. (line 951) -* d--effn_name <2>: chapter. (line 1754) +* d--effn_name <1>: chapter. (line 952) +* d--effn_name <2>: chapter. (line 1756) * d--efmac_name: chapter. (line 365) -* d--efmac_name <1>: chapter. (line 1032) -* d--efmac_name <2>: chapter. (line 1837) +* d--efmac_name <1>: chapter. (line 1033) +* d--efmac_name <2>: chapter. (line 1839) * d--efmethod_name on c--lass: chapter. (line 392) -* d--efmethod_name on c--lass <1>: chapter. (line 1059) -* d--efmethod_name on c--lass <2>: chapter. (line 1864) +* d--efmethod_name on c--lass <1>: chapter. (line 1060) +* d--efmethod_name on c--lass <2>: chapter. (line 1866) * d--efop_name on c--lass: chapter. (line 353) * d--efop_name on c--lass <1>: chapter. (line 356) -* d--efop_name on c--lass <2>: chapter. (line 1020) -* d--efop_name on c--lass <3>: chapter. (line 1023) -* d--efop_name on c--lass <4>: chapter. (line 1825) -* d--efop_name on c--lass <5>: chapter. (line 1828) +* d--efop_name on c--lass <2>: chapter. (line 1021) +* d--efop_name on c--lass <3>: chapter. (line 1024) +* d--efop_name on c--lass <4>: chapter. (line 1827) +* d--efop_name on c--lass <5>: chapter. (line 1830) * d--efspec_name: chapter. (line 368) -* d--efspec_name <1>: chapter. (line 1035) -* d--efspec_name <2>: chapter. (line 1840) +* d--efspec_name <1>: chapter. (line 1036) +* d--efspec_name <2>: chapter. (line 1842) * d--eftypefn_name: chapter. (line 326) * d--eftypefn_name <1>: chapter. (line 329) -* d--eftypefn_name <2>: chapter. (line 993) -* d--eftypefn_name <3>: chapter. (line 996) -* d--eftypefn_name <4>: chapter. (line 1798) -* d--eftypefn_name <5>: chapter. (line 1801) +* d--eftypefn_name <2>: chapter. (line 994) +* d--eftypefn_name <3>: chapter. (line 997) +* d--eftypefn_name <4>: chapter. (line 1800) +* d--eftypefn_name <5>: chapter. (line 1803) * d--eftypefn_name2: chapter. (line 403) -* d--eftypefn_name2 <1>: chapter. (line 1070) -* d--eftypefn_name2 <2>: chapter. (line 1876) +* d--eftypefn_name2 <1>: chapter. (line 1071) +* d--eftypefn_name2 <2>: chapter. (line 1878) * d--eftypefun_name: chapter. (line 380) -* d--eftypefun_name <1>: chapter. (line 1047) -* d--eftypefun_name <2>: chapter. (line 1852) +* d--eftypefun_name <1>: chapter. (line 1048) +* d--eftypefun_name <2>: chapter. (line 1854) * d--eftypemethod_name on c--lass: chapter. (line 395) -* d--eftypemethod_name on c--lass <1>: chapter. (line 1062) -* d--eftypemethod_name on c--lass <2>: chapter. (line 1867) +* d--eftypemethod_name on c--lass <1>: chapter. (line 1063) +* d--eftypemethod_name on c--lass <2>: chapter. (line 1869) * d--eftypeop_name on c--lass: chapter. (line 332) * d--eftypeop_name on c--lass <1>: chapter. (line 335) -* d--eftypeop_name on c--lass <2>: chapter. (line 999) -* d--eftypeop_name on c--lass <3>: chapter. (line 1002) -* d--eftypeop_name on c--lass <4>: chapter. (line 1804) -* d--eftypeop_name on c--lass <5>: chapter. (line 1807) +* d--eftypeop_name on c--lass <2>: chapter. (line 1000) +* d--eftypeop_name on c--lass <3>: chapter. (line 1003) +* d--eftypeop_name on c--lass <4>: chapter. (line 1806) +* d--eftypeop_name on c--lass <5>: chapter. (line 1809) * d--eftypeop_name2 on c--lass2: chapter. (line 408) * d--eftypeop_name2 on c--lass2 <1>: chapter. (line 413) -* d--eftypeop_name2 on c--lass2 <2>: chapter. (line 1075) -* d--eftypeop_name2 on c--lass2 <3>: chapter. (line 1080) -* d--eftypeop_name2 on c--lass2 <4>: chapter. (line 1881) -* d--eftypeop_name2 on c--lass2 <5>: chapter. (line 1886) +* d--eftypeop_name2 on c--lass2 <2>: chapter. (line 1076) +* d--eftypeop_name2 on c--lass2 <3>: chapter. (line 1081) +* d--eftypeop_name2 on c--lass2 <4>: chapter. (line 1883) +* d--eftypeop_name2 on c--lass2 <5>: chapter. (line 1888) * d--efun_name: chapter. (line 362) -* d--efun_name <1>: chapter. (line 1029) -* d--efun_name <2>: chapter. (line 1834) +* d--efun_name <1>: chapter. (line 1030) +* d--efun_name <2>: chapter. (line 1836) * de--ffn_name: chapter. (line 287) -* de--ffn_name <1>: chapter. (line 954) -* de--ffn_name <2>: chapter. (line 1757) +* de--ffn_name <1>: chapter. (line 955) +* de--ffn_name <2>: chapter. (line 1759) * deffn: chapter. (line 308) * deffn <1>: chapter. (line 310) -* deffn <2>: chapter. (line 975) -* deffn <3>: chapter. (line 977) -* deffn <4>: chapter. (line 1779) -* deffn <5>: chapter. (line 1781) +* deffn <2>: chapter. (line 976) +* deffn <3>: chapter. (line 978) +* deffn <4>: chapter. (line 1781) +* deffn <5>: chapter. (line 1783) * deffnx: chapter. (line 306) * deffnx <1>: chapter. (line 311) -* deffnx <2>: chapter. (line 973) -* deffnx <3>: chapter. (line 978) -* deffnx <4>: chapter. (line 1776) -* deffnx <5>: chapter. (line 1782) -* f---aa: chapter. (line 2193) -* f---bb, f---cc: chapter. (line 2193) -* f---ddd, f---eee, ffff: chapter. (line 2193) -* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter. (line 2193) +* deffnx <2>: chapter. (line 974) +* deffnx <3>: chapter. (line 979) +* deffnx <4>: chapter. (line 1778) +* deffnx <5>: chapter. (line 1784) +* f---aa: chapter. (line 2197) +* f---bb, f---cc: chapter. (line 2197) +* f---ddd, f---eee, ffff: chapter. (line 2197) +* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter. (line 2197) * followed: chapter. (line 303) -* followed <1>: chapter. (line 638) -* followed <2>: chapter. (line 970) -* followed <3>: chapter. (line 1305) -* followed <4>: chapter. (line 1773) -* followed <5>: chapter. (line 2142) +* followed <1>: chapter. (line 639) +* followed <2>: chapter. (line 971) +* followed <3>: chapter. (line 1307) +* followed <4>: chapter. (line 1775) +* followed <5>: chapter. (line 2146) * I: chapter. (line 291) * I <1>: chapter. (line 313) -* I <2>: chapter. (line 958) -* I <3>: chapter. (line 980) -* I <4>: chapter. (line 1761) -* I <5>: chapter. (line 1784) +* I <2>: chapter. (line 959) +* I <3>: chapter. (line 981) +* I <4>: chapter. (line 1763) +* I <5>: chapter. (line 1786) * id i ule: chapter. (line 297) -* id i ule <1>: chapter. (line 964) -* id i ule <2>: chapter. (line 1767) +* id i ule <1>: chapter. (line 965) +* id i ule <2>: chapter. (line 1769) * id ule: chapter. (line 296) -* id ule <1>: chapter. (line 963) -* id ule <2>: chapter. (line 1766) -* INVALID: chapter. (line 642) -* INVALID <1>: chapter. (line 1309) -* INVALID <2>: chapter. (line 2146) +* id ule <1>: chapter. (line 964) +* id ule <2>: chapter. (line 1768) +* INVALID: chapter. (line 643) +* INVALID <1>: chapter. (line 1311) +* INVALID <2>: chapter. (line 2150) * log trap: chapter. (line 293) -* log trap <1>: chapter. (line 960) -* log trap <2>: chapter. (line 1763) +* log trap <1>: chapter. (line 961) +* log trap <2>: chapter. (line 1765) * log trap1: chapter. (line 294) -* log trap1 <1>: chapter. (line 961) -* log trap1 <2>: chapter. (line 1764) +* log trap1 <1>: chapter. (line 962) +* log trap1 <2>: chapter. (line 1766) * log trap2: chapter. (line 295) -* log trap2 <1>: chapter. (line 962) -* log trap2 <2>: chapter. (line 1765) +* log trap2 <1>: chapter. (line 963) +* log trap2 <2>: chapter. (line 1767) * machin: chapter. (line 299) * machin <1>: chapter. (line 301) -* machin <2>: chapter. (line 634) -* machin <3>: chapter. (line 635) -* machin <4>: chapter. (line 636) -* machin <5>: chapter. (line 637) -* machin <6>: chapter. (line 966) -* machin <7>: chapter. (line 968) -* machin <8>: chapter. (line 1301) -* machin <9>: chapter. (line 1302) -* machin <10>: chapter. (line 1303) -* machin <11>: chapter. (line 1304) -* machin <12>: chapter. (line 1769) -* machin <13>: chapter. (line 1771) -* machin <14>: chapter. (line 2138) -* machin <15>: chapter. (line 2139) -* machin <16>: chapter. (line 2140) -* machin <17>: chapter. (line 2141) +* machin <2>: chapter. (line 635) +* machin <3>: chapter. (line 636) +* machin <4>: chapter. (line 637) +* machin <5>: chapter. (line 638) +* machin <6>: chapter. (line 967) +* machin <7>: chapter. (line 969) +* machin <8>: chapter. (line 1303) +* machin <9>: chapter. (line 1304) +* machin <10>: chapter. (line 1305) +* machin <11>: chapter. (line 1306) +* machin <12>: chapter. (line 1771) +* machin <13>: chapter. (line 1773) +* machin <14>: chapter. (line 2142) +* machin <15>: chapter. (line 2143) +* machin <16>: chapter. (line 2144) +* machin <17>: chapter. (line 2145) * n--ame: chapter. (line 320) * n--ame <1>: chapter. (line 323) -* n--ame <2>: chapter. (line 987) -* n--ame <3>: chapter. (line 990) -* n--ame <4>: chapter. (line 1792) -* n--ame <5>: chapter. (line 1795) +* n--ame <2>: chapter. (line 988) +* n--ame <3>: chapter. (line 991) +* n--ame <4>: chapter. (line 1794) +* n--ame <5>: chapter. (line 1797) * name2: chapter. (line 398) -* name2 <1>: chapter. (line 1065) -* name2 <2>: chapter. (line 1871) -* t--ruc: chapter. (line 2193) -* T--ruc: chapter. (line 2193) +* name2 <1>: chapter. (line 1066) +* name2 <2>: chapter. (line 1873) +* t--ruc: chapter. (line 2197) +* T--ruc: chapter. (line 2197) * truc: chapter. (line 292) * truc <1>: chapter. (line 314) -* truc <2>: chapter. (line 959) -* truc <3>: chapter. (line 981) -* truc <4>: chapter. (line 1762) -* truc <5>: chapter. (line 1785) -* xxx, zzz: chapter. (line 2193) +* truc <2>: chapter. (line 960) +* truc <3>: chapter. (line 982) +* truc <4>: chapter. (line 1764) +* truc <5>: chapter. (line 1787) +* xxx, zzz: chapter. (line 2197) Top section 1 chapter diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_rawtext/formatting.txt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_rawtext/formatting.txt index 714cab624e..ca36845a8d 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_rawtext/formatting.txt +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_rawtext/formatting.txt @@ -770,6 +770,7 @@ Invalid use of @': @image{f--ile,l--i} f--ile @image{f--ile,,l--e} f--ile @image{f--ile,aze,az,alt,.e--xt} f--ile +@image{f--ile,aze,az,alt, f--ile @image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@} f--ile@. @image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt} f--ile @@ -1601,6 +1602,7 @@ Invalid use of @': @image{f--ile,l--i} f--ile @image{f--ile,,l--e} f--ile @image{f--ile,aze,az,alt,.e--xt} f--ile +@image{f--ile,aze,az,alt, f--ile @image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@} f--ile@. @image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt} f--ile diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html index adf31647cd..d5d02bd638 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html @@ -741,6 +741,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile @@ -1849,6 +1850,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -2925,6 +2927,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -4034,6 +4037,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -5250,6 +5254,7 @@ Invalid use of @': <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> <code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -6338,6 +6343,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_textcontent/formatting b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_textcontent/formatting index e95185fd9c..9cd36c3c2e 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_textcontent/formatting +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_textcontent/formatting @@ -735,6 +735,7 @@ Invalid use of @': @image{f--ile,l--i} f--ilel--i @image{f--ile,,l--e} f--ilel--e @image{f--ile,aze,az,alt,.e--xt} f--ileazeazalt.e--xt +@image{f--ile,aze,az,alt, f--ileazeazalt @image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@} f--ile@.azeazalt.file ext e--xt} @image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt} f--ileazeazjk _" %@ in b "e--xt @@ -1560,6 +1561,7 @@ Invalid use of @': @image{f--ile,l--i} f--ilel--i @image{f--ile,,l--e} f--ilel--e @image{f--ile,aze,az,alt,.e--xt} f--ileazeazalt.e--xt +@image{f--ile,aze,az,alt, f--ileazeazalt @image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@} f--ile@.azeazalt.file ext e--xt} @image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt} f--ileazeazjk _" %@ in b "e--xt @@ -2406,6 +2408,7 @@ Invalid use of @': @image{f--ile,l--i} f--ilel--i @image{f--ile,,l--e} f--ilel--e @image{f--ile,aze,az,alt,.e--xt} f--ileazeazalt.e--xt +@image{f--ile,aze,az,alt, f--ileazeazalt @image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@} f--ile@.azeazalt.file ext e--xt} @image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt} f--ileazeazjk _" %@ in b "e--xt @@ -3226,6 +3229,7 @@ Invalid use of @': @image{f--ile,l--i} f--ilel--i @image{f--ile,,l--e} f--ilel--e @image{f--ile,aze,az,alt,.e--xt} f--ileazeazalt.e--xt +@image{f--ile,aze,az,alt, f--ileazeazalt @image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@} f--ile@.azeazalt.file ext e--xt} @image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt} f--ileazeazjk _" %@ in b "e--xt diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html index edb7ebea70..99514329a4 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile @@ -1850,6 +1851,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -2927,6 +2929,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -4060,6 +4063,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -5135,6 +5139,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -6352,6 +6357,7 @@ Invalid use of @': <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> <code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_xhtml/formatting.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_xhtml/formatting.html index 1c85f62eef..6b8371ca07 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_xhtml/formatting.html +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_xhtml/formatting.html @@ -742,6 +742,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile @@ -1850,6 +1851,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"/> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"/> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""/> @@ -2927,6 +2929,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"/> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"/> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""/> @@ -4060,6 +4063,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"/> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"/> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""/> @@ -5135,6 +5139,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"/> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"/> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""/> @@ -6352,6 +6357,7 @@ Invalid use of @': <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"/> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"/> <code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""/> diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_xml/formatting.xml b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_xml/formatting.xml index 6497e4c884..154bf59587 100644 --- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_xml/formatting.xml +++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_xml/formatting.xml @@ -1059,6 +1059,7 @@ Invalid use of @@':@* @code{@@image@{f--ile,l--i@}} @image{f--ile,l--i} @code{@@image@{f--ile,,l--e@}} @image{f--ile,,l--e} @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@{@@file@{f--ile@}@@@@@@.,aze,az,alt,@@file@{.file ext@} e--xt@@@}} @image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}} @c It is not reliable to use @verb inside other Texinfo constructs @@ -2194,6 +2195,7 @@ in verbatim '' <code>&arobase;image{f--ile,l--i}</code> <image where="inline"><imagefile>f--ile</imagefile><imagewidth>l--i</imagewidth></image> <code>&arobase;image{f--ile,,l--e}</code> <image where="inline"><imagefile>f--ile</imagefile><imageheight>l--e</imageheight></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{&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> </para> <!-- c It is not reliable to use @verb inside other Texinfo constructs --> @@ -3333,6 +3335,7 @@ in verbatim '' <code>&arobase;image{f--ile,l--i}</code> <image where="inline"><imagefile>f--ile</imagefile><imagewidth>l--i</imagewidth></image> <code>&arobase;image{f--ile,,l--e}</code> <image where="inline"><imagefile>f--ile</imagefile><imageheight>l--e</imageheight></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{&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> </para> <!-- c It is not reliable to use @verb inside other Texinfo constructs --> @@ -4499,6 +4502,7 @@ in verbatim '' <code>&arobase;image{f--ile,l--i}</code> <image where="inline"><imagefile>f--ile</imagefile><imagewidth>l--i</imagewidth></image> <code>&arobase;image{f--ile,,l--e}</code> <image where="inline"><imagefile>f--ile</imagefile><imageheight>l--e</imageheight></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{&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> </para> <!-- c It is not reliable to use @verb inside other Texinfo constructs --> @@ -5633,6 +5637,7 @@ Invalid use of &arobase;':&linebreak; <code>&arobase;image{f--ile,l--i}</code> <image where="inline"><imagefile>f--ile</imagefile><imagewidth>l--i</imagewidth></image> <code>&arobase;image{f--ile,,l--e}</code> <image where="inline"><imagefile>f--ile</imagefile><imageheight>l--e</imageheight></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{&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> <!-- c It is not reliable to use @verb inside other Texinfo constructs --> diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/anchor.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/anchor.html index f6368a1f65..57a05fbee4 100644 --- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/anchor.html +++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/anchor.html @@ -744,6 +744,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/chapter.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/chapter.html index 5f4392577f..e235abc43c 100644 --- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/chapter.html +++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/chapter.html @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile @@ -1991,6 +1992,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -3202,6 +3204,7 @@ html '' <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> </p> <p><code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> @@ -4555,6 +4558,7 @@ Invalid use of @': <code class="code">@image{f--ile,l--i}</code> <img class="image" src="f--ile.png" alt="f--ile"> <code class="code">@image{f--ile,,l--e}</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.e--xt" 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{@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"> <code class="code">@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _" %@ in b ""> diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html index c666c3beb9..39cf43e408 100644 --- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html +++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/index.htm b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/index.htm index ef348d56b7..bfd381a8bd 100644 --- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/index.htm +++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/index.htm @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/index.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/index.html index cb2128c275..0ec4de3f67 100644 --- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/index.html +++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/index.html @@ -744,6 +744,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html index a2521e2f43..66c48c7ff3 100644 --- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html +++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm index b84a7400f2..002a52628e 100644 --- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm +++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm index 0bcf254fbb..2358d36df6 100644 --- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm +++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm index 3149bf261b..5d0477a8c4 100644 --- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm +++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm index e3e81788f6..49a2d3ad7f 100644 --- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm +++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/subsection.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/subsection.html index 1c4a1723bc..3da158341c 100644 --- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/subsection.html +++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/subsection.html @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html index 25bba6037b..d0160345c9 100644 --- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html +++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html index 0a9d36bfd4..df61fa943f 100644 --- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html +++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html @@ -743,6 +743,7 @@ Invalid use of @': @image{f-ile,l-i} f-ile @image{f-ile,,l-e} f-ile @image{f-ile,aze,az,alt,.e-xt} f-ile +@image{f-ile,aze,az,alt, f-ile @image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@. @image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile |