[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_image_comm
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_image_command): format @image with an <img> tag in preformatted environment. Report from Per Bothner. |
|
Date: |
Sun, 02 May 2021 11:44:31 -0400 |
This is an automated email from the git hooks/post-receive script.
pertusus pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new 0ffd3a2 * tp/Texinfo/Convert/HTML.pm (_convert_image_command): format
@image with an <img> tag in preformatted environment. Report from Per Bothner.
0ffd3a2 is described below
commit 0ffd3a2cbb99ff29b71e22e3638b9ae6151588eb
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun May 2 17:44:21 2021 +0200
* tp/Texinfo/Convert/HTML.pm (_convert_image_command): format
@image with an <img> tag in preformatted environment. Report from
Per Bothner.
---
ChangeLog | 6 ++++++
tp/Texinfo/Convert/HTML.pm | 25 ++++++----------------
tp/t/results/converters_tests/image_formatting.pl | 18 ++++++++--------
tp/t/results/coverage_braces/test_image.pl | 12 +++++------
tp/t/results/html_tests/commands_in_alt.pl | 2 +-
.../layout/res_parser/formatting/formatting.html | 22 +++++++++----------
.../res_parser/formatting_chm/formatting.html | 22 +++++++++----------
.../layout/res_parser/formatting_exotic/index.html | 22 +++++++++----------
.../res_parser/formatting_fr_icons/formatting.html | 22 +++++++++----------
.../res_parser/formatting_html/formatting.html | 22 +++++++++----------
.../res_parser/formatting_html32/formatting.html | 22 +++++++++----------
.../res_parser/formatting_html_nodes/index.html | 22 +++++++++----------
.../res_parser/formatting_mathjax/formatting.html | 22 +++++++++----------
.../layout/res_parser/formatting_nodes/index.html | 22 +++++++++----------
.../formatting_regions/formatting_regions.html | 22 +++++++++----------
.../formatting_weird_quotes/formatting.html | 22 +++++++++----------
.../res_parser/formatting_singular/index.htm | 22 +++++++++----------
17 files changed, 161 insertions(+), 166 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1adea39..c28aa95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2021-05-02 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/HTML.pm (_convert_image_command): format
+ @image with an <img> tag in preformatted environment. Report from
+ Per Bothner.
+
2021-05-02 Per Bothner <per@bothner.com>
* js/info.js: Fix sidebar-update after selecting non-section link.
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index abb57b2..67802d1 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -1829,25 +1829,14 @@ sub _convert_image_command($$$$)
if (defined($self->get_conf('IMAGE_LINK_PREFIX'))) {
$image_file = $self->get_conf('IMAGE_LINK_PREFIX') . $image_file;
}
- if ($self->in_preformatted()) {
- my $alt_text;
- if (defined($args->[3]) and defined($args->[3]->{'normal'})) {
- $alt_text = $args->[3]->{'normal'};
- }
- if (!defined($alt_text) or ($alt_text eq '')) {
- $alt_text = $self->protect_text($basefile);
- }
- return "[ $alt_text ]";
- } else {
- my $alt_string;
- if (defined($args->[3]) and defined($args->[3]->{'string'})) {
- $alt_string = $args->[3]->{'string'};
- }
- if (!defined($alt_string) or ($alt_string eq '')) {
- $alt_string = $self->protect_text($basefile);
- }
- return "<img src=\"".$self->protect_text($image_file)."\"
alt=\"$alt_string\">";
+ my $alt_string;
+ if (defined($args->[3]) and defined($args->[3]->{'string'})) {
+ $alt_string = $args->[3]->{'string'};
+ }
+ if (!defined($alt_string) or ($alt_string eq '')) {
+ $alt_string = $self->protect_text($basefile);
}
+ return "<img src=\"".$self->protect_text($image_file)."\"
alt=\"$alt_string\">";
}
return '';
}
diff --git a/tp/t/results/converters_tests/image_formatting.pl
b/tp/t/results/converters_tests/image_formatting.pl
index 0e250f5..4411b87 100644
--- a/tp/t/results/converters_tests/image_formatting.pl
+++ b/tp/t/results/converters_tests/image_formatting.pl
@@ -2588,15 +2588,15 @@ $result_converted{'html_text'}->{'image_formatting'} =
'<span id="Top"></span><h
<img src="image.jpg" alt="image"> <img src="image.jpg" alt="image">
</p>
<div class="example">
-<pre class="example"><code>@image{f--ile}</code> [ f--ile ]
-<code>@image{f--ile,l--i}</code> [ f--ile ]
-<code>@image{f--ile,,l--e}</code> [ f--ile ]
-<code>@image{f--ile,,,alt}</code> [ alt ]
-<code>@image{f--ile,,,,e-d-xt}</code> [ f--ile ]
-<code>@image{f--ile,aze,az,alt,e--xt}</code> [ alt ]
-<code>@image{f-ile,aze,,a--lt}</code> [ a--lt ]
-<code>@image{@file{f--ile}@@@.,aze,az,alt,@file{file ext} e--xt@}</code> [ alt
]
-[ image ] [ image ]
+<pre class="example"><code>@image{f--ile}</code> <img src="f--ile.png"
alt="f--ile">
+<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,,,alt}</code> <img src="f--ile.png" alt="alt">
+<code>@image{f--ile,,,,e-d-xt}</code> <img src="f--ile.png" alt="f--ile">
+<code>@image{f--ile,aze,az,alt,e--xt}</code> <img src="f--ile.png" alt="alt">
+<code>@image{f-ile,aze,,a--lt}</code> <img src="f-ile.jpg" alt="a–lt">
+<code>@image{@file{f--ile}@@@.,aze,az,alt,@file{file ext} e--xt@}</code> <img
src="f--ile@.file ext e--xt}" alt="alt">
+<img src="image.jpg" alt="image"> <img src="image.jpg" alt="image">
</pre></div>
<img src="f--ile.png" alt="a very long alt argument that could span more than
one line who knows">
diff --git a/tp/t/results/coverage_braces/test_image.pl
b/tp/t/results/coverage_braces/test_image.pl
index 5698a4f..49aeef6 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -3964,10 +3964,10 @@ ul.no-bullet {list-style: none}
<"%@ < & @ % " ">.
</p>
<div class="example">
-<pre class="example">[ f@i--le.. a@<"%@ < & @ % " ]
+<pre class="example"><img src="f@i--le.. a@<"%@ < & @ %
" .ext@i--le.. a@<"%@ < & @ % " " alt="f@i--le..
a@<"%@ < & @ % " ">
-In text [ alt <b>î–le..</b> a
-<"%@<tt> < & @ % " </tt> ].
+In text <img src="f@i--le.. a@<"%@ < & @ % "
.ext@i--le.. a@<"%@ < & @ % " " alt="alt
î–le.. a
+<"%@ < & @ % " ">.
</pre></div>
<div class="float"><span id="Image-with-commands"></span>
@@ -4205,10 +4205,10 @@ $result_converted{'html_text'}->{'test_image'} = '
<"%@ < & @ % " ">.
</p>
<div class="example">
-<pre class="example">[ f@i--le.. a@<"%@ < & @ % " ]
+<pre class="example"><img src="f@i--le.. a@<"%@ < & @ %
" .ext@i--le.. a@<"%@ < & @ % " " alt="f@i--le..
a@<"%@ < & @ % " ">
-In text [ alt <b>î–le..</b> a
-<"%@<tt> < & @ % " </tt> ].
+In text <img src="f@i--le.. a@<"%@ < & @ % "
.ext@i--le.. a@<"%@ < & @ % " " alt="alt
î–le.. a
+<"%@ < & @ % " ">.
</pre></div>
<div class="float"><span id="Image-with-commands"></span>
diff --git a/tp/t/results/html_tests/commands_in_alt.pl
b/tp/t/results/html_tests/commands_in_alt.pl
index 25ed0a6..e5db480 100644
--- a/tp/t/results/html_tests/commands_in_alt.pl
+++ b/tp/t/results/html_tests/commands_in_alt.pl
@@ -311,7 +311,7 @@ ul.no-bullet {list-style: none}
<img src="f--ile.png" alt="alt – in b">
<div class="example">
-<pre class="example">[ alt -- <b>in b</b> ]
+<pre class="example"><img src="f--ile.png" alt="alt – in b">
</pre></div>
diff --git a/tp/tests/layout/res_parser/formatting/formatting.html
b/tp/tests/layout/res_parser/formatting/formatting.html
index 4262a27..75ef67c 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/tp/tests/layout/res_parser/formatting/formatting.html
@@ -3913,14 +3913,14 @@ but , ,
<code>@footnote{in footnote}</code> <a id="DOCF7" href="#FOOT7">(5)</a>
<code>@footnote{in footnote2}</code> <a id="DOCF8" href="#FOOT8">(6)</a>
-<code>@image{f--ile}</code> [ f--ile ]
-<code>@image{f--ile,l--i}</code> [ f--ile ]
-<code>@image{f--ile,,l--e}</code> [ f--ile ]
-<code>@image{f--ile,,,alt}</code> [ alt ]
-<code>@image{f--ile,,,,.e-d-xt}</code> [ f--ile ]
-<code>@image{f--ile,aze,az,alt,.e--xt}</code> [ alt ]
-<code>@image{f-ile,aze,,a--lt}</code> [ a--lt ]
-<code>@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> [
alt ]
+<code>@image{f--ile}</code> <img src="f--ile.png" alt="f--ile">
+<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,,,alt}</code> <img src="f--ile.png" alt="alt">
+<code>@image{f--ile,,,,.e-d-xt}</code> <img src="f--ile.e--xt" 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,,a--lt}</code> <img src="f-ile.jpg" alt="a–lt">
+<code>@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img
src="f--ile@..file ext e--xt}" alt="alt">
@@ -4467,9 +4467,9 @@ html ''
<code>@math{--a@minus{} {\frac{1}{2}}}</code> <em class='math'>--a-
{\frac{1}{2}}</em>
-<code>@image{f-ile,,,alt@verb{:jk _" %}}</code> [ alt<tt>jk _"
%@</tt> ]
-<code>@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b
"},e--xt}</code> [ <tt>jk _" %@</tt> <b>in b "</b> ]
-<code>@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> [
alt<tt>jk _" %@</tt> ]
+<code>@image{f-ile,,,alt@verb{:jk _" %}}</code> <img src="f-ile.jpg"
alt="altjk _" %@">
+<code>@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b
"},e--xt}</code> <img src="f--ile.e--xt" alt="jk _" %@ in b "">
+<code>@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code>
<img src="filejk _" %@.jpg" alt="altjk _" %@">
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.html
b/tp/tests/layout/res_parser/formatting_chm/formatting.html
index d7ba08d..f257035 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting.html
@@ -3896,14 +3896,14 @@ but , ,
<code>@footnote{in footnote}</code> <a id="DOCF7" href="#FOOT7">(5)</a>
<code>@footnote{in footnote2}</code> <a id="DOCF8" href="#FOOT8">(6)</a>
-<code>@image{f--ile}</code> [ f--ile ]
-<code>@image{f--ile,l--i}</code> [ f--ile ]
-<code>@image{f--ile,,l--e}</code> [ f--ile ]
-<code>@image{f--ile,,,alt}</code> [ alt ]
-<code>@image{f--ile,,,,.e-d-xt}</code> [ f--ile ]
-<code>@image{f--ile,aze,az,alt,.e--xt}</code> [ alt ]
-<code>@image{f-ile,aze,,a--lt}</code> [ a--lt ]
-<code>@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> [
alt ]
+<code>@image{f--ile}</code> <img src="f--ile.png" alt="f--ile">
+<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,,,alt}</code> <img src="f--ile.png" alt="alt">
+<code>@image{f--ile,,,,.e-d-xt}</code> <img src="f--ile.e--xt" 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,,a--lt}</code> <img src="f-ile.jpg" alt="a–lt">
+<code>@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img
src="f--ile@..file ext e--xt}" alt="alt">
@@ -4450,9 +4450,9 @@ html ''
<code>@math{--a@minus{} {\frac{1}{2}}}</code> <em class='math'>--a-
{\frac{1}{2}}</em>
-<code>@image{f-ile,,,alt@verb{:jk _" %}}</code> [ alt<tt>jk _"
%@</tt> ]
-<code>@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b
"},e--xt}</code> [ <tt>jk _" %@</tt> <b>in b "</b> ]
-<code>@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> [
alt<tt>jk _" %@</tt> ]
+<code>@image{f-ile,,,alt@verb{:jk _" %}}</code> <img src="f-ile.jpg"
alt="altjk _" %@">
+<code>@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b
"},e--xt}</code> <img src="f--ile.e--xt" alt="jk _" %@ in b "">
+<code>@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code>
<img src="filejk _" %@.jpg" alt="altjk _" %@">
diff --git a/tp/tests/layout/res_parser/formatting_exotic/index.html
b/tp/tests/layout/res_parser/formatting_exotic/index.html
index 7ee0820..f76648f 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/index.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/index.html
@@ -2385,14 +2385,14 @@ but , ,
<code>@footnote{in footnote}</code> <a id="DOCF7" href="#FOOT7">(5)</a>
<code>@footnote{in footnote2}</code> <a id="DOCF8" href="#FOOT8">(6)</a>
-<code>@image{f--ile}</code> [ f--ile ]
-<code>@image{f--ile,l--i}</code> [ f--ile ]
-<code>@image{f--ile,,l--e}</code> [ f--ile ]
-<code>@image{f--ile,,,alt}</code> [ alt ]
-<code>@image{f--ile,,,,.e-d-xt}</code> [ f--ile ]
-<code>@image{f--ile,aze,az,alt,.e--xt}</code> [ alt ]
-<code>@image{f-ile,aze,,a--lt}</code> [ a--lt ]
-<code>@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> [
alt ]
+<code>@image{f--ile}</code> <img src="f--ile.png" alt="f--ile">
+<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,,,alt}</code> <img src="f--ile.png" alt="alt">
+<code>@image{f--ile,,,,.e-d-xt}</code> <img src="f--ile.e--xt" 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,,a--lt}</code> <img src="f-ile.jpg" alt="a–lt">
+<code>@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img
src="f--ile@..file ext e--xt}" alt="alt">
@@ -2939,9 +2939,9 @@ html ''
<code>@math{--a@minus{} {\frac{1}{2}}}</code> <em class='math'>--a-
{\frac{1}{2}}</em>
-<code>@image{f-ile,,,alt@verb{:jk _" %}}</code> [ alt<tt>jk _"
%@</tt> ]
-<code>@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b
"},e--xt}</code> [ <tt>jk _" %@</tt> <b>in b "</b> ]
-<code>@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> [
alt<tt>jk _" %@</tt> ]
+<code>@image{f-ile,,,alt@verb{:jk _" %}}</code> <img src="f-ile.jpg"
alt="altjk _" %@">
+<code>@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b
"},e--xt}</code> <img src="f--ile.e--xt" alt="jk _" %@ in b "">
+<code>@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code>
<img src="filejk _" %@.jpg" alt="altjk _" %@">
diff --git a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
index dba6cc4..399abf4 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -3913,14 +3913,14 @@ but , ,
<code>@footnote{in footnote}</code> <a id="DOCF7" href="#FOOT7">(5)</a>
<code>@footnote{in footnote2}</code> <a id="DOCF8" href="#FOOT8">(6)</a>
-<code>@image{f--ile}</code> [ f--ile ]
-<code>@image{f--ile,l--i}</code> [ f--ile ]
-<code>@image{f--ile,,l--e}</code> [ f--ile ]
-<code>@image{f--ile,,,alt}</code> [ alt ]
-<code>@image{f--ile,,,,.e-d-xt}</code> [ f--ile ]
-<code>@image{f--ile,aze,az,alt,.e--xt}</code> [ alt ]
-<code>@image{f-ile,aze,,a--lt}</code> [ a--lt ]
-<code>@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> [
alt ]
+<code>@image{f--ile}</code> <img src="f--ile.png" alt="f--ile">
+<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,,,alt}</code> <img src="f--ile.png" alt="alt">
+<code>@image{f--ile,,,,.e-d-xt}</code> <img src="f--ile.e--xt" 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,,a--lt}</code> <img src="f-ile.jpg" alt="a–lt">
+<code>@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img
src="f--ile@..file ext e--xt}" alt="alt">
@@ -4467,9 +4467,9 @@ html ''
<code>@math{--a@minus{} {\frac{1}{2}}}</code> <em class='math'>--a-
{\frac{1}{2}}</em>
-<code>@image{f-ile,,,alt@verb{:jk _" %}}</code> [ alt<tt>jk _"
%@</tt> ]
-<code>@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b
"},e--xt}</code> [ <tt>jk _" %@</tt> <b>in b "</b> ]
-<code>@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> [
alt<tt>jk _" %@</tt> ]
+<code>@image{f-ile,,,alt@verb{:jk _" %}}</code> <img src="f-ile.jpg"
alt="altjk _" %@">
+<code>@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b
"},e--xt}</code> <img src="f--ile.e--xt" alt="jk _" %@ in b "">
+<code>@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code>
<img src="filejk _" %@.jpg" alt="altjk _" %@">
diff --git a/tp/tests/layout/res_parser/formatting_html/formatting.html
b/tp/tests/layout/res_parser/formatting_html/formatting.html
index 4262a27..75ef67c 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -3913,14 +3913,14 @@ but , ,
<code>@footnote{in footnote}</code> <a id="DOCF7" href="#FOOT7">(5)</a>
<code>@footnote{in footnote2}</code> <a id="DOCF8" href="#FOOT8">(6)</a>
-<code>@image{f--ile}</code> [ f--ile ]
-<code>@image{f--ile,l--i}</code> [ f--ile ]
-<code>@image{f--ile,,l--e}</code> [ f--ile ]
-<code>@image{f--ile,,,alt}</code> [ alt ]
-<code>@image{f--ile,,,,.e-d-xt}</code> [ f--ile ]
-<code>@image{f--ile,aze,az,alt,.e--xt}</code> [ alt ]
-<code>@image{f-ile,aze,,a--lt}</code> [ a--lt ]
-<code>@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> [
alt ]
+<code>@image{f--ile}</code> <img src="f--ile.png" alt="f--ile">
+<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,,,alt}</code> <img src="f--ile.png" alt="alt">
+<code>@image{f--ile,,,,.e-d-xt}</code> <img src="f--ile.e--xt" 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,,a--lt}</code> <img src="f-ile.jpg" alt="a–lt">
+<code>@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img
src="f--ile@..file ext e--xt}" alt="alt">
@@ -4467,9 +4467,9 @@ html ''
<code>@math{--a@minus{} {\frac{1}{2}}}</code> <em class='math'>--a-
{\frac{1}{2}}</em>
-<code>@image{f-ile,,,alt@verb{:jk _" %}}</code> [ alt<tt>jk _"
%@</tt> ]
-<code>@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b
"},e--xt}</code> [ <tt>jk _" %@</tt> <b>in b "</b> ]
-<code>@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> [
alt<tt>jk _" %@</tt> ]
+<code>@image{f-ile,,,alt@verb{:jk _" %}}</code> <img src="f-ile.jpg"
alt="altjk _" %@">
+<code>@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b
"},e--xt}</code> <img src="f--ile.e--xt" alt="jk _" %@ in b "">
+<code>@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code>
<img src="filejk _" %@.jpg" alt="altjk _" %@">
diff --git a/tp/tests/layout/res_parser/formatting_html32/formatting.html
b/tp/tests/layout/res_parser/formatting_html32/formatting.html
index 039c6d4..7a785dd 100644
--- a/tp/tests/layout/res_parser/formatting_html32/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html32/formatting.html
@@ -3825,14 +3825,14 @@ but , ,
<code>@footnote{in footnote}</code> <a id="DOCF7" href="#FOOT7">(5)</a>
<code>@footnote{in footnote2}</code> <a id="DOCF8" href="#FOOT8">(6)</a>
-<code>@image{f--ile}</code> [ f--ile ]
-<code>@image{f--ile,l--i}</code> [ f--ile ]
-<code>@image{f--ile,,l--e}</code> [ f--ile ]
-<code>@image{f--ile,,,alt}</code> [ alt ]
-<code>@image{f--ile,,,,.e-d-xt}</code> [ f--ile ]
-<code>@image{f--ile,aze,az,alt,.e--xt}</code> [ alt ]
-<code>@image{f-ile,aze,,a--lt}</code> [ a--lt ]
-<code>@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> [
alt ]
+<code>@image{f--ile}</code> <img src="f--ile.png" alt="f--ile">
+<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,,,alt}</code> <img src="f--ile.png" alt="alt">
+<code>@image{f--ile,,,,.e-d-xt}</code> <img src="f--ile.e--xt" 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,,a--lt}</code> <img src="f-ile.jpg" alt="a-lt">
+<code>@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img
src="f--ile@..file ext e--xt}" alt="alt">
@@ -4362,9 +4362,9 @@ html ''
<code>@math{--a@minus{} {\frac{1}{2}}}</code> <em class='math'>--a-
{\frac{1}{2}}</em>
-<code>@image{f-ile,,,alt@verb{:jk _" %}}</code> [ alt<tt>jk _" %@</tt>
]
-<code>@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code>
[ <tt>jk _" %@</tt> <b>in b "</b> ]
-<code>@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> [
alt<tt>jk _" %@</tt> ]
+<code>@image{f-ile,,,alt@verb{:jk _" %}}</code> <img src="f-ile.jpg"
alt="altjk _" %@">
+<code>@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b "},e--xt}</code>
<img src="f--ile.e--xt" alt="jk _" %@ in b "">
+<code>@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> <img
src="filejk _" %@.jpg" alt="altjk _" %@">
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
index b9da893..3845637 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
@@ -3914,14 +3914,14 @@ but , ,
<code>@footnote{in footnote}</code> <a id="DOCF7"
href="formatting_fot.html#FOOT7">(5)</a>
<code>@footnote{in footnote2}</code> <a id="DOCF8"
href="formatting_fot.html#FOOT8">(6)</a>
-<code>@image{f--ile}</code> [ f--ile ]
-<code>@image{f--ile,l--i}</code> [ f--ile ]
-<code>@image{f--ile,,l--e}</code> [ f--ile ]
-<code>@image{f--ile,,,alt}</code> [ alt ]
-<code>@image{f--ile,,,,.e-d-xt}</code> [ f--ile ]
-<code>@image{f--ile,aze,az,alt,.e--xt}</code> [ alt ]
-<code>@image{f-ile,aze,,a--lt}</code> [ a--lt ]
-<code>@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> [
alt ]
+<code>@image{f--ile}</code> <img src="f--ile.png" alt="f--ile">
+<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,,,alt}</code> <img src="f--ile.png" alt="alt">
+<code>@image{f--ile,,,,.e-d-xt}</code> <img src="f--ile.e--xt" 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,,a--lt}</code> <img src="f-ile.jpg" alt="a–lt">
+<code>@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img
src="f--ile@..file ext e--xt}" alt="alt">
@@ -4468,9 +4468,9 @@ html ''
<code>@math{--a@minus{} {\frac{1}{2}}}</code> <em class='math'>--a-
{\frac{1}{2}}</em>
-<code>@image{f-ile,,,alt@verb{:jk _" %}}</code> [ alt<tt>jk _"
%@</tt> ]
-<code>@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b
"},e--xt}</code> [ <tt>jk _" %@</tt> <b>in b "</b> ]
-<code>@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> [
alt<tt>jk _" %@</tt> ]
+<code>@image{f-ile,,,alt@verb{:jk _" %}}</code> <img src="f-ile.jpg"
alt="altjk _" %@">
+<code>@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b
"},e--xt}</code> <img src="f--ile.e--xt" alt="jk _" %@ in b "">
+<code>@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code>
<img src="filejk _" %@.jpg" alt="altjk _" %@">
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
index e5d2316..3ba3ab2 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -3923,14 +3923,14 @@ but , ,
<code>@footnote{in footnote}</code> <a id="DOCF7" href="#FOOT7">(5)</a>
<code>@footnote{in footnote2}</code> <a id="DOCF8" href="#FOOT8">(6)</a>
-<code>@image{f--ile}</code> [ f--ile ]
-<code>@image{f--ile,l--i}</code> [ f--ile ]
-<code>@image{f--ile,,l--e}</code> [ f--ile ]
-<code>@image{f--ile,,,alt}</code> [ alt ]
-<code>@image{f--ile,,,,.e-d-xt}</code> [ f--ile ]
-<code>@image{f--ile,aze,az,alt,.e--xt}</code> [ alt ]
-<code>@image{f-ile,aze,,a--lt}</code> [ a--lt ]
-<code>@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> [
alt ]
+<code>@image{f--ile}</code> <img src="f--ile.png" alt="f--ile">
+<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,,,alt}</code> <img src="f--ile.png" alt="alt">
+<code>@image{f--ile,,,,.e-d-xt}</code> <img src="f--ile.e--xt" 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,,a--lt}</code> <img src="f-ile.jpg" alt="a–lt">
+<code>@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img
src="f--ile@..file ext e--xt}" alt="alt">
@@ -4477,9 +4477,9 @@ html ''
<code>@math{--a@minus{} {\frac{1}{2}}}</code> <em
class='tex2jax_process'>\(--a- {\frac{1}{2}}\)</em>
-<code>@image{f-ile,,,alt@verb{:jk _" %}}</code> [ alt<tt>jk _"
%@</tt> ]
-<code>@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b
"},e--xt}</code> [ <tt>jk _" %@</tt> <b>in b "</b> ]
-<code>@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> [
alt<tt>jk _" %@</tt> ]
+<code>@image{f-ile,,,alt@verb{:jk _" %}}</code> <img src="f-ile.jpg"
alt="altjk _" %@">
+<code>@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b
"},e--xt}</code> <img src="f--ile.e--xt" alt="jk _" %@ in b "">
+<code>@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code>
<img src="filejk _" %@.jpg" alt="altjk _" %@">
diff --git a/tp/tests/layout/res_parser/formatting_nodes/index.html
b/tp/tests/layout/res_parser/formatting_nodes/index.html
index b9da893..3845637 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/index.html
@@ -3914,14 +3914,14 @@ but , ,
<code>@footnote{in footnote}</code> <a id="DOCF7"
href="formatting_fot.html#FOOT7">(5)</a>
<code>@footnote{in footnote2}</code> <a id="DOCF8"
href="formatting_fot.html#FOOT8">(6)</a>
-<code>@image{f--ile}</code> [ f--ile ]
-<code>@image{f--ile,l--i}</code> [ f--ile ]
-<code>@image{f--ile,,l--e}</code> [ f--ile ]
-<code>@image{f--ile,,,alt}</code> [ alt ]
-<code>@image{f--ile,,,,.e-d-xt}</code> [ f--ile ]
-<code>@image{f--ile,aze,az,alt,.e--xt}</code> [ alt ]
-<code>@image{f-ile,aze,,a--lt}</code> [ a--lt ]
-<code>@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> [
alt ]
+<code>@image{f--ile}</code> <img src="f--ile.png" alt="f--ile">
+<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,,,alt}</code> <img src="f--ile.png" alt="alt">
+<code>@image{f--ile,,,,.e-d-xt}</code> <img src="f--ile.e--xt" 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,,a--lt}</code> <img src="f-ile.jpg" alt="a–lt">
+<code>@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img
src="f--ile@..file ext e--xt}" alt="alt">
@@ -4468,9 +4468,9 @@ html ''
<code>@math{--a@minus{} {\frac{1}{2}}}</code> <em class='math'>--a-
{\frac{1}{2}}</em>
-<code>@image{f-ile,,,alt@verb{:jk _" %}}</code> [ alt<tt>jk _"
%@</tt> ]
-<code>@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b
"},e--xt}</code> [ <tt>jk _" %@</tt> <b>in b "</b> ]
-<code>@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> [
alt<tt>jk _" %@</tt> ]
+<code>@image{f-ile,,,alt@verb{:jk _" %}}</code> <img src="f-ile.jpg"
alt="altjk _" %@">
+<code>@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b
"},e--xt}</code> <img src="f--ile.e--xt" alt="jk _" %@ in b "">
+<code>@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code>
<img src="filejk _" %@.jpg" alt="altjk _" %@">
diff --git
a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
index c492d49..32a17cc 100644
--- a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
@@ -3162,14 +3162,14 @@ but , ,
<code>@footnote{in footnote}</code> <a id="DOCF7" href="#FOOT7">(7)</a>
<code>@footnote{in footnote2}</code> <a id="DOCF8" href="#FOOT8">(8)</a>
-<code>@image{f--ile}</code> [ f--ile ]
-<code>@image{f--ile,l--i}</code> [ f--ile ]
-<code>@image{f--ile,,l--e}</code> [ f--ile ]
-<code>@image{f--ile,,,alt}</code> [ alt ]
-<code>@image{f--ile,,,,.e-d-xt}</code> [ f--ile ]
-<code>@image{f--ile,aze,az,alt,.e--xt}</code> [ alt ]
-<code>@image{f-ile,aze,,a--lt}</code> [ a--lt ]
-<code>@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> [
alt ]
+<code>@image{f--ile}</code> <img src="f--ile.png" alt="f--ile">
+<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,,,alt}</code> <img src="f--ile.png" alt="alt">
+<code>@image{f--ile,,,,.e-d-xt}</code> <img src="f--ile.e--xt" 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,,a--lt}</code> <img src="f-ile.jpg" alt="a–lt">
+<code>@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img
src="f--ile@..file ext e--xt}" alt="alt">
@@ -3716,9 +3716,9 @@ html ''
<code>@math{--a@minus{} {\frac{1}{2}}}</code> <em class='math'>--a-
{\frac{1}{2}}</em>
-<code>@image{f-ile,,,alt@verb{:jk _" %}}</code> [ alt<tt>jk _"
%@</tt> ]
-<code>@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b
"},e--xt}</code> [ <tt>jk _" %@</tt> <b>in b "</b> ]
-<code>@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> [
alt<tt>jk _" %@</tt> ]
+<code>@image{f-ile,,,alt@verb{:jk _" %}}</code> <img src="f-ile.jpg"
alt="altjk _" %@">
+<code>@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b
"},e--xt}</code> <img src="f--ile.e--xt" alt="jk _" %@ in b "">
+<code>@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code>
<img src="filejk _" %@.jpg" alt="altjk _" %@">
diff --git a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
index e0ac74b..88d31a8 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -3913,14 +3913,14 @@ but , ,
<code>@footnote{in footnote}</code> <a id="DOCF7" href="#FOOT7">(5)</a>
<code>@footnote{in footnote2}</code> <a id="DOCF8" href="#FOOT8">(6)</a>
-<code>@image{f--ile}</code> [ f--ile ]
-<code>@image{f--ile,l--i}</code> [ f--ile ]
-<code>@image{f--ile,,l--e}</code> [ f--ile ]
-<code>@image{f--ile,,,alt}</code> [ alt ]
-<code>@image{f--ile,,,,.e-d-xt}</code> [ f--ile ]
-<code>@image{f--ile,aze,az,alt,.e--xt}</code> [ alt ]
-<code>@image{f-ile,aze,,a--lt}</code> [ a--lt ]
-<code>@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> [
alt ]
+<code>@image{f--ile}</code> <img src="f--ile.png" alt="f--ile">
+<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,,,alt}</code> <img src="f--ile.png" alt="alt">
+<code>@image{f--ile,,,,.e-d-xt}</code> <img src="f--ile.e--xt" 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,,a--lt}</code> <img src="f-ile.jpg" alt="a–lt">
+<code>@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img
src="f--ile@..file ext e--xt}" alt="alt">
@@ -4467,9 +4467,9 @@ html ''
<code>@math{--a@minus{} {\frac{1}{2}}}</code> <em class='math'>--a-
{\frac{1}{2}}</em>
-<code>@image{f-ile,,,alt@verb{:jk _" %}}</code> [ alt<tt>jk _"
%@</tt> ]
-<code>@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b
"},e--xt}</code> [ <tt>jk _" %@</tt> <b>in b "</b> ]
-<code>@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> [
alt<tt>jk _" %@</tt> ]
+<code>@image{f-ile,,,alt@verb{:jk _" %}}</code> <img src="f-ile.jpg"
alt="altjk _" %@">
+<code>@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b
"},e--xt}</code> <img src="f--ile.e--xt" alt="jk _" %@ in b "">
+<code>@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code>
<img src="filejk _" %@.jpg" alt="altjk _" %@">
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/index.htm
b/tp/tests/tex_html/res_parser/formatting_singular/index.htm
index 3649ad5..0ced216 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/index.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/index.htm
@@ -2485,14 +2485,14 @@ but , ,
<code>@footnote{in footnote}</code> <a id="DOCF7"
href="sing_fot.htm#FOOT7">(5)</a>
<code>@footnote{in footnote2}</code> <a id="DOCF8"
href="sing_fot.htm#FOOT8">(6)</a>
-<code>@image{f--ile}</code> [ f--ile ]
-<code>@image{f--ile,l--i}</code> [ f--ile ]
-<code>@image{f--ile,,l--e}</code> [ f--ile ]
-<code>@image{f--ile,,,alt}</code> [ alt ]
-<code>@image{f--ile,,,,.e-d-xt}</code> [ f--ile ]
-<code>@image{f--ile,aze,az,alt,.e--xt}</code> [ alt ]
-<code>@image{f-ile,aze,,a--lt}</code> [ a--lt ]
-<code>@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> [
alt ]
+<code>@image{f--ile}</code> <img src="f--ile.png" alt="f--ile">
+<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,,,alt}</code> <img src="f--ile.png" alt="alt">
+<code>@image{f--ile,,,,.e-d-xt}</code> <img src="f--ile.e--xt" 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,,a--lt}</code> <img src="f-ile.jpg" alt="a–lt">
+<code>@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img
src="f--ile@..file ext e--xt}" alt="alt">
@@ -3068,9 +3068,9 @@ html ''
STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_3.svg"
ALT="$--a@minus{} {\frac{1}{2}}$"></SPAN>
-<code>@image{f-ile,,,alt@verb{:jk _" %}}</code> [ alt<tt>jk _"
%@</tt> ]
-<code>@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b
"},e--xt}</code> [ <tt>jk _" %@</tt> <b>in b "</b> ]
-<code>@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code> [
alt<tt>jk _" %@</tt> ]
+<code>@image{f-ile,,,alt@verb{:jk _" %}}</code> <img src="f-ile.jpg"
alt="altjk _" %@">
+<code>@image{f--ile,aze,az,@verb{:jk _" %@:} @b{in b
"},e--xt}</code> <img src="f--ile.e--xt" alt="jk _" %@ in b "">
+<code>@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}</code>
<img src="filejk _" %@.jpg" alt="altjk _" %@">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_image_command): format @image with an <img> tag in preformatted environment. Report from Per Bothner.,
Patrice Dumas <=