texinfo-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[no subject]

From: Patrice Dumas
Date: Sat, 6 Aug 2022 13:27:27 -0400 (EDT) 
branch: master
commit 5c90088a59675f26e4d6f473479b7e75abf7fa18
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Aug 6 19:25:11 2022 +0200

    Percent encode more characters in @image file name
    
    * tp/Texinfo/Convert/HTML.pm (url_protect_file_text)
    (_convert_image_command), tp/ext/epub3.pm
    (epub_convert_image_command): add url_protect_file_text()
    to protect file name in url, protecting everything that
    can be special in url except ~, / and : that could appear in
    file names.
    
    * tp/Texinfo/Convert/HTML.pm (url_protect_url_text):
    rename protect_url_text as url_protect_url_text.
---
 ChangeLog                                          | 14 +++++
 tp/Texinfo/Convert/HTML.pm                         | 63 +++++++++++++---------
 tp/ext/epub3.pm                                    |  2 +-
 tp/t/results/converters_tests/image_formatting.pl  |  4 +-
 tp/t/results/coverage_braces/test_image.pl         | 48 ++++++++---------
 .../layout/res_parser/formatting/formatting.html   | 20 +++----
 .../layout/res_parser/formatting_chm/chapter.html  | 12 ++---
 .../res_parser/formatting_chm/formatting.html      |  8 +--
 .../formatting_enable_encoding/formatting.html     | 20 +++----
 .../res_parser/formatting_exotic/chapter.html      | 12 ++---
 .../res_parser/formatting_fr_icons/formatting.html | 20 +++----
 .../res_parser/formatting_html/formatting.html     | 20 +++----
 .../res_parser/formatting_html32/formatting.html   | 20 +++----
 .../formatting_html_no_texi2html/formatting.html   | 12 ++---
 .../res_parser/formatting_html_nodes/chapter.html  | 12 ++---
 .../res_parser/formatting_html_nodes/index.html    |  8 +--
 .../formatting_inline_css/formatting.html          | 20 +++----
 .../res_parser/formatting_mathjax/formatting.html  | 20 +++----
 .../res_parser/formatting_nodes/chapter.html       | 12 ++---
 .../layout/res_parser/formatting_nodes/index.html  |  8 +--
 .../formatting_numerical_entities/formatting.html  | 20 +++----
 .../formatting_regions/formatting_regions.html     | 20 +++----
 .../formatting_weird_quotes/formatting.html        | 20 +++----
 .../res_parser/formatting_xhtml/formatting.html    | 20 +++----
 .../res_parser/formatting_singular/chapter.html    | 12 ++---
 25 files changed, 236 insertions(+), 211 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c67a81b7a9..b0491cc194 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2022-08-06  Patrice Dumas  <pertusus@free.fr>
+
+       Percent encode more characters in @image file name
+
+       * tp/Texinfo/Convert/HTML.pm (url_protect_file_text)
+       (_convert_image_command), tp/ext/epub3.pm
+       (epub_convert_image_command): add url_protect_file_text()
+       to protect file name in url, protecting everything that
+       can be special in url except ~, / and : that could appear in
+       file names.
+
+       * tp/Texinfo/Convert/HTML.pm (url_protect_url_text):
+       rename protect_url_text as url_protect_url_text.
+
 2022-08-06  Patrice Dumas  <pertusus@free.fr>
 
        Percent encode href or src attributes that may need it
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 4c84b3ab47..66f0c17f66 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -2643,7 +2643,7 @@ sub _convert_email_command($$$$)
     return "$mail_string ($text)";
   } else {
     return $self->html_attribute_class('a', [$cmdname])
-    .' href="'.$self->protect_url_text("mailto:$mail_string";)."\">$text</a>";
+    .' 
href="'.$self->url_protect_url_text("mailto:$mail_string";)."\">$text</a>";
   }
 }
 
@@ -2858,7 +2858,7 @@ sub _convert_uref_command($$$$)
   return $text if (!defined($url) or $url eq '');
   return "$text ($url)" if ($self->in_string());
   return $self->html_attribute_class('a', [$cmdname])
-           .' href="'.$self->protect_url_text($url)."\">$text</a>";
+           .' href="'.$self->url_protect_url_text($url)."\">$text</a>";
 }
 
 $default_commands_conversion{'uref'} = \&_convert_uref_command;
@@ -2895,7 +2895,7 @@ sub _convert_image_command($$$$)
     }
     return $self->close_html_lone_element(
       $self->html_attribute_class('img', [$cmdname])
-        . ' src="'.$self->protect_url_text($image_file)."\" 
alt=\"$alt_string\"");
+        . ' src="'.$self->url_protect_file_text($image_file)."\" 
alt=\"$alt_string\"");
   }
   return '';
 }
@@ -3217,7 +3217,7 @@ sub _default_format_button_icon_img($$$;$)
     $alt = $button;
   }
   return $self->close_html_lone_element(
-    '<img src="'.$self->protect_url_text($icon)
+    '<img src="'.$self->url_protect_url_text($icon)
        ."\" border=\"0\" alt=\"$alt\" align=\"middle\"");
 }
 
@@ -7090,27 +7090,38 @@ sub convert_tree($$;$)
   return $self->_convert($tree, $explanation);
 }
 
-# percent encode character string.  It is better use UTF-8 irrespective
-# of the actual charset of the HTML output file, according to the tests done.
-sub _protect_url($)
+# FIXME document as part of the API.  Make it a mandatory called function?
+# a format_* function?
+# protect an url, in which characters with specific meaning in url are 
considered
+# to have their specific meaning
+sub url_protect_url_text($$)
 {
+  my $self = shift;
   my $input_string = shift;
-  my $result_string = encode("UTF-8", $input_string);
-  # found on the internet, original author unknown
-  # protect everything except unreserved characters
-  #$result_string =~ s/([^^A-Za-z0-9\-_.!~*'()])/ sprintf "%%%02x", ord $1 /eg;
-  # protect everything except unreserved and reserved characters + the % itself
-  $result_string =~ s/([^^A-Za-z0-9\-_.!~*'()\$&+,\/:;=\?@\[\]\#%])/ sprintf 
"%%%02x", ord $1 /eg;
-  return $result_string;
+  # percent encode character string.  It is better use UTF-8 irrespective
+  # of the actual charset of the HTML output file, according to the tests done.
+  my $href = encode("UTF-8", $input_string);
+  # protect 'ligntly', do not protect unreserved and reserved characters + the 
% itself
+  $href =~ s/([^^A-Za-z0-9\-_.!~*'()\$&+,\/:;=\?@\[\]\#%])/ sprintf "%%%02x", 
ord $1 /eg;
+  return &{$self->formatting_function('format_protect_text')}($self, $href);
 }
 
-# FIXME documentas part of the API.  Make it a mandatory called function?
+# FIXME document as part of the API.  Make it a mandatory called function?
 # a format_* function?
-sub protect_url_text($$)
+# # protect a file path used in an url, in which characters with specific
+# meaning in url do not have their special meaning, except for characters
+# also appearing in file paths.
+sub url_protect_file_text($$)
 {
   my $self = shift;
   my $input_string = shift;
-  my $href = _protect_url($input_string);
+  # percent encode character string.  It is better use UTF-8 irrespective
+  # of the actual charset of the HTML output file, according to the tests done.
+  my $href = encode("UTF-8", $input_string);
+  # protect everything that can be special in url except ~, / and : that could
+  # appear in file names and does not have much risk in being incorrectly
+  # interpreted (for :, the interpretation as a scheme delimiter may be 
possible).
+  $href =~ s/([^^A-Za-z0-9\-_.~\/:])/ sprintf "%%%02x", ord $1 /eg;
   return &{$self->formatting_function('format_protect_text')}($self, $href);
 }
 
@@ -7155,7 +7166,7 @@ sub _default_format_css_lines($;$)
   foreach my $ref (@$css_refs) {
     $css_text .= $self->close_html_lone_element(
          '<link rel="stylesheet" type="text/css" href="'.
-                $self->protect_url_text($ref).'"')."\n";
+                $self->url_protect_url_text($ref).'"')."\n";
   }
   return $css_text;
 }
@@ -8508,7 +8519,7 @@ sub _default_format_end_file($$)
     if (defined($js_setting) and defined($js_path)
         and ($js_setting eq 'generate' or $js_setting eq 'reference')) {
       $pre_body_close .=
-        '<a href="'.$self->protect_url_text($js_path).'" 
rel="jslicense"><small>'
+        '<a href="'.$self->url_protect_url_text($js_path).'" 
rel="jslicense"><small>'
         .$self->convert_tree($self->gdt('JavaScript license information'))
         .'</small></a>';
     }
@@ -8633,10 +8644,10 @@ sub _file_header_information($$;$)
 
       $extra_head .= $self->close_html_lone_element(
         '<link rel="stylesheet" type="text/css" href="'.
-                     $self->protect_url_text($jsdir).'info.css"')."\n".
-'<script src="'.$self->protect_url_text($jsdir)
+                     $self->url_protect_url_text($jsdir).'info.css"')."\n".
+'<script src="'.$self->url_protect_url_text($jsdir)
                       .'modernizr.js" type="text/javascript"></script>
-<script src="'.$self->protect_url_text($jsdir)
+<script src="'.$self->url_protect_url_text($jsdir)
                       .'info.js" type="text/javascript"></script>';
     }
   }
@@ -8658,7 +8669,7 @@ MathJax = {
 };
 </script>"
 .'<script type="text/javascript" id="MathJax-script" async
-  src="'.$self->protect_url_text($mathjax_script).'">
+  src="'.$self->url_protect_url_text($mathjax_script).'">
 </script>';
 
   }
@@ -9000,10 +9011,10 @@ sub _do_jslicenses_file {
     foreach my $file (sort(keys %{$jslicenses->{$category}})) {
       my $file_info = $jslicenses->{$category}->{$file};
       $a .= "<tr>\n";
-      $a .= '<td><a 
href="'.$self->protect_url_text($file)."\">$file</a></td>\n";
-      $a .= '<td><a href="'.$self->protect_url_text($file_info->[1])
+      $a .= '<td><a 
href="'.$self->url_protect_url_text($file)."\">$file</a></td>\n";
+      $a .= '<td><a href="'.$self->url_protect_url_text($file_info->[1])
                                          ."\">$file_info->[0]</a></td>\n";
-      $a .= '<td><a href="'.$self->protect_url_text($file_info->[2])
+      $a .= '<td><a href="'.$self->url_protect_url_text($file_info->[2])
                                          ."\">$file_info->[2]</a></td>\n";
       $a .= "</tr>\n";
     }
diff --git a/tp/ext/epub3.pm b/tp/ext/epub3.pm
index fb6051a7e4..5040efc21f 100644
--- a/tp/ext/epub3.pm
+++ b/tp/ext/epub3.pm
@@ -310,7 +310,7 @@ sub epub_convert_image_command($$$$)
 
     return $self->close_html_lone_element(
       $self->html_attribute_class('img', [$cmdname])
-        . ' src="'.$self->protect_url_text($destination_file_name)
+        . ' src="'.$self->url_protect_file_text($destination_file_name)
            ."\" 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 7d0d3a82ca..25c42d057b 100644
--- a/tp/t/results/converters_tests/image_formatting.pl
+++ b/tp/t/results/converters_tests/image_formatting.pl
@@ -2805,7 +2805,7 @@ $result_converted{'html_text'}->{'image_formatting'} = 
'<div class="top-level-ex
 <code class="code">@image{f--ile,,,,e-d-xt}</code> <img class="image" 
src="f--ile.png" alt="f--ile">
 <code class="code">@image{f--ile,aze,az,alt,e--xt}</code> <img class="image" 
src="f--ile.png" alt="alt">
 <code class="code">@image{f-ile,aze,,a--lt}</code> <img class="image" 
src="f-ile.jpg" alt="a&ndash;lt">
-<code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{file ext} 
e--xt@}</code> <img class="image" src="f--ile@.file%20ext%20e--xt%7d" 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">
 <img class="image" src="image.jpg" alt="image"> <img class="image" 
src="image.jpg" alt="image">
 </p>
 <div class="example">
@@ -2816,7 +2816,7 @@ $result_converted{'html_text'}->{'image_formatting'} = 
'<div class="top-level-ex
 <code class="code">@image{f--ile,,,,e-d-xt}</code> <img class="image" 
src="f--ile.png" alt="f--ile">
 <code class="code">@image{f--ile,aze,az,alt,e--xt}</code> <img class="image" 
src="f--ile.png" alt="alt">
 <code class="code">@image{f-ile,aze,,a--lt}</code> <img class="image" 
src="f-ile.jpg" alt="a&ndash;lt">
-<code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{file ext} 
e--xt@}</code> <img class="image" src="f--ile@.file%20ext%20e--xt%7d" 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">
 <img class="image" src="image.jpg" alt="image"> <img class="image" 
src="image.jpg" alt="image">
 </pre></div>
 
diff --git a/tp/t/results/coverage_braces/test_image.pl 
b/tp/t/results/coverage_braces/test_image.pl
index f8908651c6..41234bfd2b 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -3925,40 +3925,40 @@ div.example {margin-left: 3.2em}
 
 <h1 class="node" id="Top">Top</h1>
 
-<img class="image" 
src="f@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20.ext@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20"
 alt="f@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; ">
+<img class="image" 
src="f%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20.ext%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20"
 alt="f@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; ">
 
-<p>In text <img class="image" 
src="f@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20.ext@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20"
 alt="alt &icirc;&ndash;le..  a
+<p>In text <img class="image" 
src="f%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20.ext%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20"
 alt="alt &icirc;&ndash;le..  a
 &lt;&quot;%@  &lt; &amp; @ % &quot; ">.
 </p>
 <p>Insertcopying
 </p><p>Text in copying.
-<img class="image" 
src="f@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20.ext@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20"
 alt="f@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; ">
+<img class="image" 
src="f%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20.ext%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20"
 alt="f@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; ">
 </p>
-<p>In text <img class="image" 
src="f@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20.ext@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20"
 alt="alt &icirc;&ndash;le..  a
+<p>In text <img class="image" 
src="f%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20.ext%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20"
 alt="alt &icirc;&ndash;le..  a
 &lt;&quot;%@  &lt; &amp; @ % &quot; ">.
 </p>
 <div class="example">
-<pre class="example-preformatted"><img class="image" 
src="f@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20.ext@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20"
 alt="f@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; ">
+<pre class="example-preformatted"><img class="image" 
src="f%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20.ext%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20"
 alt="f@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; ">
 
-In text <img class="image" 
src="f@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20.ext@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20"
 alt="alt &icirc;&ndash;le..  a
+In text <img class="image" 
src="f%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20.ext%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20"
 alt="alt &icirc;&ndash;le..  a
 &lt;&quot;%@  &lt; &amp; @ % &quot; ">.
 </pre></div>
 
 <div class="float" id="Image-with-commands">
-<img class="image" 
src="f@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20.ext@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20"
 alt="f@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; ">
+<img class="image" 
src="f%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20.ext%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20"
 alt="f@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; ">
 
-<p>In text <img class="image" 
src="f@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20.ext@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20"
 alt="alt &icirc;&ndash;le..  a
+<p>In text <img class="image" 
src="f%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20.ext%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20"
 alt="alt &icirc;&ndash;le..  a
 &lt;&quot;%@  &lt; &amp; @ % &quot; ">.
 </p>
 
-<div class="caption"><img class="image" 
src="f@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20.ext@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20"
 alt="f@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; ">
+<div class="caption"><img class="image" 
src="f%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20.ext%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20"
 alt="f@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; ">
 
-<p><strong class="strong">Image 1: </strong>In text <img class="image" 
src="f@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20.ext@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20"
 alt="alt &icirc;&ndash;le..  a
+<p><strong class="strong">Image 1: </strong>In text <img class="image" 
src="f%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20.ext%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20"
 alt="alt &icirc;&ndash;le..  a
 &lt;&quot;%@  &lt; &amp; @ % &quot; ">.</p></div></div>
 <dl class="listoffloats">
-<dt><a href="#Image-with-commands">Image 1</a></dt><dd 
class="caption-in-listoffloats"><img class="image" 
src="f@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20.ext@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20"
 alt="f@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; ">
+<dt><a href="#Image-with-commands">Image 1</a></dt><dd 
class="caption-in-listoffloats"><img class="image" 
src="f%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20.ext%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20"
 alt="f@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; ">
 
-<p>In text <img class="image" 
src="f@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20.ext@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20"
 alt="alt &icirc;&ndash;le..  a
+<p>In text <img class="image" 
src="f%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20.ext%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20"
 alt="alt &icirc;&ndash;le..  a
 &lt;&quot;%@  &lt; &amp; @ % &quot; ">.</p></dd>
 </dl>
 
@@ -4166,40 +4166,40 @@ $result_converted{'html_text'}->{'test_image'} = '
 
 <h1 class="node" id="Top">Top</h1>
 
-<img class="image" 
src="f@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20.ext@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20"
 alt="f@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; ">
+<img class="image" 
src="f%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20.ext%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20"
 alt="f@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; ">
 
-<p>In text <img class="image" 
src="f@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20.ext@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20"
 alt="alt &icirc;&ndash;le..  a
+<p>In text <img class="image" 
src="f%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20.ext%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20"
 alt="alt &icirc;&ndash;le..  a
 &lt;&quot;%@  &lt; &amp; @ % &quot; ">.
 </p>
 <p>Insertcopying
 </p><p>Text in copying.
-<img class="image" 
src="f@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20.ext@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20"
 alt="f@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; ">
+<img class="image" 
src="f%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20.ext%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20"
 alt="f@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; ">
 </p>
-<p>In text <img class="image" 
src="f@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20.ext@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20"
 alt="alt &icirc;&ndash;le..  a
+<p>In text <img class="image" 
src="f%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20.ext%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20"
 alt="alt &icirc;&ndash;le..  a
 &lt;&quot;%@  &lt; &amp; @ % &quot; ">.
 </p>
 <div class="example">
-<pre class="example-preformatted"><img class="image" 
src="f@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20.ext@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20"
 alt="f@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; ">
+<pre class="example-preformatted"><img class="image" 
src="f%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20.ext%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20"
 alt="f@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; ">
 
-In text <img class="image" 
src="f@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20.ext@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20"
 alt="alt &icirc;&ndash;le..  a
+In text <img class="image" 
src="f%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20.ext%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20"
 alt="alt &icirc;&ndash;le..  a
 &lt;&quot;%@  &lt; &amp; @ % &quot; ">.
 </pre></div>
 
 <div class="float" id="Image-with-commands">
-<img class="image" 
src="f@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20.ext@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20"
 alt="f@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; ">
+<img class="image" 
src="f%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20.ext%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20"
 alt="f@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; ">
 
-<p>In text <img class="image" 
src="f@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20.ext@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20"
 alt="alt &icirc;&ndash;le..  a
+<p>In text <img class="image" 
src="f%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20.ext%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20"
 alt="alt &icirc;&ndash;le..  a
 &lt;&quot;%@  &lt; &amp; @ % &quot; ">.
 </p>
 
-<div class="caption"><img class="image" 
src="f@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20.ext@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20"
 alt="f@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; ">
+<div class="caption"><img class="image" 
src="f%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20.ext%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20"
 alt="f@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; ">
 
-<p><strong class="strong">Image 1: </strong>In text <img class="image" 
src="f@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20.ext@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20"
 alt="alt &icirc;&ndash;le..  a
+<p><strong class="strong">Image 1: </strong>In text <img class="image" 
src="f%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20.ext%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20"
 alt="alt &icirc;&ndash;le..  a
 &lt;&quot;%@  &lt; &amp; @ % &quot; ">.</p></div></div>
 <dl class="listoffloats">
-<dt><a href="#Image-with-commands">Image 1</a></dt><dd 
class="caption-in-listoffloats"><img class="image" 
src="f@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20.ext@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20"
 alt="f@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; ">
+<dt><a href="#Image-with-commands">Image 1</a></dt><dd 
class="caption-in-listoffloats"><img class="image" 
src="f%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20.ext%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20"
 alt="f@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; ">
 
-<p>In text <img class="image" 
src="f@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20.ext@i--le..%20%20a@%3c%22%@%20%20%3c%20&amp;%20@%20%%20%22%20"
 alt="alt &icirc;&ndash;le..  a
+<p>In text <img class="image" 
src="f%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20.ext%40i--le..%20%20a%40%3c%22%25%40%20%20%3c%20%26%20%40%20%25%20%22%20"
 alt="alt &icirc;&ndash;le..  a
 &lt;&quot;%@  &lt; &amp; @ % &quot; ">.</p></dd>
 </dl>
 
diff --git a/tp/tests/layout/res_parser/formatting/formatting.html 
b/tp/tests/layout/res_parser/formatting/formatting.html
index 4b365363f1..9e679d2c64 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/tp/tests/layout/res_parser/formatting/formatting.html
@@ -1842,10 +1842,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 <strong class="author">author</strong><br>
@@ -2920,10 +2920,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -4054,10 +4054,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -5130,10 +5130,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -6348,10 +6348,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 
 
 
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter.html 
b/tp/tests/layout/res_parser/formatting_chm/chapter.html
index 69b5135a14..e7640b8076 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter.html
@@ -1843,10 +1843,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -2919,10 +2919,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -4137,10 +4137,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 
 
 
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.html 
b/tp/tests/layout/res_parser/formatting_chm/formatting.html
index 142c45e07b..53885131cb 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting.html
@@ -1835,10 +1835,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 <strong class="author">author</strong><br>
@@ -2913,10 +2913,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
diff --git 
a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html 
b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
index cb8f967d5f..2fb7cf0d47 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
@@ -1842,10 +1842,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 <strong class="author">author</strong><br>
@@ -2920,10 +2920,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -4054,10 +4054,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -5130,10 +5130,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -6348,10 +6348,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 
 
 
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter.html 
b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
index 2f6b9cbbb4..8f05925715 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
@@ -1860,10 +1860,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -2936,10 +2936,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -4150,10 +4150,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 
 
 
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 5037664bff..5b296085b9 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -1842,10 +1842,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 <strong class="author">author</strong><br>
@@ -2920,10 +2920,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -4054,10 +4054,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -5130,10 +5130,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -6348,10 +6348,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 
 
 
diff --git a/tp/tests/layout/res_parser/formatting_html/formatting.html 
b/tp/tests/layout/res_parser/formatting_html/formatting.html
index 4b365363f1..9e679d2c64 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -1842,10 +1842,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 <strong class="author">author</strong><br>
@@ -2920,10 +2920,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -4054,10 +4054,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -5130,10 +5130,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -6348,10 +6348,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 
 
 
diff --git a/tp/tests/layout/res_parser/formatting_html32/formatting.html 
b/tp/tests/layout/res_parser/formatting_html32/formatting.html
index a7d0d2a384..5d737ae94d 100644
--- a/tp/tests/layout/res_parser/formatting_html32/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html32/formatting.html
@@ -1788,10 +1788,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img 
src="f--ile@..file%20ext%20e--xt%7d" 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 _&#34; %@:} @b{in b 
&#34;},e--xt}</code> <img src="f--ile.e--xt" alt="jk _&#34; %@ in b &#34;">
-<code>@image{file@verb{:jk _&#34; %@:},,,alt@verb{:jk _&#34; %@:}}</code> <img 
src="filejk%20_%22%20%@.jpg" alt="altjk _&#34; %@">
+<code>@image{file@verb{:jk _&#34; %@:},,,alt@verb{:jk _&#34; %@:}}</code> <img 
src="filejk%20_%22%20%25%40.jpg" alt="altjk _&#34; %@">
 </p>
 
 <strong>author</strong><br>
@@ -2840,10 +2840,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img 
src="f--ile@..file%20ext%20e--xt%7d" 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 _&#34; %@:} @b{in b 
&#34;},e--xt}</code> <img src="f--ile.e--xt" alt="jk _&#34; %@ in b &#34;">
-<code>@image{file@verb{:jk _&#34; %@:},,,alt@verb{:jk _&#34; %@:}}</code> <img 
src="filejk%20_%22%20%@.jpg" alt="altjk _&#34; %@">
+<code>@image{file@verb{:jk _&#34; %@:},,,alt@verb{:jk _&#34; %@:}}</code> <img 
src="filejk%20_%22%20%25%40.jpg" alt="altjk _&#34; %@">
 </p>
 
 
@@ -3948,10 +3948,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img 
src="f--ile@..file%20ext%20e--xt%7d" 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 _&#34; %@:} @b{in b 
&#34;},e--xt}</code> <img src="f--ile.e--xt" alt="jk _&#34; %@ in b &#34;">
-<code>@image{file@verb{:jk _&#34; %@:},,,alt@verb{:jk _&#34; %@:}}</code> <img 
src="filejk%20_%22%20%@.jpg" alt="altjk _&#34; %@">
+<code>@image{file@verb{:jk _&#34; %@:},,,alt@verb{:jk _&#34; %@:}}</code> <img 
src="filejk%20_%22%20%25%40.jpg" alt="altjk _&#34; %@">
 </p>
 
 
@@ -4998,10 +4998,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img 
src="f--ile@..file%20ext%20e--xt%7d" 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 _&#34; %@:} @b{in b 
&#34;},e--xt}</code> <img src="f--ile.e--xt" alt="jk _&#34; %@ in b &#34;">
-<code>@image{file@verb{:jk _&#34; %@:},,,alt@verb{:jk _&#34; %@:}}</code> <img 
src="filejk%20_%22%20%@.jpg" alt="altjk _&#34; %@">
+<code>@image{file@verb{:jk _&#34; %@:},,,alt@verb{:jk _&#34; %@:}}</code> <img 
src="filejk%20_%22%20%25%40.jpg" alt="altjk _&#34; %@">
 </p>
 
 
@@ -6189,10 +6189,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img 
src="f--ile@..file%20ext%20e--xt%7d" 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 _&#34; %@:} @b{in b &#34;},e--xt}</code> 
<img src="f--ile.e--xt" alt="jk _&#34; %@ in b &#34;">
-<code>@image{file@verb{:jk _&#34; %@:},,,alt@verb{:jk _&#34; %@:}}</code> <img 
src="filejk%20_%22%20%@.jpg" alt="altjk _&#34; %@">
+<code>@image{file@verb{:jk _&#34; %@:},,,alt@verb{:jk _&#34; %@:}}</code> <img 
src="filejk%20_%22%20%25%40.jpg" alt="altjk _&#34; %@">
 
 
 
diff --git 
a/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html 
b/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
index a1c89ed0d2..f730a64a32 100644
--- a/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
@@ -1901,10 +1901,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -2977,10 +2977,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -4195,10 +4195,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 
 
 
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
index 9d0673e1bb..850aa1972e 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
@@ -1863,10 +1863,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -2939,10 +2939,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -4157,10 +4157,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 
 
 
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 464e1220c5..e7b4aa36bd 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
@@ -1837,10 +1837,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 <strong class="author">author</strong><br>
@@ -2915,10 +2915,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
diff --git a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html 
b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
index a4e0e5a208..7bc9021a67 100644
--- a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
@@ -1814,10 +1814,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 <strong class="author">author</strong><br>
@@ -2892,10 +2892,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -4026,10 +4026,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -5102,10 +5102,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -6320,10 +6320,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 
 
 
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html 
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
index 585dfb4611..fce22c56c9 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -1850,10 +1850,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 <strong class="author">author</strong><br>
@@ -2926,10 +2926,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -4058,10 +4058,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -5132,10 +5132,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -6348,10 +6348,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 
 
 
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter.html 
b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
index 9d0673e1bb..850aa1972e 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
@@ -1863,10 +1863,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -2939,10 +2939,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -4157,10 +4157,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 
 
 
diff --git a/tp/tests/layout/res_parser/formatting_nodes/index.html 
b/tp/tests/layout/res_parser/formatting_nodes/index.html
index 464e1220c5..e7b4aa36bd 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/index.html
@@ -1837,10 +1837,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 <strong class="author">author</strong><br>
@@ -2915,10 +2915,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
diff --git 
a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html 
b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
index 8b468072a0..c4eca84aaa 100644
--- a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
@@ -1842,10 +1842,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 <strong class="author">author</strong><br>
@@ -2920,10 +2920,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -4054,10 +4054,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -5130,10 +5130,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -6348,10 +6348,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 
 
 
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 c1f6dc2140..b3b68ed496 100644
--- a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
@@ -1842,10 +1842,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 <strong class="author">author</strong><br>
@@ -2919,10 +2919,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -4029,10 +4029,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -5246,10 +5246,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 
 
 
@@ -6335,10 +6335,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
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 54062aff8a..7feedb675f 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -1842,10 +1842,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 <strong class="author">author</strong><br>
@@ -2920,10 +2920,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -4054,10 +4054,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -5130,10 +5130,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -6348,10 +6348,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 
 
 
diff --git a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html 
b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
index 7e7fd3c9dc..7ac89e5ea6 100644
--- a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
@@ -1842,10 +1842,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;"/>
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@"/>
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@"/>
 </p>
 
 <strong class="author">author</strong><br/>
@@ -2920,10 +2920,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;"/>
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@"/>
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@"/>
 </p>
 
 
@@ -4054,10 +4054,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;"/>
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@"/>
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@"/>
 </p>
 
 
@@ -5130,10 +5130,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;"/>
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@"/>
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@"/>
 </p>
 
 
@@ -6348,10 +6348,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;"/>
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@"/>
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@"/>
 
 
 
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html 
b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
index 228c9be6a4..3f044d97fd 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
@@ -1989,10 +1989,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -3202,10 +3202,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
 
 
@@ -4557,10 +4557,10 @@ 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{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} 
e--xt@}</code> <img class="image" src="f--ile@..file%20ext%20e--xt%7d" 
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 _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%@.jpg" alt="altjk _&quot; 
%@">
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
reply via email to
[Prev in Thread] Current Thread [Next in Thread]