texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: Improve handling of dotless i and dotless j


From: Patrice Dumas
Subject: branch master updated: Improve handling of dotless i and dotless j
Date: Wed, 17 Aug 2022 07:08:08 -0400

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 74f3fc297d Improve handling of dotless i and dotless j
74f3fc297d is described below

commit 74f3fc297d97881523550ea91fe0f783d4bdb2cd
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Aug 17 13:07:48 2022 +0200

    Improve handling of dotless i and dotless j
    
    * tp/Texinfo/Convert/Converter.pm (%xml_accent_entities)
    (%xml_accent_text_with_entities, xml_accent),
    tp/Texinfo/Convert/TexinfoXML.pm, tp/Texinfo/Convert/Unicode.pm
    (%unicode_accented_letters, %transliterate_map, unicode_accent):
    add dotless command to the unicode accents map, and handle
    explicitely when needed. Handle @dotless j similarly with i.
---
 ChangeLog                                          |  11 ++
 tp/TODO                                            |   2 +
 tp/Texinfo/Convert/Converter.pm                    |  16 +++
 tp/Texinfo/Convert/TexinfoXML.pm                   |   6 +-
 tp/Texinfo/Convert/Unicode.pm                      |  21 ++--
 tp/t/nodenormalization.t                           |   4 +-
 tp/t/results/coverage/commands_in_math.pl          |   6 +-
 tp/t/results/formats_encodings/accent.pl           |   6 +-
 .../formats_encodings/accent_enable_encoding.pl    |   6 +-
 tp/t/results/formats_encodings/accentenc.pl        |   4 +-
 .../formats_encodings/accentenc_enable_encoding.pl |   2 +-
 .../formats_encodings/at_commands_in_refs.pl       | 120 ++++++++++-----------
 .../at_commands_in_refs_latin1.pl                  |  14 +--
 .../_201c-_201d-_2018-_2019-_201e-_201a.html       |   4 +-
 .../res_html/a-e-i-a-a-e-c-e-e-e-e.html            |   4 +-
 .../res_html/e-e-e-e-e-j-ee.html                   |  14 +--
 ..._005faaa-url-_002fman_002ecgi_002f1_002fls.html |   4 +-
 .../at_commands_in_refs_latin1/res_html/i-E-C.html |  12 +--
 .../at_commands_in_refs_latin1/res_html/index.html |   4 +-
 .../formats_encodings/at_commands_in_refs_utf8.pl  |  14 +--
 .../_201c-_201d-_2018-_2019-_201e-_201a.html       |   4 +-
 .../res_html/a-e-i-a-a-e-c-e-e-e-e.html            |   4 +-
 .../res_html/e-e-e-e-e-j-ee.html                   |  14 +--
 ..._005faaa-url-_002fman_002ecgi_002f1_002fls.html |   4 +-
 .../at_commands_in_refs_utf8/res_html/i-E-C.html   |  12 +--
 .../at_commands_in_refs_utf8/res_html/index.html   |   4 +-
 .../res_info/at_commands_in_refs_utf8.info         | Bin 8404 -> 8411 bytes
 .../itemize_arguments/res_html/index.html          |   4 +-
 .../mathjax_with_texinfo_no_convert_to_latex.pl    |   2 +-
 tp/t/results/html_tests/test_accents_sc_default.pl |   2 +-
 .../res_html/node-chap.html                        |   2 +-
 .../html_tests/test_accents_sc_default_latin1.pl   |   2 +-
 .../res_html/node-chap.html                        |   2 +-
 .../html_tests/test_accents_sc_default_usascii.pl  |   2 +-
 .../res_html/node-chap.html                        |   2 +-
 .../test_accents_sc_enable_encoding_latin1.pl      |   2 +-
 .../res_html/node-chap.html                        |   2 +-
 .../test_accents_sc_enable_encoding_usascii.pl     |   2 +-
 .../res_html/node-chap.html                        |   2 +-
 .../html_tests/test_accents_sc_to_utf8_latin1.pl   |   2 +-
 .../res_html/node-chap.html                        |   2 +-
 .../test_accents_sc_use_numeric_entity.pl          |   2 +-
 .../res_html/node-chap.html                        |   2 +-
 .../encoding_index_ascii/res_html/index.html       |   2 +-
 .../res_html/index.html                            |   2 +-
 .../encoding_index_latin1/res_html/index.html      |   2 +-
 .../res_html/index.html                            |   2 +-
 .../encoding_index_utf8/res_html/index.html        |   2 +-
 tp/t/results/paragraph/paragraph_command.pl        |   2 +-
 .../layout/res_parser/formatting/formatting.html   |  34 +++---
 .../layout/res_parser/formatting_chm/anchor.html   |   4 +-
 .../layout/res_parser/formatting_chm/chapter.html  |  22 ++--
 .../layout/res_parser/formatting_chm/chapter2.html |   4 +-
 .../res_parser/formatting_chm/formatting.html      |  16 +--
 .../res_parser/formatting_chm/formatting_abt.html  |   4 +-
 .../res_parser/formatting_chm/formatting_ovr.html  |   4 +-
 .../res_parser/formatting_chm/formatting_toc.html  |   4 +-
 .../layout/res_parser/formatting_chm/index.html    |   4 +-
 .../formatting_chm/s_002d_002dect_002cion.html     |   4 +-
 .../res_parser/formatting_chm/subsection.html      |   4 +-
 ...tion-_0060_0060simple_002ddouble_002d_002d.html |   4 +-
 ...02d_002dfour_002d_002d_002d_002d_0027_0027.html |   4 +-
 .../res_parser/formatting_docbook/formatting.xml   |  24 ++---
 .../formatting_enable_encoding/formatting.html     |  24 ++---
 .../EPUB/xhtml/chapter.xhtml                       |  22 ++--
 .../EPUB/xhtml/chapter2.xhtml                      |   4 +-
 .../EPUB/xhtml/formatting.xhtml                    |  16 +--
 .../EPUB/xhtml/formatting_abt.xhtml                |   4 +-
 .../EPUB/xhtml/formatting_fot.xhtml                |   4 +-
 .../EPUB/xhtml/formatting_ovr.xhtml                |   4 +-
 .../EPUB/xhtml/formatting_toc.xhtml                |   4 +-
 .../EPUB/xhtml/chapter.xhtml                       |  22 ++--
 .../EPUB/xhtml/chapter2.xhtml                      |   4 +-
 .../EPUB/xhtml/formatting.xhtml                    |  16 +--
 .../EPUB/xhtml/formatting_abt.xhtml                |   4 +-
 .../EPUB/xhtml/formatting_fot.xhtml                |   4 +-
 .../EPUB/xhtml/formatting_ovr.xhtml                |   4 +-
 .../EPUB/xhtml/formatting_toc.xhtml                |   4 +-
 .../EPUB/xhtml/s_002d_002dect_002cion.xhtml        |   4 +-
 .../EPUB/xhtml/subsection.xhtml                    |   4 +-
 ...ion-_0060_0060simple_002ddouble_002d_002d.xhtml |   4 +-
 ...2d_002dfour_002d_002d_002d_002d_0027_0027.xhtml |   4 +-
 .../res_parser/formatting_exotic/anchor.html       |   4 +-
 .../res_parser/formatting_exotic/chapter.html      |  22 ++--
 .../res_parser/formatting_exotic/chapter2.html     |   4 +-
 .../formatting_exotic/formatting_abt.html          |   4 +-
 .../formatting_exotic/formatting_ovr.html          |   4 +-
 .../formatting_exotic/formatting_toc.html          |   4 +-
 .../layout/res_parser/formatting_exotic/index.html |   4 +-
 .../formatting_exotic/s_002d_002dect_002cion.html  |   4 +-
 .../res_parser/formatting_exotic/subsection.html   |   4 +-
 ...tion-_0060_0060simple_002ddouble_002d_002d.html |   4 +-
 ...02d_002dfour_002d_002d_002d_002d_0027_0027.html |   4 +-
 .../res_parser/formatting_fr_icons/formatting.html |  34 +++---
 .../res_parser/formatting_html/formatting.html     |  34 +++---
 .../res_parser/formatting_html32/formatting.html   |  34 +++---
 .../formatting_html_no_texi2html/formatting.html   |  22 ++--
 .../res_parser/formatting_html_nodes/anchor.html   |   4 +-
 .../res_parser/formatting_html_nodes/chapter.html  |  22 ++--
 .../res_parser/formatting_html_nodes/chapter2.html |   4 +-
 .../formatting_html_nodes/formatting_abt.html      |   4 +-
 .../formatting_html_nodes/formatting_fot.html      |   4 +-
 .../formatting_html_nodes/formatting_ovr.html      |   4 +-
 .../formatting_html_nodes/formatting_toc.html      |   4 +-
 .../res_parser/formatting_html_nodes/index.html    |  16 +--
 .../s_002d_002dect_002cion.html                    |   4 +-
 .../formatting_html_nodes/subsection.html          |   4 +-
 ...tion-_0060_0060simple_002ddouble_002d_002d.html |   4 +-
 ...02d_002dfour_002d_002d_002d_002d_0027_0027.html |   4 +-
 .../res_parser/formatting_info/formatting.info     |  48 ++++-----
 .../formatting_inline_css/formatting.html          |  34 +++---
 .../res_parser/formatting_mathjax/formatting.html  |  24 ++---
 .../layout/res_parser/formatting_nodes/anchor.html |   4 +-
 .../res_parser/formatting_nodes/chapter.html       |  22 ++--
 .../res_parser/formatting_nodes/chapter2.html      |   4 +-
 .../formatting_nodes/formatting_abt.html           |   4 +-
 .../formatting_nodes/formatting_fot.html           |   4 +-
 .../formatting_nodes/formatting_ovr.html           |   4 +-
 .../formatting_nodes/formatting_toc.html           |   4 +-
 .../layout/res_parser/formatting_nodes/index.html  |  16 +--
 .../formatting_nodes/s_002d_002dect_002cion.html   |   4 +-
 .../res_parser/formatting_nodes/subsection.html    |   4 +-
 ...tion-_0060_0060simple_002ddouble_002d_002d.html |   4 +-
 ...02d_002dfour_002d_002d_002d_002d_0027_0027.html |   4 +-
 .../formatting_numerical_entities/formatting.html  |  34 +++---
 .../res_parser/formatting_plaintext/formatting.txt |  12 +--
 .../formatting_regions/formatting_regions.html     |  34 +++---
 .../formatting_weird_quotes/formatting.html        |  34 +++---
 .../res_parser/formatting_xhtml/formatting.html    |  34 +++---
 .../res_parser/formatting_singular/anchor.html     |   4 +-
 .../res_parser/formatting_singular/chapter.html    |  16 +--
 .../res_parser/formatting_singular/chapter2.html   |   4 +-
 .../res_parser/formatting_singular/index.htm       |   4 +-
 .../res_parser/formatting_singular/index.html      |   4 +-
 .../s_002d_002dect_002cion.html                    |   4 +-
 .../res_parser/formatting_singular/sing_abt.htm    |   4 +-
 .../res_parser/formatting_singular/sing_fot.htm    |   4 +-
 .../res_parser/formatting_singular/sing_ovr.htm    |   4 +-
 .../res_parser/formatting_singular/sing_toc.htm    |   4 +-
 .../res_parser/formatting_singular/subsection.html |   4 +-
 ...tion-_0060_0060simple_002ddouble_002d_002d.html |   4 +-
 ...02d_002dfour_002d_002d_002d_002d_0027_0027.html |   4 +-
 142 files changed, 677 insertions(+), 637 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 376dcc7d01..1dd35c3a5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2022-08-17  Patrice Dumas  <pertusus@free.fr>
+
+       Improve handling of dotless i and dotless j
+
+       * tp/Texinfo/Convert/Converter.pm (%xml_accent_entities)
+       (%xml_accent_text_with_entities, xml_accent),
+       tp/Texinfo/Convert/TexinfoXML.pm, tp/Texinfo/Convert/Unicode.pm
+       (%unicode_accented_letters, %transliterate_map, unicode_accent):
+       add dotless command to the unicode accents map, and handle
+       explicitely when needed. Handle @dotless j similarly with i.
+
 2022-08-17  Patrice Dumas  <pertusus@free.fr>
 
        * util/texinfo.dtd: add indentedblock and smallindentedblock.
diff --git a/tp/TODO b/tp/TODO
index 579e1c3ab0..b5156a4902 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -13,6 +13,8 @@ Before next release
 Bugs
 ====
 
+In Info @* in node name should become a space
+
 HTML API
 ========
 
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index ac63bf58ea..6b4f44f367 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -1507,6 +1507,7 @@ our %xml_accent_entities = (
           ",", 'cedil',
           'ringaccent', 'ring',
           'ogonek', 'ogon',
+          'dotless', 'nodot',
          );
 
 my %xml_accent_text_with_entities = (
@@ -1517,6 +1518,7 @@ my %xml_accent_text_with_entities = (
       '`'          => 'aeiouAEIOU',
       '~'          => 'nNaoAO',
       '"'          => 'aeiouyAEIOU',
+      'dotless'    => 'i',
 # according to http://www2.lib.virginia.edu/small/vhp/download/ISO.txt
 # however this doesn't seems to work in firefox
 #      'ogonek'     => 'aeiuAEIU',
@@ -1564,6 +1566,20 @@ sub xml_accent($$$;$$$)
   if ($in_upper_case and $text =~ /^\w$/) {
     $text = uc ($text);
   }
+
+  # do not return a dotless i or j as such if it is further composed
+  # with an accented letter, return the letter as is
+  if ($accent eq 'dotless') {
+    if ($Texinfo::Convert::Unicode::unicode_accented_letters{$accent}
+        and 
exists($Texinfo::Convert::Unicode::unicode_accented_letters{$accent}->{$text})
+        and ($command->{'parent'}
+             and $command->{'parent'}->{'parent'}
+             and $command->{'parent'}->{'parent'}->{'cmdname'}
+             and 
$Texinfo::Convert::Unicode::unicode_accented_letters{$command->{'parent'}
+                                        ->{'parent'}->{'cmdname'}})) {
+      return $text;
+    }
+  }
  
   if ($use_numeric_entities) {
     my $formatted_accent = _format_numeric_entities_accent($accent, $text);
diff --git a/tp/Texinfo/Convert/TexinfoXML.pm b/tp/Texinfo/Convert/TexinfoXML.pm
index 94dc904f25..050488e365 100644
--- a/tp/Texinfo/Convert/TexinfoXML.pm
+++ b/tp/Texinfo/Convert/TexinfoXML.pm
@@ -287,13 +287,15 @@ my %accents = (
 # our because it is used in the xml to texi translator
 our %accent_types = (%Texinfo::Convert::Converter::xml_accent_entities, 
%accents);
 
+# do not treat @dotless as an accent command but
+# together with brace commands.
+delete $accent_types{'dotless'};
+
 # no entity
 my @other_accents = ('dotaccent', 'tieaccent', 'ubaraccent', 'udotaccent');
 foreach my $accent (@other_accents) {
   $accent_types{$accent} = $accent;
 }
-# note that @dotless is not treated as an accent command but
-# together with brace commands.
 
 my %misc_command_line_attributes = (
   'setfilename' => 'file',
diff --git a/tp/Texinfo/Convert/Unicode.pm b/tp/Texinfo/Convert/Unicode.pm
index 07504a2902..f2a97411ef 100644
--- a/tp/Texinfo/Convert/Unicode.pm
+++ b/tp/Texinfo/Convert/Unicode.pm
@@ -424,6 +424,10 @@ our %unicode_accented_letters = (
         'O' => '01EA',
         'o' => '01EB',
     },
+    'dotless' => {
+        'i' => '0131',
+        'j' => '0237',
+    }
 );
 
 our %unicode_simple_character_map = (
@@ -608,6 +612,7 @@ our %transliterate_map = (
                '0446'  => 'c',
                '04D7'  => 'IO',
                '00DD'  => 'Y', # unidecode gets this wrong ?
+               '0237'  => 'j', # unknown dotless j for unidecode, returns [?]
                # following appears in tests, this is required to have
                # the same output with and without unidecode
                '4E2D'  => 'Zhong',
@@ -1012,6 +1017,7 @@ my %unicode_to_eight_bit = (
       '0427' => 'FE',
       '042A' => 'FF',
    },
+   # additional to koi8-r, replacing box drawing characters not used in Texinfo
    'koi8-u' => {
       '0454' => 'A4',
       '0404' => 'B4',
@@ -1233,13 +1239,16 @@ sub unicode_accent($$)
   # special handling of @dotless{i}.
   # \x{0131}\x{0308} for @dotless{i} @" doesn't lead to NFC 00ef.
   # so it is set to a real dotless i only if not in an accent command.
+  # Do the same for dotless j, even though we have no clear idea on
+  # what is going on for that character.
   if ($accent eq 'dotless') {
-    if ($text eq 'i' and
-        (!$command->{'parent'}
-         or !$command->{'parent'}->{'parent'}
-         or !$command->{'parent'}->{'parent'}->{'cmdname'}
-         or 
!$unicode_accented_letters{$command->{'parent'}->{'parent'}->{'cmdname'}})) {
-      return "\x{0131}";
+    if ($unicode_accented_letters{$accent}->{$text}
+        and (!$command->{'parent'}
+             or !$command->{'parent'}->{'parent'}
+             or !$command->{'parent'}->{'parent'}->{'cmdname'}
+             or !$unicode_accented_letters{$command->{'parent'}
+                                        ->{'parent'}->{'cmdname'}})) {
+      return chr(hex($unicode_accented_letters{$accent}->{$text}));
     } else {
       return $text;
     }
diff --git a/tp/t/nodenormalization.t b/tp/t/nodenormalization.t
index 40bbb88975..17122f18b5 100644
--- a/tp/t/nodenormalization.t
+++ b/tp/t/nodenormalization.t
@@ -154,7 +154,7 @@ my $texi_line = 'A @sc{sc} accents @"i @"{@dotless{i}} 
@`{@=E} @l{} @,{@\'C} @={
 my $line_tree = $parser->parse_texi_line($texi_line);
 my $normalized_line = normalize_node($line_tree);
 is ($normalized_line,
-'A-SC-accents-_00ef-_00ef-_1e14-_0142-_1e08-_0146_0303_0304-_0155_030c-_0129_0304-_00ff-_0131-j-_00c7-_0118-_1ea1-a_0361-_0227-characters-_0142-_00a1-_00e5-_0153-_002c-error_002d_002d_003e--_2026-_002e_002e_002e-no-brace-commands-_0040--_002e-----_007d-signs-_002d_002d-_002d_002d_002d-_0060_0060-_0027_0027-_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e-_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
+'A-SC-accents-_00ef-_00ef-_1e14-_0142-_1e08-_0146_0303_0304-_0155_030c-_0129_0304-_00ff-_0131-_0237-_00c7-_0118-_1ea1-a_0361-_0227-characters-_0142-_00a1-_00e5-_0153-_002c-error_002d_002d_003e--_2026-_002e_002e_002e-no-brace-commands-_0040--_002e-----_007d-signs-_002d_002d-_002d_002d_002d-_0060_0060-_0027_0027-_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e-_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
   'normalized complex line');
 my $transliterated_line = transliterate_texinfo($line_tree);
 is ($transliterated_line,
@@ -162,7 +162,7 @@ is ($transliterated_line,
  'transliterated complex line');
 my $transliterated_line_no_unidecode = transliterate_texinfo($line_tree, 1);
 is ($transliterated_line_no_unidecode,
-'A-SC-accents-i-i-_1e14-l-_1e08-n-r-i-y-_0131-j-C-E-a-a-a-characters-l-_00a1-aa-oe-_002c-error_002d_002d_003e--_2026-_002e_002e_002e-no-brace-commands-_0040--_002e-----_007d-signs-_002d_002d-_002d_002d_002d-_0060_0060-_0027_0027-_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e-_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
+'A-SC-accents-i-i-_1e14-l-_1e08-n-r-i-y-i-j-C-E-a-a-a-characters-l-_00a1-aa-oe-_002c-error_002d_002d_003e--_2026-_002e_002e_002e-no-brace-commands-_0040--_002e-----_007d-signs-_002d_002d-_002d_002d_002d-_0060_0060-_0027_0027-_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e-_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
   'transliterated complex line no unidecode');
 
 my $top_no_space = 'tOp';
diff --git a/tp/t/results/coverage/commands_in_math.pl 
b/tp/t/results/coverage/commands_in_math.pl
index 40cdb9690b..aaa06312c9 100644
--- a/tp/t/results/coverage/commands_in_math.pl
+++ b/tp/t/results/coverage/commands_in_math.pl
@@ -2811,7 +2811,7 @@ $result_converted{'plaintext'}->{'commands_in_math'} = 
'*``simple-double--three-
 ``simple-double--three---four----\'\'
 
 
-ü Ü ñ â é ō ì é ı j Ḕ
+ü Ü ñ â é ō ì é ı ȷ Ḕ
 ł Ḉ Ḉ ç a̋ ȧ å a͡
 ă a̲ ạ ǎ ą a^{h}_{l}
 
@@ -2838,7 +2838,7 @@ $result_converted{'html_text'}->{'commands_in_math'} = '
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----\'<!-- /@w -->\'
 
 </em></div>
-<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; i j &#274;&#768;
+<div class="displaymath"><em>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &inodot; &#567; &#274;&#768;
 &#322; &#262;&#807; &#262;&#807; &ccedil; a&#779; &#551; &aring; a&#865;
 &#259; a&#818; &#7841; &#462; &#261; a<sup class="sup">h</sup><sub 
class="sub">l</sub>
 
@@ -2898,7 +2898,7 @@ $result_converted{'docbook'}->{'commands_in_math'} = '
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----\'<!-- /@w -->\'
 
 </mathphrase></informalequation>
-<informalequation><mathphrase>&#252; &#220; &#241; &#226; &#233; &#333; &#236; 
&#233; i j &#274;&#768;
+<informalequation><mathphrase>&#252; &#220; &#241; &#226; &#233; &#333; &#236; 
&#233; &#305; &#567; &#274;&#768;
 &#322; &#262;&#807; &#262;&#807; &#231; a&#779; &#551; &#229; a&#865;
 &#259; a&#818; &#7841; &#462; &#261; 
a<superscript>h</superscript><subscript>l</subscript>
 
diff --git a/tp/t/results/formats_encodings/accent.pl 
b/tp/t/results/formats_encodings/accent.pl
index 33d5a70ad4..e8bf743438 100644
--- a/tp/t/results/formats_encodings/accent.pl
+++ b/tp/t/results/formats_encodings/accent.pl
@@ -3226,7 +3226,7 @@ should be e‘: è è
 
    AE, OE ligatures: æ Æ œ Œ
 
-   dotless i, j: ı j
+   dotless i, j: ı ȷ
 
    Polish suppressed-L: ł Ł
 
@@ -3305,7 +3305,7 @@ $result_converted{'html_text'}->{'accent'} = '<div 
class="top-level-extent" id="
 </p>
 <p>AE, OE ligatures: &aelig; &AElig; &oelig; &OElig;
 </p>
-<p>dotless i, j: i j
+<p>dotless i, j: &inodot; &#567;
 </p>
 <p>Polish suppressed-L: &#322; &#321;
 </p>
@@ -3467,7 +3467,7 @@ $result_converted{'docbook'}->{'accent'} = '<chapter 
label="" id="Top-node">
 </para>
 <para>AE, OE ligatures: &#230; &#198; &#339; &#338;
 </para>
-<para>dotless i, j: i j
+<para>dotless i, j: &#305; &#567;
 </para>
 <para>Polish suppressed-L: &#322; &#321;
 </para>
diff --git a/tp/t/results/formats_encodings/accent_enable_encoding.pl 
b/tp/t/results/formats_encodings/accent_enable_encoding.pl
index cd9b512685..68db41b004 100644
--- a/tp/t/results/formats_encodings/accent_enable_encoding.pl
+++ b/tp/t/results/formats_encodings/accent_enable_encoding.pl
@@ -3226,7 +3226,7 @@ should be e‘: è è
 
    AE, OE ligatures: æ Æ œ Œ
 
-   dotless i, j: ı j
+   dotless i, j: ı ȷ
 
    Polish suppressed-L: ł Ł
 
@@ -3305,7 +3305,7 @@ 
$result_converted{'html_text'}->{'accent_enable_encoding'} = '<div class="top-le
 </p>
 <p>AE, OE ligatures: æ Æ œ Œ
 </p>
-<p>dotless i, j: ı j
+<p>dotless i, j: ı ȷ
 </p>
 <p>Polish suppressed-L: ł Ł
 </p>
@@ -3467,7 +3467,7 @@ $result_converted{'docbook'}->{'accent_enable_encoding'} 
= '<chapter label="" id
 </para>
 <para>AE, OE ligatures: &#230; &#198; &#339; &#338;
 </para>
-<para>dotless i, j: ı j
+<para>dotless i, j: ı ȷ
 </para>
 <para>Polish suppressed-L: &#322; &#321;
 </para>
diff --git a/tp/t/results/formats_encodings/accentenc.pl 
b/tp/t/results/formats_encodings/accentenc.pl
index 3456cd4c95..d746ffdfb4 100644
--- a/tp/t/results/formats_encodings/accentenc.pl
+++ b/tp/t/results/formats_encodings/accentenc.pl
@@ -3351,7 +3351,7 @@ $result_converted{'html_text'}->{'accentenc'} = '
 </p>
 <p>AE, OE ligatures: &aelig; &AElig; &oelig; &OElig;
 </p>
-<p>dotless i, j: i j
+<p>dotless i, j: &inodot; &#567;
 </p>
 <p>Polish suppressed-L: &#322; &#321;
 </p>
@@ -3515,7 +3515,7 @@ $result_converted{'docbook'}->{'accentenc'} = '<chapter 
label="" id="Top-node">
 </para>
 <para>AE, OE ligatures: &#230; &#198; &#339; &#338;
 </para>
-<para>dotless i, j: i j
+<para>dotless i, j: &#305; &#567;
 </para>
 <para>Polish suppressed-L: &#322; &#321;
 </para>
diff --git a/tp/t/results/formats_encodings/accentenc_enable_encoding.pl 
b/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
index aa32807671..6b6b8ad37e 100644
--- a/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
+++ b/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
@@ -3265,7 +3265,7 @@ 
$result_converted{'html_text'}->{'accentenc_enable_encoding'} = '
 </p>
 <p>AE, OE ligatures: æ Æ &oelig; &OElig;
 </p>
-<p>dotless i, j: i j
+<p>dotless i, j: &inodot; &#567;
 </p>
 <p>Polish suppressed-L: &#322; &#321;
 </p>
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs.pl 
b/tp/t/results/formats_encodings/at_commands_in_refs.pl
index f800326073..39ccb12a04 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs.pl
@@ -2325,7 +2325,7 @@ $result_trees{'at_commands_in_refs'} = {
                     {},
                     {}
                   ],
-                  'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e'
+                  'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
                 }
               },
               'parent' => {},
@@ -8622,10 +8622,10 @@ $result_trees{'at_commands_in_refs'} = {
               {},
               {}
             ],
-            'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e'
+            'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
           }
         ],
-        'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e',
+        'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e',
         'spaces_before_argument' => ' '
       },
       'parent' => {},
@@ -15114,7 +15114,7 @@ $result_trees{'at_commands_in_refs'} = {
                     {},
                     {}
                   ],
-                  'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e'
+                  'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
                 }
               },
               'parent' => {},
@@ -21206,7 +21206,7 @@ $result_sectioning{'at_commands_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e'
+                    'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
                   },
                   'structure' => {}
                 }
@@ -21815,7 +21815,7 @@ $result_nodes{'at_commands_in_refs'} = {
                                                     'section_number' => 11
                                                   }
                                                 },
-                                                'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e'
+                                                'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
                                               },
                                               'structure' => {
                                                 'node_next' => {
@@ -22262,7 +22262,7 @@ $result_menus{'at_commands_in_refs'} = {
                                             'menu_next' => {
                                               'cmdname' => 'node',
                                               'extra' => {
-                                                'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e'
+                                                'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
                                               },
                                               'structure' => {
                                                 'menu_next' => {
@@ -22674,7 +22674,7 @@ $result_converted{'plaintext'}->{'at_commands_in_refs'} 
= 'Top
 10 ä ẽ î â à é ç ē e̊ e̋ ę
 ************************
 
-11 ė ĕ e̲ ẹ ě j e͡e
+11 ė ĕ e̲ ẹ ě ȷ e͡e
 *****************
 
 12 ı Ḕ Ḉ
@@ -22747,7 +22747,7 @@ $result_converted{'plaintext'}->{'at_commands_in_refs'} 
= 'Top
 
    *note ä ẽ î â à é ç ē e̊ e̋ ę::
 
-   *note ė ĕ e̲ ẹ ě j e͡e::
+   *note ė ĕ e̲ ẹ ě ȷ e͡e::
 
    *note ı Ḕ Ḉ::
 
@@ -22861,8 +22861,8 @@ Next: <a href="#-_007b-_007d" accesskey="n" rel="next"> 
{ }</a> &nbsp; </p>
 <li><a href="#g_t_21d2-_00b0-a-b--_00e5" accesskey="8">&rArr; &deg; a&nbsp;b a 
sunny day &aring;</a></li>
 <li><a 
href="#g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe"
 accesskey="9">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; 
&szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</a></li>
 <li><a 
href="#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119">&auml;
 &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e&#778; e&#779; 
&#281;</a></li>
-<li><a href="#g_t_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e">&#279; &#277; 
e&#818; &#7865; &#283; j e&#865;e</a></li>
-<li><a href="#g_t_0131-_1e14-_1e08">i &#274;&#768; &#262;&#807;</a></li>
+<li><a href="#g_t_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e">&#279; &#277; 
e&#818; &#7865; &#283; &#567; e&#865;e</a></li>
+<li><a href="#g_t_0131-_1e14-_1e08">&inodot; &#274;&#768; &#262;&#807;</a></li>
 <li><a href="#g_t_201c-_201d-_2018-_2019-_201e-_201a">&ldquo; &rdquo; &lsquo; 
&rsquo; &bdquo; &sbquo;</a></li>
 <li><a href="#g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a">&laquo; &raquo; &laquo; 
&raquo; &lsaquo; &rsaquo;</a></li>
 <li><a 
href="#g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027">&ldquo; 
&rdquo; &mdash; &ndash; &lsquo; &rsquo;</a></li>
@@ -22964,34 +22964,34 @@ Next: <a 
href="#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b
 <div class="chapter-level-extent" 
id="g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119">
 <div class="nav-panel">
 <p>
-Next: <a href="#g_t_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e" accesskey="n" 
rel="next">&#279; &#277; e&#818; &#7865; &#283; j e&#865;e</a>, Previous: <a 
href="#g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe"
 accesskey="p" rel="prev">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; 
&Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</a>, Up: <a 
href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="#g_t_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e" accesskey="n" 
rel="next">&#279; &#277; e&#818; &#7865; &#283; &#567; e&#865;e</a>, Previous: 
<a 
href="#g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe"
 accesskey="p" rel="prev">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; 
&Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</a>, Up: <a 
href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <h2 class="chapter" id="a-e-i-a-a-e-c-e-e-e-e">10 &auml; &#7869; &icirc; 
&acirc; &agrave; &eacute; &ccedil; &#275; e&#778; e&#779; &#281;</h2>
 
 <hr>
 </div>
-<div class="chapter-level-extent" 
id="g_t_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e">
+<div class="chapter-level-extent" 
id="g_t_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e">
 <div class="nav-panel">
 <p>
-Next: <a href="#g_t_0131-_1e14-_1e08" accesskey="n" rel="next">i &#274;&#768; 
&#262;&#807;</a>, Previous: <a 
href="#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119" 
accesskey="p" rel="prev">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; 
&ccedil; &#275; e&#778; e&#779; &#281;</a>, Up: <a href="#Top" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
+Next: <a href="#g_t_0131-_1e14-_1e08" accesskey="n" rel="next">&inodot; 
&#274;&#768; &#262;&#807;</a>, Previous: <a 
href="#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119" 
accesskey="p" rel="prev">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; 
&ccedil; &#275; e&#778; e&#779; &#281;</a>, Up: <a href="#Top" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
-<h2 class="chapter" id="e-e-e-e-e-j-ee">11 &#279; &#277; e&#818; &#7865; 
&#283; j e&#865;e</h2>
+<h2 class="chapter" id="e-e-e-e-e-j-ee">11 &#279; &#277; e&#818; &#7865; 
&#283; &#567; e&#865;e</h2>
 
 <hr>
 </div>
 <div class="chapter-level-extent" id="g_t_0131-_1e14-_1e08">
 <div class="nav-panel">
 <p>
-Next: <a href="#g_t_201c-_201d-_2018-_2019-_201e-_201a" accesskey="n" 
rel="next">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>, Previous: <a 
href="#g_t_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e" accesskey="p" 
rel="prev">&#279; &#277; e&#818; &#7865; &#283; j e&#865;e</a>, Up: <a 
href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="#g_t_201c-_201d-_2018-_2019-_201e-_201a" accesskey="n" 
rel="next">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>, Previous: <a 
href="#g_t_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e" accesskey="p" 
rel="prev">&#279; &#277; e&#818; &#7865; &#283; &#567; e&#865;e</a>, Up: <a 
href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
-<h2 class="chapter" id="i-E-C">12 i &#274;&#768; &#262;&#807;</h2>
+<h2 class="chapter" id="i-E-C">12 &inodot; &#274;&#768; &#262;&#807;</h2>
 
 <hr>
 </div>
 <div class="chapter-level-extent" id="g_t_201c-_201d-_2018-_2019-_201e-_201a">
 <div class="nav-panel">
 <p>
-Next: <a href="#g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a" accesskey="n" 
rel="next">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>, Previous: <a 
href="#g_t_0131-_1e14-_1e08" accesskey="p" rel="prev">i &#274;&#768; 
&#262;&#807;</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="#g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a" accesskey="n" 
rel="next">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>, Previous: <a 
href="#g_t_0131-_1e14-_1e08" accesskey="p" rel="prev">&inodot; &#274;&#768; 
&#262;&#807;</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <h2 class="chapter" id="g_t_201c-_201d-_2018-_2019-_201e-_201a-1">13 &ldquo; 
&rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</h2>
 
@@ -23141,9 +23141,9 @@ Previous: <a href="#gH-3rd" accesskey="p" 
rel="prev"><sub class="sub">g</sub>H 3
 </p>
 <p><a class="ref" 
href="#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119">&auml;
 &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e&#778; e&#779; 
&#281;</a>
 </p>
-<p><a class="ref" href="#g_t_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e">&#279; 
&#277; e&#818; &#7865; &#283; j e&#865;e</a>
+<p><a class="ref" 
href="#g_t_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e">&#279; &#277; e&#818; 
&#7865; &#283; &#567; e&#865;e</a>
 </p>
-<p><a class="ref" href="#g_t_0131-_1e14-_1e08">i &#274;&#768; &#262;&#807;</a>
+<p><a class="ref" href="#g_t_0131-_1e14-_1e08">&inodot; &#274;&#768; 
&#262;&#807;</a>
 </p>
 <p><a class="ref" href="#g_t_201c-_201d-_2018-_2019-_201e-_201a">&ldquo; 
&rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>
 </p>
@@ -23299,7 +23299,7 @@ $result_converted{'xml'}->{'at_commands_in_refs'} = 
'<node name="Top" spaces=" "
 <chapter spaces="  "><sectiontitle><accent type="uml">a</accent> <accent 
type="tilde">e</accent> <accent type="circ"><dotless>i</dotless></accent> 
<accent type="circ">a</accent> <accent type="grave">a</accent> <accent 
type="acute" bracketed="off">e</accent> <accent type="cedil">c</accent> <accent 
type="macr">e</accent> <accent type="ring">e</accent> <accent 
type="doubleacute">e</accent> <accent type="ogon">e</accent></sectiontitle>
 
 </chapter>
-<node name="_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e" spaces=" 
"><nodename><accent type="dotaccent">e</accent> <accent type="breve">e</accent> 
<accent type="ubaraccent">e</accent> <accent type="udotaccent">e</accent> 
<accent type="caron">e</accent> <dotless>j</dotless> <accent 
type="tieaccent">ee</accent></nodename><nodenext 
automatic="on"><dotless>i</dotless> <accent type="grave"><accent type="macr" 
bracketed="off">E</accent></accent> <accent type="cedil"><accent type="acute" 
bracketed= [...]
+<node name="_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e" spaces=" 
"><nodename><accent type="dotaccent">e</accent> <accent type="breve">e</accent> 
<accent type="ubaraccent">e</accent> <accent type="udotaccent">e</accent> 
<accent type="caron">e</accent> <dotless>j</dotless> <accent 
type="tieaccent">ee</accent></nodename><nodenext 
automatic="on"><dotless>i</dotless> <accent type="grave"><accent type="macr" 
bracketed="off">E</accent></accent> <accent type="cedil"><accent type="acute" 
bracke [...]
 <chapter spaces=" "><sectiontitle><accent type="dotaccent">e</accent> <accent 
type="breve">e</accent> <accent type="ubaraccent">e</accent> <accent 
type="udotaccent">e</accent> <accent type="caron">e</accent> 
<dotless>j</dotless> <accent type="tieaccent">ee</accent></sectiontitle>
 
 </chapter>
@@ -23386,7 +23386,7 @@ $result_converted{'xml'}->{'at_commands_in_refs'} = 
'<node name="Top" spaces=" "
 </para>
 <para><ref 
label="_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119"><xrefnodename><accent
 type="uml">a</accent> <accent type="tilde">e</accent> <accent 
type="circ"><dotless>i</dotless></accent> <accent type="circ">a</accent> 
<accent type="grave">a</accent> <accent type="acute" bracketed="off">e</accent> 
<accent type="cedil">c</accent> <accent type="macr">e</accent> <accent 
type="ring">e</accent> <accent type="doubleacute">e</accent> <accent 
type="ogon">e</accent></xref [...]
 </para>
-<para><ref 
label="_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e"><xrefnodename><accent 
type="dotaccent">e</accent> <accent type="breve">e</accent> <accent 
type="ubaraccent">e</accent> <accent type="udotaccent">e</accent> <accent 
type="caron">e</accent> <dotless>j</dotless> <accent 
type="tieaccent">ee</accent></xrefnodename></ref>
+<para><ref 
label="_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e"><xrefnodename><accent 
type="dotaccent">e</accent> <accent type="breve">e</accent> <accent 
type="ubaraccent">e</accent> <accent type="udotaccent">e</accent> <accent 
type="caron">e</accent> <dotless>j</dotless> <accent 
type="tieaccent">ee</accent></xrefnodename></ref>
 </para>
 <para><ref label="_0131-_1e14-_1e08"><xrefnodename><dotless>i</dotless> 
<accent type="grave"><accent type="macr" bracketed="off">E</accent></accent> 
<accent type="cedil"><accent type="acute" 
bracketed="off">C</accent></accent></xrefnodename></ref>
 </para>
@@ -23466,12 +23466,12 @@ $result_converted{'docbook'}->{'at_commands_in_refs'} 
= '<chapter label="1" id="
 <title>&#228; &#7869; &#238; &#226; &#224; &#233; &#231; &#275; e&#778; 
e&#779; &#281;</title>
 
 </chapter>
-<chapter label="11" id="_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e">
-<title>&#279; &#277; e&#818; &#7865; &#283; j e&#865;e</title>
+<chapter label="11" id="_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e">
+<title>&#279; &#277; e&#818; &#7865; &#283; &#567; e&#865;e</title>
 
 </chapter>
 <chapter label="12" id="_0131-_1e14-_1e08">
-<title>i &#274;&#768; &#262;&#807;</title>
+<title>&#305; &#274;&#768; &#262;&#807;</title>
 
 </chapter>
 <chapter label="13" id="_201c-_201d-_2018-_2019-_201e-_201a">
@@ -23554,9 +23554,9 @@ $result_converted{'docbook'}->{'at_commands_in_refs'} = 
'<chapter label="1" id="
 </para>
 <para><link 
linkend="_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119">&#228;
 &#7869; &#238; &#226; &#224; &#233; &#231; &#275; e&#778; e&#779; &#281;</link>
 </para>
-<para><link linkend="_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e">&#279; &#277; 
e&#818; &#7865; &#283; j e&#865;e</link>
+<para><link linkend="_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e">&#279; 
&#277; e&#818; &#7865; &#283; &#567; e&#865;e</link>
 </para>
-<para><link linkend="_0131-_1e14-_1e08">i &#274;&#768; &#262;&#807;</link>
+<para><link linkend="_0131-_1e14-_1e08">&#305; &#274;&#768; &#262;&#807;</link>
 </para>
 <para><link linkend="_201c-_201d-_2018-_2019-_201e-_201a">&#8220; &#8221; 
&#8216; &#8217; &#8222; &#8218;</link>
 </para>
@@ -23635,7 +23635,7 @@ Top
 * ⇒ ° a b a sunny day å::
 * Å æ œ Æ Œ ø Ø ß ł Ł Ð ð Þ þ::
 * ä ẽ î â à é ç ē e̊ e̋ ę::
-* ė ĕ e̲ ẹ ě j e͡e::
+* ė ĕ e̲ ẹ ě ȷ e͡e::
 * ı Ḕ Ḉ::
 * “ ” ‘ ’ „ ‚::
 * « » « » ‹ ›::
@@ -23712,19 +23712,19 @@ File: ,  Node: Å æ œ Æ Œ ø Ø ß ł Ł Ð ð Þ þ,  Next: ä 
ẽ î â à
 *****************************
 
 
-File: ,  Node: ä ẽ î â à é ç ē e̊ e̋ ę,  Next: ė ĕ e̲ ẹ ě j e͡e,  Prev: Å æ œ 
Æ Œ ø Ø ß ł Ł Ð ð Þ þ,  Up: Top
+File: ,  Node: ä ẽ î â à é ç ē e̊ e̋ ę,  Next: ė ĕ e̲ ẹ ě ȷ e͡e,  Prev: Å æ œ 
Æ Œ ø Ø ß ł Ł Ð ð Þ þ,  Up: Top
 
 10 ä ẽ î â à é ç ē e̊ e̋ ę
 ************************
 
 
-File: ,  Node: ė ĕ e̲ ẹ ě j e͡e,  Next: ı Ḕ Ḉ,  Prev: ä ẽ î â à é ç ē e̊ e̋ ę, 
 Up: Top
+File: ,  Node: ė ĕ e̲ ẹ ě ȷ e͡e,  Next: ı Ḕ Ḉ,  Prev: ä ẽ î â à é ç ē e̊ e̋ ę, 
 Up: Top
 
-11 ė ĕ e̲ ẹ ě j e͡e
+11 ė ĕ e̲ ẹ ě ȷ e͡e
 *****************
 
 
-File: ,  Node: ı Ḕ Ḉ,  Next: “ ” ‘ ’ „ ‚,  Prev: ė ĕ e̲ ẹ ě j e͡e,  Up: Top
+File: ,  Node: ı Ḕ Ḉ,  Next: “ ” ‘ ’ „ ‚,  Prev: ė ĕ e̲ ẹ ě ȷ e͡e,  Up: Top
 
 12 ı Ḕ Ḉ
 ********
@@ -23841,7 +23841,7 @@ File: ,  Node: <http://somewhere_aaa> text (url) ls,  
Prev: _{g}H 3^{rd},  Up: T
 
    *note ä ẽ î â à é ç ē e̊ e̋ ę::
 
-   *note ė ĕ e̲ ẹ ě j e͡e::
+   *note ė ĕ e̲ ẹ ě ȷ e͡e::
 
    *note ı Ḕ Ḉ::
 
@@ -23879,34 +23879,34 @@ File: ,  Node: <http://somewhere_aaa> text (url) ls,  
Prev: _{g}H 3^{rd},  Up: T
 
 Tag Table:
 Node: Top27
-Node: { }873
+Node: { }874
 Node:     !
-. . ? @952
-Node: @ { } \\ #1057
-Node: LaTeX TeX • , © ... ...1179
-Node: ≡ error→ € ¡ ↦ −1346
-Node: ≥ ≤ →1509
-Node: ª º ★ £ ⊣ ¿ ®1639
-Node: ⇒ ° a b a sunny day å1786
-Node: Å æ œ Æ Œ ø Ø ß ł Ł Ð ð Þ þ1974
-Node: ä ẽ î â à é ç ē e̊ e̋ ę2197
-Node: ė ĕ e̲ ẹ ě j e͡e2408
-Node: ı Ḕ Ḉ2569
-Node: “ ” ‘ ’ „ ‚2696
-Node: « » « » ‹ ›2838
-Node: `` \'\' --- -- ` \'2982
-Node: AAA (fff) AAA BBB3124
-Node: CCC (rrr) CCC DDD3264
-Node: the someone <someone@somewher> <no_explain@there>3437
-Node: [f--ile1] [image src="f--ile.png" alt="alt" text="Image 
description\\"\\"\\\\."]3737
-Node:  @ {} . 4087
-Node: cite asis in @w b in r SC *str* t VAR dfn i4290
-Node: env code option samp command file C-x <ESC>4542
-Node: 8.27in4832
-Node: sansserif slanted4966
-Node: indicateurl5090
-Node: _{g}H 3^{rd}5216
-Node: <http://somewhere_aaa> text (url) ls5355
+. . ? @953
+Node: @ { } \\ #1058
+Node: LaTeX TeX • , © ... ...1180
+Node: ≡ error→ € ¡ ↦ −1347
+Node: ≥ ≤ →1510
+Node: ª º ★ £ ⊣ ¿ ®1640
+Node: ⇒ ° a b a sunny day å1787
+Node: Å æ œ Æ Œ ø Ø ß ł Ł Ð ð Þ þ1975
+Node: ä ẽ î â à é ç ē e̊ e̋ ę2198
+Node: ė ĕ e̲ ẹ ě ȷ e͡e2410
+Node: ı Ḕ Ḉ2573
+Node: “ ” ‘ ’ „ ‚2701
+Node: « » « » ‹ ›2843
+Node: `` \'\' --- -- ` \'2987
+Node: AAA (fff) AAA BBB3129
+Node: CCC (rrr) CCC DDD3269
+Node: the someone <someone@somewher> <no_explain@there>3442
+Node: [f--ile1] [image src="f--ile.png" alt="alt" text="Image 
description\\"\\"\\\\."]3742
+Node:  @ {} . 4092
+Node: cite asis in @w b in r SC *str* t VAR dfn i4295
+Node: env code option samp command file C-x <ESC>4547
+Node: 8.27in4837
+Node: sansserif slanted4971
+Node: indicateurl5095
+Node: _{g}H 3^{rd}5221
+Node: <http://somewhere_aaa> text (url) ls5360
 
 End Tag Table
 
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl
index a11c2d1af0..d02379d8ce 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl
@@ -2392,7 +2392,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                     {},
                     {}
                   ],
-                  'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e'
+                  'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
                 }
               },
               'parent' => {},
@@ -8689,10 +8689,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               {},
               {}
             ],
-            'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e'
+            'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
           }
         ],
-        'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e',
+        'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e',
         'spaces_before_argument' => ' '
       },
       'parent' => {},
@@ -15181,7 +15181,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                     {},
                     {}
                   ],
-                  'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e'
+                  'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
                 }
               },
               'parent' => {},
@@ -21284,7 +21284,7 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e'
+                    'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
                   },
                   'structure' => {}
                 }
@@ -21893,7 +21893,7 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                     'section_number' => 11
                                                   }
                                                 },
-                                                'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e'
+                                                'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
                                               },
                                               'structure' => {
                                                 'node_next' => {
@@ -22340,7 +22340,7 @@ $result_menus{'at_commands_in_refs_latin1'} = {
                                             'menu_next' => {
                                               'cmdname' => 'node',
                                               'extra' => {
-                                                'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e'
+                                                'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
                                               },
                                               'structure' => {
                                                 'menu_next' => {
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
index 57e0187ee4..43327f1fae 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
@@ -14,7 +14,7 @@
 <link href="index.html" rel="start" title="Top">
 <link href="index.html" rel="up" title="Top">
 <link href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html" rel="next" 
title="&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;">
-<link href="i-E-C.html" rel="prev" title="i &#274;&#768; &#262;&#807;">
+<link href="i-E-C.html" rel="prev" title="&inodot; &#274;&#768; &#262;&#807;">
 
 
 </head>
@@ -23,7 +23,7 @@
 <div class="chapter-level-extent" id="g_t_201c-_201d-_2018-_2019-_201e-_201a">
 <div class="nav-panel">
 <p>
-Next: <a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html" accesskey="n" 
rel="next">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>, Previous: <a 
href="i-E-C.html" accesskey="p" rel="prev">i &#274;&#768; &#262;&#807;</a>, Up: 
<a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html" accesskey="n" 
rel="next">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>, Previous: <a 
href="i-E-C.html" accesskey="p" rel="prev">&inodot; &#274;&#768; 
&#262;&#807;</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> 
&nbsp; </p>
 </div>
 <hr>
 <h2 class="chapter" id="g_t_201c-_201d-_2018-_2019-_201e-_201a-1">13 &ldquo; 
&rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</h2>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/a-e-i-a-a-e-c-e-e-e-e.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/a-e-i-a-a-e-c-e-e-e-e.html
index 8e64e8b78e..2e804b7955 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/a-e-i-a-a-e-c-e-e-e-e.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/a-e-i-a-a-e-c-e-e-e-e.html
@@ -13,7 +13,7 @@
 
 <link href="index.html" rel="start" title="Top">
 <link href="index.html" rel="up" title="Top">
-<link href="e-e-e-e-e-j-ee.html" rel="next" title="&#279; &#277; e&#818; 
&#7865; &#283; j e&#865;e">
+<link href="e-e-e-e-e-j-ee.html" rel="next" title="&#279; &#277; e&#818; 
&#7865; &#283; &#567; e&#865;e">
 <link href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" rel="prev" 
title="&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH; &eth; &THORN; &thorn;">
 
 
@@ -23,7 +23,7 @@
 <div class="chapter-level-extent" 
id="g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119">
 <div class="nav-panel">
 <p>
-Next: <a href="e-e-e-e-e-j-ee.html" accesskey="n" rel="next">&#279; &#277; 
e&#818; &#7865; &#283; j e&#865;e</a>, Previous: <a 
href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" accesskey="p" 
rel="prev">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; 
&#322; &#321; &ETH; &eth; &THORN; &thorn;</a>, Up: <a href="index.html" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="e-e-e-e-e-j-ee.html" accesskey="n" rel="next">&#279; &#277; 
e&#818; &#7865; &#283; &#567; e&#865;e</a>, Previous: <a 
href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" accesskey="p" 
rel="prev">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; 
&#322; &#321; &ETH; &eth; &THORN; &thorn;</a>, Up: <a href="index.html" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
 <h2 class="chapter" id="a-e-i-a-a-e-c-e-e-e-e">10 &auml; &#7869; &icirc; 
&acirc; &agrave; &eacute; &ccedil; &#275; e&#778; e&#779; &#281;</h2>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/e-e-e-e-e-j-ee.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/e-e-e-e-e-j-ee.html
index ec954537c9..12a6e544e9 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/e-e-e-e-e-j-ee.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/e-e-e-e-e-j-ee.html
@@ -3,30 +3,30 @@
 <!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15">
-<title>&#279; &#277; e&#818; &#7865; &#283; j e&#865;e (Top)</title>
+<title>&#279; &#277; e&#818; &#7865; &#283; &#567; e&#865;e (Top)</title>
 
-<meta name="description" content="&#279; &#277; e&#818; &#7865; &#283; j 
e&#865;e (Top)">
-<meta name="keywords" content="&#279; &#277; e&#818; &#7865; &#283; j e&#865;e 
(Top)">
+<meta name="description" content="&#279; &#277; e&#818; &#7865; &#283; &#567; 
e&#865;e (Top)">
+<meta name="keywords" content="&#279; &#277; e&#818; &#7865; &#283; &#567; 
e&#865;e (Top)">
 <meta name="resource-type" content="document">
 <meta name="distribution" content="global">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
 <link href="index.html" rel="start" title="Top">
 <link href="index.html" rel="up" title="Top">
-<link href="i-E-C.html" rel="next" title="i &#274;&#768; &#262;&#807;">
+<link href="i-E-C.html" rel="next" title="&inodot; &#274;&#768; &#262;&#807;">
 <link href="a-e-i-a-a-e-c-e-e-e-e.html" rel="prev" title="&auml; &#7869; 
&icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e&#778; e&#779; &#281;">
 
 
 </head>
 
 <body lang="en">
-<div class="chapter-level-extent" 
id="g_t_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e">
+<div class="chapter-level-extent" 
id="g_t_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e">
 <div class="nav-panel">
 <p>
-Next: <a href="i-E-C.html" accesskey="n" rel="next">i &#274;&#768; 
&#262;&#807;</a>, Previous: <a href="a-e-i-a-a-e-c-e-e-e-e.html" accesskey="p" 
rel="prev">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; 
e&#778; e&#779; &#281;</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
+Next: <a href="i-E-C.html" accesskey="n" rel="next">&inodot; &#274;&#768; 
&#262;&#807;</a>, Previous: <a href="a-e-i-a-a-e-c-e-e-e-e.html" accesskey="p" 
rel="prev">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; 
e&#778; e&#779; &#281;</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<h2 class="chapter" id="e-e-e-e-e-j-ee">11 &#279; &#277; e&#818; &#7865; 
&#283; j e&#865;e</h2>
+<h2 class="chapter" id="e-e-e-e-e-j-ee">11 &#279; &#277; e&#818; &#7865; 
&#283; &#567; e&#865;e</h2>
 
 </div>
 
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
index 5e8b1f8a74..13e3f2de76 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
@@ -55,9 +55,9 @@ Previous: <a href="gH-3rd.html" accesskey="p" rel="prev"><sub 
class="sub">g</sub
 </p>
 <p><a class="ref" href="a-e-i-a-a-e-c-e-e-e-e.html">&auml; &#7869; &icirc; 
&acirc; &agrave; &eacute; &ccedil; &#275; e&#778; e&#779; &#281;</a>
 </p>
-<p><a class="ref" href="e-e-e-e-e-j-ee.html">&#279; &#277; e&#818; &#7865; 
&#283; j e&#865;e</a>
+<p><a class="ref" href="e-e-e-e-e-j-ee.html">&#279; &#277; e&#818; &#7865; 
&#283; &#567; e&#865;e</a>
 </p>
-<p><a class="ref" href="i-E-C.html">i &#274;&#768; &#262;&#807;</a>
+<p><a class="ref" href="i-E-C.html">&inodot; &#274;&#768; &#262;&#807;</a>
 </p>
 <p><a class="ref" href="_201c-_201d-_2018-_2019-_201e-_201a.html">&ldquo; 
&rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>
 </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/i-E-C.html 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/i-E-C.html
index 6e14ff2089..eb2a32d110 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/i-E-C.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/i-E-C.html
@@ -3,10 +3,10 @@
 <!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15">
-<title>i &#274;&#768; &#262;&#807; (Top)</title>
+<title>&inodot; &#274;&#768; &#262;&#807; (Top)</title>
 
-<meta name="description" content="i &#274;&#768; &#262;&#807; (Top)">
-<meta name="keywords" content="i &#274;&#768; &#262;&#807; (Top)">
+<meta name="description" content="&inodot; &#274;&#768; &#262;&#807; (Top)">
+<meta name="keywords" content="&inodot; &#274;&#768; &#262;&#807; (Top)">
 <meta name="resource-type" content="document">
 <meta name="distribution" content="global">
 <meta name="viewport" content="width=device-width,initial-scale=1">
@@ -14,7 +14,7 @@
 <link href="index.html" rel="start" title="Top">
 <link href="index.html" rel="up" title="Top">
 <link href="_201c-_201d-_2018-_2019-_201e-_201a.html" rel="next" 
title="&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;">
-<link href="e-e-e-e-e-j-ee.html" rel="prev" title="&#279; &#277; e&#818; 
&#7865; &#283; j e&#865;e">
+<link href="e-e-e-e-e-j-ee.html" rel="prev" title="&#279; &#277; e&#818; 
&#7865; &#283; &#567; e&#865;e">
 
 
 </head>
@@ -23,10 +23,10 @@
 <div class="chapter-level-extent" id="g_t_0131-_1e14-_1e08">
 <div class="nav-panel">
 <p>
-Next: <a href="_201c-_201d-_2018-_2019-_201e-_201a.html" accesskey="n" 
rel="next">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>, Previous: <a 
href="e-e-e-e-e-j-ee.html" accesskey="p" rel="prev">&#279; &#277; e&#818; 
&#7865; &#283; j e&#865;e</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
+Next: <a href="_201c-_201d-_2018-_2019-_201e-_201a.html" accesskey="n" 
rel="next">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>, Previous: <a 
href="e-e-e-e-e-j-ee.html" accesskey="p" rel="prev">&#279; &#277; e&#818; 
&#7865; &#283; &#567; e&#865;e</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<h2 class="chapter" id="i-E-C">12 i &#274;&#768; &#262;&#807;</h2>
+<h2 class="chapter" id="i-E-C">12 &inodot; &#274;&#768; &#262;&#807;</h2>
 
 </div>
 
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/index.html 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/index.html
index 5f9e3ae38e..fe0df6ebe3 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/index.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/index.html
@@ -47,8 +47,8 @@ Next: <a href="-_007b-_007d.html" accesskey="n" rel="next"> { 
}</a> &nbsp; </p>
 <li><a href="_21d2-_00b0-a-b--aa.html" accesskey="8">&rArr; &deg; a&nbsp;b a 
sunny day &aring;</a></li>
 <li><a href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" accesskey="9">&Aring; 
&aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; 
&eth; &THORN; &thorn;</a></li>
 <li><a href="a-e-i-a-a-e-c-e-e-e-e.html">&auml; &#7869; &icirc; &acirc; 
&agrave; &eacute; &ccedil; &#275; e&#778; e&#779; &#281;</a></li>
-<li><a href="e-e-e-e-e-j-ee.html">&#279; &#277; e&#818; &#7865; &#283; j 
e&#865;e</a></li>
-<li><a href="i-E-C.html">i &#274;&#768; &#262;&#807;</a></li>
+<li><a href="e-e-e-e-e-j-ee.html">&#279; &#277; e&#818; &#7865; &#283; &#567; 
e&#865;e</a></li>
+<li><a href="i-E-C.html">&inodot; &#274;&#768; &#262;&#807;</a></li>
 <li><a href="_201c-_201d-_2018-_2019-_201e-_201a.html">&ldquo; &rdquo; &lsquo; 
&rsquo; &bdquo; &sbquo;</a></li>
 <li><a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html">&laquo; &raquo; &laquo; 
&raquo; &lsaquo; &rsaquo;</a></li>
 <li><a 
href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html">&ldquo;
 &rdquo; &mdash; &ndash; &lsquo; &rsquo;</a></li>
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs_utf8.pl 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8.pl
index 97667cb8bd..e536d72e54 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs_utf8.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs_utf8.pl
@@ -2392,7 +2392,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                     {},
                     {}
                   ],
-                  'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e'
+                  'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
                 }
               },
               'parent' => {},
@@ -8689,10 +8689,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               {},
               {}
             ],
-            'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e'
+            'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
           }
         ],
-        'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e',
+        'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e',
         'spaces_before_argument' => ' '
       },
       'parent' => {},
@@ -15181,7 +15181,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                     {},
                     {}
                   ],
-                  'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e'
+                  'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
                 }
               },
               'parent' => {},
@@ -21284,7 +21284,7 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e'
+                    'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
                   },
                   'structure' => {}
                 }
@@ -21893,7 +21893,7 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                     'section_number' => 11
                                                   }
                                                 },
-                                                'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e'
+                                                'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
                                               },
                                               'structure' => {
                                                 'node_next' => {
@@ -22340,7 +22340,7 @@ $result_menus{'at_commands_in_refs_utf8'} = {
                                             'menu_next' => {
                                               'cmdname' => 'node',
                                               'extra' => {
-                                                'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e'
+                                                'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
                                               },
                                               'structure' => {
                                                 'menu_next' => {
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
index d0a86fb5cb..e6687d0295 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
@@ -14,7 +14,7 @@
 <link href="index.html" rel="start" title="Top">
 <link href="index.html" rel="up" title="Top">
 <link href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html" rel="next" 
title="&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;">
-<link href="i-E-C.html" rel="prev" title="i &#274;&#768; &#262;&#807;">
+<link href="i-E-C.html" rel="prev" title="&inodot; &#274;&#768; &#262;&#807;">
 
 
 </head>
@@ -23,7 +23,7 @@
 <div class="chapter-level-extent" id="g_t_201c-_201d-_2018-_2019-_201e-_201a">
 <div class="nav-panel">
 <p>
-Next: <a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html" accesskey="n" 
rel="next">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>, Previous: <a 
href="i-E-C.html" accesskey="p" rel="prev">i &#274;&#768; &#262;&#807;</a>, Up: 
<a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html" accesskey="n" 
rel="next">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>, Previous: <a 
href="i-E-C.html" accesskey="p" rel="prev">&inodot; &#274;&#768; 
&#262;&#807;</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> 
&nbsp; </p>
 </div>
 <hr>
 <h2 class="chapter" id="g_t_201c-_201d-_2018-_2019-_201e-_201a-1">13 &ldquo; 
&rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</h2>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/a-e-i-a-a-e-c-e-e-e-e.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/a-e-i-a-a-e-c-e-e-e-e.html
index e8e7fd86fb..e0df477a87 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/a-e-i-a-a-e-c-e-e-e-e.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/a-e-i-a-a-e-c-e-e-e-e.html
@@ -13,7 +13,7 @@
 
 <link href="index.html" rel="start" title="Top">
 <link href="index.html" rel="up" title="Top">
-<link href="e-e-e-e-e-j-ee.html" rel="next" title="&#279; &#277; e&#818; 
&#7865; &#283; j e&#865;e">
+<link href="e-e-e-e-e-j-ee.html" rel="next" title="&#279; &#277; e&#818; 
&#7865; &#283; &#567; e&#865;e">
 <link href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" rel="prev" 
title="&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH; &eth; &THORN; &thorn;">
 
 
@@ -23,7 +23,7 @@
 <div class="chapter-level-extent" 
id="g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119">
 <div class="nav-panel">
 <p>
-Next: <a href="e-e-e-e-e-j-ee.html" accesskey="n" rel="next">&#279; &#277; 
e&#818; &#7865; &#283; j e&#865;e</a>, Previous: <a 
href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" accesskey="p" 
rel="prev">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; 
&#322; &#321; &ETH; &eth; &THORN; &thorn;</a>, Up: <a href="index.html" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="e-e-e-e-e-j-ee.html" accesskey="n" rel="next">&#279; &#277; 
e&#818; &#7865; &#283; &#567; e&#865;e</a>, Previous: <a 
href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" accesskey="p" 
rel="prev">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; 
&#322; &#321; &ETH; &eth; &THORN; &thorn;</a>, Up: <a href="index.html" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
 <h2 class="chapter" id="a-e-i-a-a-e-c-e-e-e-e">10 &auml; &#7869; &icirc; 
&acirc; &agrave; &eacute; &ccedil; &#275; e&#778; e&#779; &#281;</h2>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/e-e-e-e-e-j-ee.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/e-e-e-e-e-j-ee.html
index 4298b7d10d..d5226e1be7 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/e-e-e-e-e-j-ee.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/e-e-e-e-e-j-ee.html
@@ -3,30 +3,30 @@
 <!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>&#279; &#277; e&#818; &#7865; &#283; j e&#865;e (Top)</title>
+<title>&#279; &#277; e&#818; &#7865; &#283; &#567; e&#865;e (Top)</title>
 
-<meta name="description" content="&#279; &#277; e&#818; &#7865; &#283; j 
e&#865;e (Top)">
-<meta name="keywords" content="&#279; &#277; e&#818; &#7865; &#283; j e&#865;e 
(Top)">
+<meta name="description" content="&#279; &#277; e&#818; &#7865; &#283; &#567; 
e&#865;e (Top)">
+<meta name="keywords" content="&#279; &#277; e&#818; &#7865; &#283; &#567; 
e&#865;e (Top)">
 <meta name="resource-type" content="document">
 <meta name="distribution" content="global">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
 <link href="index.html" rel="start" title="Top">
 <link href="index.html" rel="up" title="Top">
-<link href="i-E-C.html" rel="next" title="i &#274;&#768; &#262;&#807;">
+<link href="i-E-C.html" rel="next" title="&inodot; &#274;&#768; &#262;&#807;">
 <link href="a-e-i-a-a-e-c-e-e-e-e.html" rel="prev" title="&auml; &#7869; 
&icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e&#778; e&#779; &#281;">
 
 
 </head>
 
 <body lang="en">
-<div class="chapter-level-extent" 
id="g_t_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e">
+<div class="chapter-level-extent" 
id="g_t_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e">
 <div class="nav-panel">
 <p>
-Next: <a href="i-E-C.html" accesskey="n" rel="next">i &#274;&#768; 
&#262;&#807;</a>, Previous: <a href="a-e-i-a-a-e-c-e-e-e-e.html" accesskey="p" 
rel="prev">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; 
e&#778; e&#779; &#281;</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
+Next: <a href="i-E-C.html" accesskey="n" rel="next">&inodot; &#274;&#768; 
&#262;&#807;</a>, Previous: <a href="a-e-i-a-a-e-c-e-e-e-e.html" accesskey="p" 
rel="prev">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; 
e&#778; e&#779; &#281;</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<h2 class="chapter" id="e-e-e-e-e-j-ee">11 &#279; &#277; e&#818; &#7865; 
&#283; j e&#865;e</h2>
+<h2 class="chapter" id="e-e-e-e-e-j-ee">11 &#279; &#277; e&#818; &#7865; 
&#283; &#567; e&#865;e</h2>
 
 </div>
 
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
index b07e7f3f16..02345cb92b 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
@@ -55,9 +55,9 @@ Previous: <a href="gH-3rd.html" accesskey="p" rel="prev"><sub 
class="sub">g</sub
 </p>
 <p><a class="ref" href="a-e-i-a-a-e-c-e-e-e-e.html">&auml; &#7869; &icirc; 
&acirc; &agrave; &eacute; &ccedil; &#275; e&#778; e&#779; &#281;</a>
 </p>
-<p><a class="ref" href="e-e-e-e-e-j-ee.html">&#279; &#277; e&#818; &#7865; 
&#283; j e&#865;e</a>
+<p><a class="ref" href="e-e-e-e-e-j-ee.html">&#279; &#277; e&#818; &#7865; 
&#283; &#567; e&#865;e</a>
 </p>
-<p><a class="ref" href="i-E-C.html">i &#274;&#768; &#262;&#807;</a>
+<p><a class="ref" href="i-E-C.html">&inodot; &#274;&#768; &#262;&#807;</a>
 </p>
 <p><a class="ref" href="_201c-_201d-_2018-_2019-_201e-_201a.html">&ldquo; 
&rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>
 </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/i-E-C.html 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/i-E-C.html
index 60cebc6bf3..569d2720bd 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/i-E-C.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/i-E-C.html
@@ -3,10 +3,10 @@
 <!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>i &#274;&#768; &#262;&#807; (Top)</title>
+<title>&inodot; &#274;&#768; &#262;&#807; (Top)</title>
 
-<meta name="description" content="i &#274;&#768; &#262;&#807; (Top)">
-<meta name="keywords" content="i &#274;&#768; &#262;&#807; (Top)">
+<meta name="description" content="&inodot; &#274;&#768; &#262;&#807; (Top)">
+<meta name="keywords" content="&inodot; &#274;&#768; &#262;&#807; (Top)">
 <meta name="resource-type" content="document">
 <meta name="distribution" content="global">
 <meta name="viewport" content="width=device-width,initial-scale=1">
@@ -14,7 +14,7 @@
 <link href="index.html" rel="start" title="Top">
 <link href="index.html" rel="up" title="Top">
 <link href="_201c-_201d-_2018-_2019-_201e-_201a.html" rel="next" 
title="&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;">
-<link href="e-e-e-e-e-j-ee.html" rel="prev" title="&#279; &#277; e&#818; 
&#7865; &#283; j e&#865;e">
+<link href="e-e-e-e-e-j-ee.html" rel="prev" title="&#279; &#277; e&#818; 
&#7865; &#283; &#567; e&#865;e">
 
 
 </head>
@@ -23,10 +23,10 @@
 <div class="chapter-level-extent" id="g_t_0131-_1e14-_1e08">
 <div class="nav-panel">
 <p>
-Next: <a href="_201c-_201d-_2018-_2019-_201e-_201a.html" accesskey="n" 
rel="next">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>, Previous: <a 
href="e-e-e-e-e-j-ee.html" accesskey="p" rel="prev">&#279; &#277; e&#818; 
&#7865; &#283; j e&#865;e</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
+Next: <a href="_201c-_201d-_2018-_2019-_201e-_201a.html" accesskey="n" 
rel="next">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>, Previous: <a 
href="e-e-e-e-e-j-ee.html" accesskey="p" rel="prev">&#279; &#277; e&#818; 
&#7865; &#283; &#567; e&#865;e</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<h2 class="chapter" id="i-E-C">12 i &#274;&#768; &#262;&#807;</h2>
+<h2 class="chapter" id="i-E-C">12 &inodot; &#274;&#768; &#262;&#807;</h2>
 
 </div>
 
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/index.html 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/index.html
index af127bf043..ddcde98506 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/index.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/index.html
@@ -47,8 +47,8 @@ Next: <a href="-_007b-_007d.html" accesskey="n" rel="next"> { 
}</a> &nbsp; </p>
 <li><a href="_21d2-_00b0-a-b--aa.html" accesskey="8">&rArr; &deg; a&nbsp;b a 
sunny day &aring;</a></li>
 <li><a href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" accesskey="9">&Aring; 
&aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; 
&eth; &THORN; &thorn;</a></li>
 <li><a href="a-e-i-a-a-e-c-e-e-e-e.html">&auml; &#7869; &icirc; &acirc; 
&agrave; &eacute; &ccedil; &#275; e&#778; e&#779; &#281;</a></li>
-<li><a href="e-e-e-e-e-j-ee.html">&#279; &#277; e&#818; &#7865; &#283; j 
e&#865;e</a></li>
-<li><a href="i-E-C.html">i &#274;&#768; &#262;&#807;</a></li>
+<li><a href="e-e-e-e-e-j-ee.html">&#279; &#277; e&#818; &#7865; &#283; &#567; 
e&#865;e</a></li>
+<li><a href="i-E-C.html">&inodot; &#274;&#768; &#262;&#807;</a></li>
 <li><a href="_201c-_201d-_2018-_2019-_201e-_201a.html">&ldquo; &rdquo; &lsquo; 
&rsquo; &bdquo; &sbquo;</a></li>
 <li><a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html">&laquo; &raquo; &laquo; 
&raquo; &lsaquo; &rsaquo;</a></li>
 <li><a 
href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html">&ldquo;
 &rdquo; &mdash; &ndash; &lsquo; &rsquo;</a></li>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
index c4ca3a91bc..2419253234 100644
Binary files 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
 and 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
 differ
diff --git a/tp/t/results/html_tests/itemize_arguments/res_html/index.html 
b/tp/t/results/html_tests/itemize_arguments/res_html/index.html
index 433d9efd9f..98ccc2a3f5 100644
--- a/tp/t/results/html_tests/itemize_arguments/res_html/index.html
+++ b/tp/t/results/html_tests/itemize_arguments/res_html/index.html
@@ -107,8 +107,8 @@ ul.mark-tie {list-style-type: " "}
 <li>item E &Ecirc; <small class="sc">&Ecirc;</small>
 </li></ul>
 
-<ul class="itemize" style="list-style-type: '\0129  i \0128  I'">
-<li>item dotless &#297; i <small class="sc">&#296; I</small>
+<ul class="itemize" style="list-style-type: '\0131 \0303  \0131  \0128  I'">
+<li>item dotless &#297; &inodot; <small class="sc">&#296; I</small>
 </li></ul>
 
 <ul class="itemize" style="list-style-type: '\1E5B  \0155 \030C  \1E5A  \0154 
\030C '">
diff --git 
a/tp/t/results/html_tests/mathjax_with_texinfo_no_convert_to_latex.pl 
b/tp/t/results/html_tests/mathjax_with_texinfo_no_convert_to_latex.pl
index 75475cda5b..51972252a8 100644
--- a/tp/t/results/html_tests/mathjax_with_texinfo_no_convert_to_latex.pl
+++ b/tp/t/results/html_tests/mathjax_with_texinfo_no_convert_to_latex.pl
@@ -392,7 +392,7 @@ MathJax = {
 </head>
 
 <body lang="en" class="tex2jax_ignore">
-<div class="displaymath"><em class="tex2jax_process">\\[a<sup class="sup">b - 
\\frac{\\xi}{phi &copy;}</sup> i
+<div class="displaymath"><em class="tex2jax_process">\\[a<sup class="sup">b - 
\\frac{\\xi}{phi &copy;}</sup> &inodot;
 \\]</em></div>
 <p>Some <em class="math tex2jax_process">\\(a - b &ge; &Aring; &ecirc;\\)</em>.
 </p>
diff --git a/tp/t/results/html_tests/test_accents_sc_default.pl 
b/tp/t/results/html_tests/test_accents_sc_default.pl
index d8cb90b590..0e418be0d3 100644
--- a/tp/t/results/html_tests/test_accents_sc_default.pl
+++ b/tp/t/results/html_tests/test_accents_sc_default.pl
@@ -1766,7 +1766,7 @@ 
$result_converted{'html_text'}->{'test_accents_sc_default'} = '<div class="top-l
 
 <p>&ndash;a&#774;
 &ndash;a&#770;
-&aring; &Aring; &ecirc; &Ecirc; &#297; i &#7771; &#341;&#780; 
&ntilde;&#807;&#772;.
+&aring; &Aring; &ecirc; &Ecirc; &#297; &inodot; &#7771; &#341;&#780; 
&ntilde;&#807;&#772;.
 &equiv;
 <small class="sc">&Aring; &Aring; &Ecirc; &Ecirc; &#296; I &#7770; 
&#340;&#780; &Ntilde;&#807;&#772;</small>.
 </p>
diff --git 
a/tp/t/results/html_tests/test_accents_sc_default/res_html/node-chap.html 
b/tp/t/results/html_tests/test_accents_sc_default/res_html/node-chap.html
index 3968992db1..cbc9407d15 100644
--- a/tp/t/results/html_tests/test_accents_sc_default/res_html/node-chap.html
+++ b/tp/t/results/html_tests/test_accents_sc_default/res_html/node-chap.html
@@ -38,7 +38,7 @@ Previous: <a href="index.html" accesskey="p" rel="prev">top 
section</a>, Up: <a
 
 <p>&ndash;a&#774;
 &ndash;a&#770;
-&aring; &Aring; &ecirc; &Ecirc; &#297; i &#7771; &#341;&#780; 
&ntilde;&#807;&#772;.
+&aring; &Aring; &ecirc; &Ecirc; &#297; &inodot; &#7771; &#341;&#780; 
&ntilde;&#807;&#772;.
 &equiv;
 <small class="sc">&Aring; &Aring; &Ecirc; &Ecirc; &#296; I &#7770; 
&#340;&#780; &Ntilde;&#807;&#772;</small>.
 </p>
diff --git a/tp/t/results/html_tests/test_accents_sc_default_latin1.pl 
b/tp/t/results/html_tests/test_accents_sc_default_latin1.pl
index f76ec6260d..115081c3ad 100644
--- a/tp/t/results/html_tests/test_accents_sc_default_latin1.pl
+++ b/tp/t/results/html_tests/test_accents_sc_default_latin1.pl
@@ -1812,7 +1812,7 @@ 
$result_converted{'html_text'}->{'test_accents_sc_default_latin1'} = '
 
 <p>&ndash;a&#774;
 &ndash;a&#770;
-&aring; &Aring; &ecirc; &Ecirc; &#297; i &#7771; &#341;&#780; 
&ntilde;&#807;&#772;.
+&aring; &Aring; &ecirc; &Ecirc; &#297; &inodot; &#7771; &#341;&#780; 
&ntilde;&#807;&#772;.
 &equiv;
 <small class="sc">&Aring; &Aring; &Ecirc; &Ecirc; &#296; I &#7770; 
&#340;&#780; &Ntilde;&#807;&#772;</small>.
 </p>
diff --git 
a/tp/t/results/html_tests/test_accents_sc_default_latin1/res_html/node-chap.html
 
b/tp/t/results/html_tests/test_accents_sc_default_latin1/res_html/node-chap.html
index 54f1965d46..ff2eb1b73e 100644
--- 
a/tp/t/results/html_tests/test_accents_sc_default_latin1/res_html/node-chap.html
+++ 
b/tp/t/results/html_tests/test_accents_sc_default_latin1/res_html/node-chap.html
@@ -38,7 +38,7 @@ Previous: <a href="index.html" accesskey="p" rel="prev">top 
section</a>, Up: <a
 
 <p>&ndash;a&#774;
 &ndash;a&#770;
-&aring; &Aring; &ecirc; &Ecirc; &#297; i &#7771; &#341;&#780; 
&ntilde;&#807;&#772;.
+&aring; &Aring; &ecirc; &Ecirc; &#297; &inodot; &#7771; &#341;&#780; 
&ntilde;&#807;&#772;.
 &equiv;
 <small class="sc">&Aring; &Aring; &Ecirc; &Ecirc; &#296; I &#7770; 
&#340;&#780; &Ntilde;&#807;&#772;</small>.
 </p>
diff --git a/tp/t/results/html_tests/test_accents_sc_default_usascii.pl 
b/tp/t/results/html_tests/test_accents_sc_default_usascii.pl
index d208fac2bc..75bc62fefa 100644
--- a/tp/t/results/html_tests/test_accents_sc_default_usascii.pl
+++ b/tp/t/results/html_tests/test_accents_sc_default_usascii.pl
@@ -1842,7 +1842,7 @@ 
$result_converted{'html_text'}->{'test_accents_sc_default_usascii'} = '
 
 <p>&ndash;a&#774;
 &ndash;a&#770;
-&aring; &Aring; &ecirc; &Ecirc; &#297; i &#7771; &#341;&#780; 
&ntilde;&#807;&#772;.
+&aring; &Aring; &ecirc; &Ecirc; &#297; &inodot; &#7771; &#341;&#780; 
&ntilde;&#807;&#772;.
 &equiv;
 <small class="sc">&Aring; &Aring; &Ecirc; &Ecirc; &#296; I &#7770; 
&#340;&#780; &Ntilde;&#807;&#772;</small>.
 </p>
diff --git 
a/tp/t/results/html_tests/test_accents_sc_default_usascii/res_html/node-chap.html
 
b/tp/t/results/html_tests/test_accents_sc_default_usascii/res_html/node-chap.html
index 77ab4a68b9..f7469116c9 100644
--- 
a/tp/t/results/html_tests/test_accents_sc_default_usascii/res_html/node-chap.html
+++ 
b/tp/t/results/html_tests/test_accents_sc_default_usascii/res_html/node-chap.html
@@ -38,7 +38,7 @@ Previous: <a href="index.html" accesskey="p" rel="prev">top 
section</a>, Up: <a
 
 <p>&ndash;a&#774;
 &ndash;a&#770;
-&aring; &Aring; &ecirc; &Ecirc; &#297; i &#7771; &#341;&#780; 
&ntilde;&#807;&#772;.
+&aring; &Aring; &ecirc; &Ecirc; &#297; &inodot; &#7771; &#341;&#780; 
&ntilde;&#807;&#772;.
 &equiv;
 <small class="sc">&Aring; &Aring; &Ecirc; &Ecirc; &#296; I &#7770; 
&#340;&#780; &Ntilde;&#807;&#772;</small>.
 </p>
diff --git a/tp/t/results/html_tests/test_accents_sc_enable_encoding_latin1.pl 
b/tp/t/results/html_tests/test_accents_sc_enable_encoding_latin1.pl
index 562a19b800..810e56108f 100644
--- a/tp/t/results/html_tests/test_accents_sc_enable_encoding_latin1.pl
+++ b/tp/t/results/html_tests/test_accents_sc_enable_encoding_latin1.pl
@@ -1812,7 +1812,7 @@ 
$result_converted{'html_text'}->{'test_accents_sc_enable_encoding_latin1'} = '
 
 <p>&ndash;a&#774;
 &ndash;a&#770;
-å Å ê Ê &#297; i &#7771; &#341;&#780; ñ&#807;&#772;.
+å Å ê Ê &#297; &inodot; &#7771; &#341;&#780; ñ&#807;&#772;.
 &equiv;
 <small class="sc">Å Å Ê Ê &#296; I &#7770; &#340;&#780; Ñ&#807;&#772;</small>.
 </p>
diff --git 
a/tp/t/results/html_tests/test_accents_sc_enable_encoding_latin1/res_html/node-chap.html
 
b/tp/t/results/html_tests/test_accents_sc_enable_encoding_latin1/res_html/node-chap.html
index 97f4b6fc42..d8bdd8c99f 100644
--- 
a/tp/t/results/html_tests/test_accents_sc_enable_encoding_latin1/res_html/node-chap.html
+++ 
b/tp/t/results/html_tests/test_accents_sc_enable_encoding_latin1/res_html/node-chap.html
@@ -38,7 +38,7 @@ Previous: <a href="index.html" accesskey="p" rel="prev">top 
section</a>, Up: <a
 
 <p>&ndash;a&#774;
 &ndash;a&#770;
-� � � � &#297; i &#7771; &#341;&#780; �&#807;&#772;.
+� � � � &#297; &inodot; &#7771; &#341;&#780; �&#807;&#772;.
 &equiv;
 <small class="sc">� � � � &#296; I &#7770; &#340;&#780; �&#807;&#772;</small>.
 </p>
diff --git a/tp/t/results/html_tests/test_accents_sc_enable_encoding_usascii.pl 
b/tp/t/results/html_tests/test_accents_sc_enable_encoding_usascii.pl
index 9f70d3edc9..5fd886139a 100644
--- a/tp/t/results/html_tests/test_accents_sc_enable_encoding_usascii.pl
+++ b/tp/t/results/html_tests/test_accents_sc_enable_encoding_usascii.pl
@@ -1842,7 +1842,7 @@ 
$result_converted{'html_text'}->{'test_accents_sc_enable_encoding_usascii'} = '
 
 <p>&ndash;a&#774;
 &ndash;a&#770;
-&aring; &Aring; &ecirc; &Ecirc; &#297; i &#7771; &#341;&#780; 
&ntilde;&#807;&#772;.
+&aring; &Aring; &ecirc; &Ecirc; &#297; &inodot; &#7771; &#341;&#780; 
&ntilde;&#807;&#772;.
 &equiv;
 <small class="sc">&Aring; &Aring; &Ecirc; &Ecirc; &#296; I &#7770; 
&#340;&#780; &Ntilde;&#807;&#772;</small>.
 </p>
diff --git 
a/tp/t/results/html_tests/test_accents_sc_enable_encoding_usascii/res_html/node-chap.html
 
b/tp/t/results/html_tests/test_accents_sc_enable_encoding_usascii/res_html/node-chap.html
index 77ab4a68b9..f7469116c9 100644
--- 
a/tp/t/results/html_tests/test_accents_sc_enable_encoding_usascii/res_html/node-chap.html
+++ 
b/tp/t/results/html_tests/test_accents_sc_enable_encoding_usascii/res_html/node-chap.html
@@ -38,7 +38,7 @@ Previous: <a href="index.html" accesskey="p" rel="prev">top 
section</a>, Up: <a
 
 <p>&ndash;a&#774;
 &ndash;a&#770;
-&aring; &Aring; &ecirc; &Ecirc; &#297; i &#7771; &#341;&#780; 
&ntilde;&#807;&#772;.
+&aring; &Aring; &ecirc; &Ecirc; &#297; &inodot; &#7771; &#341;&#780; 
&ntilde;&#807;&#772;.
 &equiv;
 <small class="sc">&Aring; &Aring; &Ecirc; &Ecirc; &#296; I &#7770; 
&#340;&#780; &Ntilde;&#807;&#772;</small>.
 </p>
diff --git a/tp/t/results/html_tests/test_accents_sc_to_utf8_latin1.pl 
b/tp/t/results/html_tests/test_accents_sc_to_utf8_latin1.pl
index 61f5bad8e4..f3b7014e6b 100644
--- a/tp/t/results/html_tests/test_accents_sc_to_utf8_latin1.pl
+++ b/tp/t/results/html_tests/test_accents_sc_to_utf8_latin1.pl
@@ -1812,7 +1812,7 @@ 
$result_converted{'html_text'}->{'test_accents_sc_to_utf8_latin1'} = '
 
 <p>&ndash;a&#774;
 &ndash;a&#770;
-&aring; &Aring; &ecirc; &Ecirc; &#297; i &#7771; &#341;&#780; 
&ntilde;&#807;&#772;.
+&aring; &Aring; &ecirc; &Ecirc; &#297; &inodot; &#7771; &#341;&#780; 
&ntilde;&#807;&#772;.
 &equiv;
 <small class="sc">&Aring; &Aring; &Ecirc; &Ecirc; &#296; I &#7770; 
&#340;&#780; &Ntilde;&#807;&#772;</small>.
 </p>
diff --git 
a/tp/t/results/html_tests/test_accents_sc_to_utf8_latin1/res_html/node-chap.html
 
b/tp/t/results/html_tests/test_accents_sc_to_utf8_latin1/res_html/node-chap.html
index 3968992db1..cbc9407d15 100644
--- 
a/tp/t/results/html_tests/test_accents_sc_to_utf8_latin1/res_html/node-chap.html
+++ 
b/tp/t/results/html_tests/test_accents_sc_to_utf8_latin1/res_html/node-chap.html
@@ -38,7 +38,7 @@ Previous: <a href="index.html" accesskey="p" rel="prev">top 
section</a>, Up: <a
 
 <p>&ndash;a&#774;
 &ndash;a&#770;
-&aring; &Aring; &ecirc; &Ecirc; &#297; i &#7771; &#341;&#780; 
&ntilde;&#807;&#772;.
+&aring; &Aring; &ecirc; &Ecirc; &#297; &inodot; &#7771; &#341;&#780; 
&ntilde;&#807;&#772;.
 &equiv;
 <small class="sc">&Aring; &Aring; &Ecirc; &Ecirc; &#296; I &#7770; 
&#340;&#780; &Ntilde;&#807;&#772;</small>.
 </p>
diff --git a/tp/t/results/html_tests/test_accents_sc_use_numeric_entity.pl 
b/tp/t/results/html_tests/test_accents_sc_use_numeric_entity.pl
index 8ca797301f..792cd13664 100644
--- a/tp/t/results/html_tests/test_accents_sc_use_numeric_entity.pl
+++ b/tp/t/results/html_tests/test_accents_sc_use_numeric_entity.pl
@@ -1766,7 +1766,7 @@ 
$result_converted{'html_text'}->{'test_accents_sc_use_numeric_entity'} = '<div c
 
 <p>&#8211;a&#774;
 &#8211;a&#770;
-&#229; &#197; &#234; &#202; &#297; i &#7771; &#341;&#780; &#241;&#807;&#772;.
+&#229; &#197; &#234; &#202; &#297; &#305; &#7771; &#341;&#780; 
&#241;&#807;&#772;.
 &#8801;
 <small class="sc">&#197; &#197; &#202; &#202; &#296; I &#7770; &#340;&#780; 
&#209;&#807;&#772;</small>.
 </p>
diff --git 
a/tp/t/results/html_tests/test_accents_sc_use_numeric_entity/res_html/node-chap.html
 
b/tp/t/results/html_tests/test_accents_sc_use_numeric_entity/res_html/node-chap.html
index f5f9e45797..ba7dee0ef6 100644
--- 
a/tp/t/results/html_tests/test_accents_sc_use_numeric_entity/res_html/node-chap.html
+++ 
b/tp/t/results/html_tests/test_accents_sc_use_numeric_entity/res_html/node-chap.html
@@ -38,7 +38,7 @@ Previous: <a href="index.html" accesskey="p" rel="prev">top 
section</a>, Up: <a
 
 <p>&#8211;a&#774;
 &#8211;a&#770;
-&#229; &#197; &#234; &#202; &#297; i &#7771; &#341;&#780; &#241;&#807;&#772;.
+&#229; &#197; &#234; &#202; &#297; &#305; &#7771; &#341;&#780; 
&#241;&#807;&#772;.
 &#8801;
 <small class="sc">&#197; &#197; &#202; &#202; &#296; I &#7770; &#340;&#780; 
&#209;&#807;&#772;</small>.
 </p>
diff --git a/tp/t/results/indices/encoding_index_ascii/res_html/index.html 
b/tp/t/results/indices/encoding_index_ascii/res_html/index.html
index d55dd190c5..10e3073852 100644
--- a/tp/t/results/indices/encoding_index_ascii/res_html/index.html
+++ b/tp/t/results/indices/encoding_index_ascii/res_html/index.html
@@ -231,7 +231,7 @@ th.sections-header-printindex {text-align:left}
 <tr><td colspan="4"> <hr></td></tr>
 <tr><th id="Top_cp_letter-I">I</th><td></td><td></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-i">i</a>:</td><td>&nbsp;</td><td 
class="printindex-index-section"><a href="#Top">Top</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="#index-i-i-_0028dotless_0029">i i (dotless)</a>:</td><td>&nbsp;</td><td 
class="printindex-index-section"><a href="#Top">Top</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-i-i-_0028dotless_0029">&inodot; &inodot; 
(dotless)</a>:</td><td>&nbsp;</td><td class="printindex-index-section"><a 
href="#Top">Top</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-i-iii">&iuml; 
&iuml;&iuml;&iuml;</a>:</td><td>&nbsp;</td><td 
class="printindex-index-section"><a href="#Top">Top</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-i-i-_0028dotless_0029-1">&icirc; &icirc; 
(dotless)</a>:</td><td>&nbsp;</td><td class="printindex-index-section"><a 
href="#Top">Top</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-i-iiii">&icirc; 
&icirc;&icirc;&icirc;&icirc;</a>:</td><td>&nbsp;</td><td 
class="printindex-index-section"><a href="#Top">Top</a></td></tr>
diff --git 
a/tp/t/results/indices/encoding_index_ascii_enable_encoding/res_html/index.html 
b/tp/t/results/indices/encoding_index_ascii_enable_encoding/res_html/index.html
index d55dd190c5..10e3073852 100644
--- 
a/tp/t/results/indices/encoding_index_ascii_enable_encoding/res_html/index.html
+++ 
b/tp/t/results/indices/encoding_index_ascii_enable_encoding/res_html/index.html
@@ -231,7 +231,7 @@ th.sections-header-printindex {text-align:left}
 <tr><td colspan="4"> <hr></td></tr>
 <tr><th id="Top_cp_letter-I">I</th><td></td><td></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-i">i</a>:</td><td>&nbsp;</td><td 
class="printindex-index-section"><a href="#Top">Top</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="#index-i-i-_0028dotless_0029">i i (dotless)</a>:</td><td>&nbsp;</td><td 
class="printindex-index-section"><a href="#Top">Top</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-i-i-_0028dotless_0029">&inodot; &inodot; 
(dotless)</a>:</td><td>&nbsp;</td><td class="printindex-index-section"><a 
href="#Top">Top</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-i-iii">&iuml; 
&iuml;&iuml;&iuml;</a>:</td><td>&nbsp;</td><td 
class="printindex-index-section"><a href="#Top">Top</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-i-i-_0028dotless_0029-1">&icirc; &icirc; 
(dotless)</a>:</td><td>&nbsp;</td><td class="printindex-index-section"><a 
href="#Top">Top</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-i-iiii">&icirc; 
&icirc;&icirc;&icirc;&icirc;</a>:</td><td>&nbsp;</td><td 
class="printindex-index-section"><a href="#Top">Top</a></td></tr>
diff --git a/tp/t/results/indices/encoding_index_latin1/res_html/index.html 
b/tp/t/results/indices/encoding_index_latin1/res_html/index.html
index 8a7ab191fc..cb93f7aae8 100644
--- a/tp/t/results/indices/encoding_index_latin1/res_html/index.html
+++ b/tp/t/results/indices/encoding_index_latin1/res_html/index.html
@@ -232,7 +232,7 @@ th.sections-header-printindex {text-align:left}
 <tr><td colspan="4"> <hr></td></tr>
 <tr><th id="Top_cp_letter-I">I</th><td></td><td></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-i">i</a>:</td><td>&nbsp;</td><td 
class="printindex-index-section"><a href="#Top">Top</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="#index-i-i-_0028dotless_0029">i i (dotless)</a>:</td><td>&nbsp;</td><td 
class="printindex-index-section"><a href="#Top">Top</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-i-i-_0028dotless_0029">&inodot; &inodot; 
(dotless)</a>:</td><td>&nbsp;</td><td class="printindex-index-section"><a 
href="#Top">Top</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-i-iii">&iuml; 
&iuml;&iuml;&iuml;</a>:</td><td>&nbsp;</td><td 
class="printindex-index-section"><a href="#Top">Top</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-i-i-_0028dotless_0029-1">&icirc; &icirc; 
(dotless)</a>:</td><td>&nbsp;</td><td class="printindex-index-section"><a 
href="#Top">Top</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-i-iiii">&icirc; 
&icirc;&icirc;&icirc;&icirc;</a>:</td><td>&nbsp;</td><td 
class="printindex-index-section"><a href="#Top">Top</a></td></tr>
diff --git 
a/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_html/index.html
 
b/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_html/index.html
index 9f88f8a955..605ad34674 100644
--- 
a/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_html/index.html
+++ 
b/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_html/index.html
@@ -247,7 +247,7 @@ th.sections-header-printindex {text-align:left}
 <tr><td colspan="4"> <hr></td></tr>
 <tr><th id="Top_cp_letter-I">I</th><td></td><td></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-i">i</a>:</td><td>�</td><td class="printindex-index-section"><a 
href="#Top">Top</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="#index-i-i-_0028dotless_0029">i i (dotless)</a>:</td><td>�</td><td 
class="printindex-index-section"><a href="#Top">Top</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-i-i-_0028dotless_0029">&inodot; &inodot; 
(dotless)</a>:</td><td>�</td><td class="printindex-index-section"><a 
href="#Top">Top</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
 <tr><th id="Top_cp_letter-J">J</th><td></td><td></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-j">j</a>:</td><td>�</td><td class="printindex-index-section"><a 
href="#Top">Top</a></td></tr>
diff --git a/tp/t/results/indices/encoding_index_utf8/res_html/index.html 
b/tp/t/results/indices/encoding_index_utf8/res_html/index.html
index 54e98404a5..1b2fe3947d 100644
--- a/tp/t/results/indices/encoding_index_utf8/res_html/index.html
+++ b/tp/t/results/indices/encoding_index_utf8/res_html/index.html
@@ -232,7 +232,7 @@ th.sections-header-printindex {text-align:left}
 <tr><td colspan="4"> <hr></td></tr>
 <tr><th id="Top_cp_letter-I">I</th><td></td><td></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-i">i</a>:</td><td>&nbsp;</td><td 
class="printindex-index-section"><a href="#Top">Top</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="#index-i-i-_0028dotless_0029">i i (dotless)</a>:</td><td>&nbsp;</td><td 
class="printindex-index-section"><a href="#Top">Top</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-i-i-_0028dotless_0029">&inodot; &inodot; 
(dotless)</a>:</td><td>&nbsp;</td><td class="printindex-index-section"><a 
href="#Top">Top</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-i-iii">&iuml; 
&iuml;&iuml;&iuml;</a>:</td><td>&nbsp;</td><td 
class="printindex-index-section"><a href="#Top">Top</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-i-i-_0028dotless_0029-1">&icirc; &icirc; 
(dotless)</a>:</td><td>&nbsp;</td><td class="printindex-index-section"><a 
href="#Top">Top</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-i-iiii">&icirc; 
&icirc;&icirc;&icirc;&icirc;</a>:</td><td>&nbsp;</td><td 
class="printindex-index-section"><a href="#Top">Top</a></td></tr>
diff --git a/tp/t/results/paragraph/paragraph_command.pl 
b/tp/t/results/paragraph/paragraph_command.pl
index e366de4039..25a6938e44 100644
--- a/tp/t/results/paragraph/paragraph_command.pl
+++ b/tp/t/results/paragraph/paragraph_command.pl
@@ -437,7 +437,7 @@ $result_converted{'html_text'}->{'paragraph_command'} = 
'<p>@
 </p>
 <p><b class="b">aaa</b>.
 </p>
-<p>i also dotless i.
+<p>&inodot; also dotless i.
 </p>
 <p>&#x0075; also U+0075.
 </p>
diff --git a/tp/tests/layout/res_parser/formatting/formatting.html 
b/tp/tests/layout/res_parser/formatting/formatting.html
index df03a34a34..bcb61c617b 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/tp/tests/layout/res_parser/formatting/formatting.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
@@ -923,8 +923,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -1102,7 +1102,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -2001,8 +2001,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -2180,7 +2180,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -3135,8 +3135,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -3314,7 +3314,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -4211,8 +4211,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -4390,7 +4390,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -5291,8 +5291,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @`i &igrave;
 @'{e} &eacute;
 @'{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @`{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@'C} &#262;&#807;
@@ -5479,7 +5479,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 
 </em></div><pre class="example-preformatted">
 
-</pre><div class="displaymath"><em>i j
+</pre><div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
diff --git a/tp/tests/layout/res_parser/formatting_chm/anchor.html 
b/tp/tests/layout/res_parser/formatting_chm/anchor.html
index 1a2ff54af2..1e74500169 100644
--- a/tp/tests/layout/res_parser/formatting_chm/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_chm/anchor.html
@@ -38,7 +38,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -221,7 +221,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter.html 
b/tp/tests/layout/res_parser/formatting_chm/chapter.html
index 5591fd4f4a..2a46991938 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
@@ -919,8 +919,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -1098,7 +1098,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -1995,8 +1995,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -2174,7 +2174,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -3075,8 +3075,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @`i &igrave;
 @'{e} &eacute;
 @'{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @`{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@'C} &#262;&#807;
@@ -3263,7 +3263,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 
 </em></div><pre class="example-preformatted">
 
-</pre><div class="displaymath"><em>i j
+</pre><div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter2.html 
b/tp/tests/layout/res_parser/formatting_chm/chapter2.html
index 28de25fb3d..a44c5e8986 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter2.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.html 
b/tp/tests/layout/res_parser/formatting_chm/formatting.html
index ec7e0e029e..ec3cb24132 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
@@ -907,8 +907,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -1086,7 +1086,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -1985,8 +1985,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -2164,7 +2164,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html 
b/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
index e15650ed9d..55faec3ba0 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html 
b/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
index a0dfaf9b24..c3eccf2c51 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html 
b/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
index 14cffde306..604b31e42d 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git a/tp/tests/layout/res_parser/formatting_chm/index.html 
b/tp/tests/layout/res_parser/formatting_chm/index.html
index 435ceb251d..25647296c7 100644
--- a/tp/tests/layout/res_parser/formatting_chm/index.html
+++ b/tp/tests/layout/res_parser/formatting_chm/index.html
@@ -38,7 +38,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -221,7 +221,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git 
a/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html 
b/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html
index 1c84940061..130cc966d5 100644
--- a/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html
+++ b/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git a/tp/tests/layout/res_parser/formatting_chm/subsection.html 
b/tp/tests/layout/res_parser/formatting_chm/subsection.html
index 6d526b051f..c8cd0249d0 100644
--- a/tp/tests/layout/res_parser/formatting_chm/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_chm/subsection.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git 
a/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
 
b/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index 91d8234126..34f095378a 100644
--- 
a/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++ 
b/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git 
a/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
 
b/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index b0c23bd1df..07f5b57bd5 100644
--- 
a/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++ 
b/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml 
b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
index 2116f4508f..5eaf15ccfb 100644
--- a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
@@ -53,8 +53,8 @@ kbd: 
<userinput>``simple-double--three---four----''</userinput>
 @&#8216;i &#236;
 @&#8217;{e} &#233;
 @&#8217;{@dotless{i}} &#237; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &#305;
+@dotless{j} &#567;
 @&#8216;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&#8217;C} &#262;&#807;
@@ -239,7 +239,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1 \over 
2}\left({x-\mu \over
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </mathphrase></informalequation>
-<informalequation><mathphrase>i j
+<informalequation><mathphrase>&#305; &#567;
 &#322; &#231;
 a&#818; &#7841; &#261; a<superscript>h</superscript><subscript>l</subscript>
 
@@ -969,8 +969,8 @@ kbd: 
<userinput>``simple-double--three---four----''</userinput>
 @&#8216;i &#236;
 @&#8217;{e} &#233;
 @&#8217;{@dotless{i}} &#237; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &#305;
+@dotless{j} &#567;
 @&#8216;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&#8217;C} &#262;&#807;
@@ -1155,7 +1155,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1 
\over 2}\left({x-\mu \over
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </mathphrase></informalequation>
-<informalequation><mathphrase>i j
+<informalequation><mathphrase>&#305; &#567;
 &#322; &#231;
 a&#818; &#7841; &#261; a<superscript>h</superscript><subscript>l</subscript>
 
@@ -1872,8 +1872,8 @@ kbd: 
<userinput>``simple-double--three---four----''</userinput>
 @&#8216;i &#236;
 @&#8217;{e} &#233;
 @&#8217;{@dotless{i}} &#237; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &#305;
+@dotless{j} &#567;
 @&#8216;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&#8217;C} &#262;&#807;
@@ -2058,7 +2058,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1 
\over 2}\left({x-\mu \over
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </mathphrase></informalequation>
-<informalequation><mathphrase>i j
+<informalequation><mathphrase>&#305; &#567;
 &#322; &#231;
 a&#818; &#7841; &#261; a<superscript>h</superscript><subscript>l</subscript>
 
@@ -2771,8 +2771,8 @@ kbd: 
<userinput>``simple-double--three---four----''</userinput>
 @`i &#236;
 @'{e} &#233;
 @'{@dotless{i}} &#237; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &#305;
+@dotless{j} &#567;
 @`{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@'C} &#262;&#807;
@@ -2957,7 +2957,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1 
\over 2}\left({x-\mu \over
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </mathphrase></informalequation><screen>
-</screen><informalequation><mathphrase>i j
+</screen><informalequation><mathphrase>&#305; &#567;
 &#322; &#231;
 a&#818; &#7841; &#261; a<superscript>h</superscript><subscript>l</subscript>
 
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 b6d8c62457..73ba5512e4 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
@@ -924,7 +924,7 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @’{e} é
 @’{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @‘{@=E} Ḕ 
 @l{} ł
 @,{@’C} Ḉ
@@ -1102,7 +1102,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>ı j
+<div class="displaymath"><em>ı ȷ
 ł ç
 a̲ ạ ą a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -2002,7 +2002,7 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @’{e} é
 @’{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @‘{@=E} Ḕ 
 @l{} ł
 @,{@’C} Ḉ
@@ -2180,7 +2180,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>ı j
+<div class="displaymath"><em>ı ȷ
 ł ç
 a̲ ạ ą a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -3136,7 +3136,7 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @’{e} é
 @’{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @‘{@=E} Ḕ 
 @l{} ł
 @,{@’C} Ḉ
@@ -3314,7 +3314,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>ı j
+<div class="displaymath"><em>ı ȷ
 ł ç
 a̲ ạ ą a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -4212,7 +4212,7 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @’{e} é
 @’{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @‘{@=E} Ḕ 
 @l{} ł
 @,{@’C} Ḉ
@@ -4390,7 +4390,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>ı j
+<div class="displaymath"><em>ı ȷ
 ł ç
 a̲ ạ ą a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -5292,7 +5292,7 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -5479,7 +5479,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 
 </em></div><pre class="example-preformatted">
 
-</pre><div class="displaymath"><em>ı j
+</pre><div class="displaymath"><em>ı ȷ
 ł ç
 a̲ ạ ą a<sup class="sup">h</sup><sub class="sub">l</sub>
 
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
index 5cf4083239..48e42a8942 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
@@ -38,7 +38,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -221,7 +221,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
@@ -919,8 +919,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&#8216;i &#236;
 @&#8217;{e} &#233;
 @&#8217;{@dotless{i}} &#237; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &#305;
+@dotless{j} &#567;
 @&#8216;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&#8217;C} &#262;&#807;
@@ -1098,7 +1098,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&#305; &#567;
 &#322; &#231;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -1995,8 +1995,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&#8216;i &#236;
 @&#8217;{e} &#233;
 @&#8217;{@dotless{i}} &#237; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &#305;
+@dotless{j} &#567;
 @&#8216;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&#8217;C} &#262;&#807;
@@ -2174,7 +2174,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&#305; &#567;
 &#322; &#231;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -3075,8 +3075,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @`i &#236;
 @'{e} &#233;
 @'{@dotless{i}} &#237; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &#305;
+@dotless{j} &#567;
 @`{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@'C} &#262;&#807;
@@ -3263,7 +3263,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 
 </em></div><pre class="example-preformatted">
 
-</pre><div class="displaymath"><em>i j
+</pre><div class="displaymath"><em>&#305; &#567;
 &#322; &#231;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
index db976a8c68..033d7f3c47 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
@@ -38,7 +38,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -221,7 +221,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
index 8c6e96b3b7..8fef15c318 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
@@ -38,7 +38,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -221,7 +221,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
@@ -906,8 +906,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&#8216;i &#236;
 @&#8217;{e} &#233;
 @&#8217;{@dotless{i}} &#237; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &#305;
+@dotless{j} &#567;
 @&#8216;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&#8217;C} &#262;&#807;
@@ -1085,7 +1085,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&#305; &#567;
 &#322; &#231;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -1984,8 +1984,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&#8216;i &#236;
 @&#8217;{e} &#233;
 @&#8217;{@dotless{i}} &#237; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &#305;
+@dotless{j} &#567;
 @&#8216;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&#8217;C} &#262;&#807;
@@ -2163,7 +2163,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&#305; &#567;
 &#322; &#231;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
index 62861f8625..65409fba45 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
@@ -38,7 +38,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -221,7 +221,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
index 7b456b9752..8a6fe4982f 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
@@ -38,7 +38,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -221,7 +221,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
index 0bbdacfc49..d9bdb27606 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
@@ -38,7 +38,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -221,7 +221,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
index db617cef2b..63c6821e6a 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
@@ -38,7 +38,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -221,7 +221,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
index 6ea9ca4469..777ce0f119 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
@@ -38,7 +38,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -221,7 +221,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
@@ -920,8 +920,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&#8216;i &#236;
 @&#8217;{e} &#233;
 @&#8217;{@dotless{i}} &#237; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &#305;
+@dotless{j} &#567;
 @&#8216;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&#8217;C} &#262;&#807;
@@ -1099,7 +1099,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&#305; &#567;
 &#322; &#231;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -1996,8 +1996,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&#8216;i &#236;
 @&#8217;{e} &#233;
 @&#8217;{@dotless{i}} &#237; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &#305;
+@dotless{j} &#567;
 @&#8216;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&#8217;C} &#262;&#807;
@@ -2175,7 +2175,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&#305; &#567;
 &#322; &#231;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -3076,8 +3076,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @`i &#236;
 @'{e} &#233;
 @'{@dotless{i}} &#237; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &#305;
+@dotless{j} &#567;
 @`{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@'C} &#262;&#807;
@@ -3264,7 +3264,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 
 </em></div><pre class="example-preformatted">
 
-</pre><div class="displaymath"><em>i j
+</pre><div class="displaymath"><em>&#305; &#567;
 &#322; &#231;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
index 2475c8fa47..dc2cdd078d 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
@@ -38,7 +38,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -221,7 +221,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
index 4122d32da4..66e08677d9 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
@@ -38,7 +38,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -221,7 +221,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
@@ -908,8 +908,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&#8216;i &#236;
 @&#8217;{e} &#233;
 @&#8217;{@dotless{i}} &#237; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &#305;
+@dotless{j} &#567;
 @&#8216;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&#8217;C} &#262;&#807;
@@ -1087,7 +1087,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&#305; &#567;
 &#322; &#231;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -1986,8 +1986,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&#8216;i &#236;
 @&#8217;{e} &#233;
 @&#8217;{@dotless{i}} &#237; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &#305;
+@dotless{j} &#567;
 @&#8216;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&#8217;C} &#262;&#807;
@@ -2165,7 +2165,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&#305; &#567;
 &#322; &#231;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
index 6fba7c8c72..9e770967cc 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
@@ -38,7 +38,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -221,7 +221,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
index 578fe58ed5..31616f3a2b 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
@@ -38,7 +38,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -221,7 +221,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
index 19a981ab40..f606f90084 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
@@ -38,7 +38,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -221,7 +221,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
index 9492da6251..b5fa1cbf07 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
@@ -38,7 +38,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -221,7 +221,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml
index 975588a09e..c3f8fb3b5e 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml
@@ -38,7 +38,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -221,7 +221,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml
index 8b1be1d2bf..09040c8890 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml
@@ -38,7 +38,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -221,7 +221,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml
index 4768ac6166..3a2b88c932 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml
@@ -38,7 +38,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -221,7 +221,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml
index b37cf704ce..3216d42b99 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml
@@ -38,7 +38,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -221,7 +221,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git a/tp/tests/layout/res_parser/formatting_exotic/anchor.html 
b/tp/tests/layout/res_parser/formatting_exotic/anchor.html
index 049fd366fa..c9e75360cb 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/anchor.html
@@ -38,7 +38,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -221,7 +221,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter.html 
b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
index 38e8e2ef9e..923c5d10eb 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
@@ -938,8 +938,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -1117,7 +1117,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -2014,8 +2014,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -2193,7 +2193,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -3094,8 +3094,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @`i &igrave;
 @'{e} &eacute;
 @'{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @`{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@'C} &#262;&#807;
@@ -3282,7 +3282,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 
 </em></div><pre class="example-preformatted">
 
-</pre><div class="displaymath"><em>i j
+</pre><div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter2.html 
b/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
index 21c78678a0..5731cf1fa3 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git a/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html 
b/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
index 506bfa9fdc..dc44d11845 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git a/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html 
b/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
index c60adf184f..71ab68a9d5 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git a/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html 
b/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
index 1957e8bb32..c2ea43edfb 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git a/tp/tests/layout/res_parser/formatting_exotic/index.html 
b/tp/tests/layout/res_parser/formatting_exotic/index.html
index d25daec257..7575d664c3 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/index.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/index.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git 
a/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html 
b/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html
index 0709b5bf9b..06fc8de2a7 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git a/tp/tests/layout/res_parser/formatting_exotic/subsection.html 
b/tp/tests/layout/res_parser/formatting_exotic/subsection.html
index d2e61c21e1..dd795e3cf1 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/subsection.html
@@ -38,7 +38,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -221,7 +221,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git 
a/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
 
b/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index 5eee8d3205..f9d64cd0e3 100644
--- 
a/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++ 
b/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -38,7 +38,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -221,7 +221,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git 
a/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
 
b/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index fb9aa8dfd3..f5c64ed3f7 100644
--- 
a/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++ 
b/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -38,7 +38,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -221,7 +221,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
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 13d8dc38bd..8c6badd457 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
@@ -923,8 +923,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -1102,7 +1102,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -2001,8 +2001,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -2180,7 +2180,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -3135,8 +3135,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -3314,7 +3314,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -4211,8 +4211,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -4390,7 +4390,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -5291,8 +5291,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @`i &igrave;
 @'{e} &eacute;
 @'{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @`{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@'C} &#262;&#807;
@@ -5479,7 +5479,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 
 </em></div><pre class="example-preformatted">
 
-</pre><div class="displaymath"><em>i j
+</pre><div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
diff --git a/tp/tests/layout/res_parser/formatting_html/formatting.html 
b/tp/tests/layout/res_parser/formatting_html/formatting.html
index df03a34a34..bcb61c617b 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
@@ -923,8 +923,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -1102,7 +1102,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -2001,8 +2001,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -2180,7 +2180,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -3135,8 +3135,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -3314,7 +3314,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -4211,8 +4211,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -4390,7 +4390,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -5291,8 +5291,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @`i &igrave;
 @'{e} &eacute;
 @'{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @`{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@'C} &#262;&#807;
@@ -5479,7 +5479,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 
 </em></div><pre class="example-preformatted">
 
-</pre><div class="displaymath"><em>i j
+</pre><div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
diff --git a/tp/tests/layout/res_parser/formatting_html32/formatting.html 
b/tp/tests/layout/res_parser/formatting_html32/formatting.html
index 48bb607934..6fc0083ef1 100644
--- a/tp/tests/layout/res_parser/formatting_html32/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html32/formatting.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
@@ -885,8 +885,8 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @`i &igrave;
 @'{e} &eacute;
 @'{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @`{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@'C} &#262;&#807;
@@ -1064,7 +1064,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup>-{1 \over 
2}\left({x-\mu \over \sigma}\
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div><em>i j
+<div><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup>h</sup><sub>l</sub>
 
@@ -1937,8 +1937,8 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @`i &igrave;
 @'{e} &eacute;
 @'{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @`{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@'C} &#262;&#807;
@@ -2116,7 +2116,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup>-{1 \over 
2}\left({x-\mu \over \sigma}\
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div><em>i j
+<div><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup>h</sup><sub>l</sub>
 
@@ -3045,8 +3045,8 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @`i &igrave;
 @'{e} &eacute;
 @'{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @`{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@'C} &#262;&#807;
@@ -3224,7 +3224,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup>-{1 \over 
2}\left({x-\mu \over \sigma}\
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div><em>i j
+<div><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup>h</sup><sub>l</sub>
 
@@ -4095,8 +4095,8 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
 @`i &igrave;
 @'{e} &eacute;
 @'{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @`{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@'C} &#262;&#807;
@@ -4274,7 +4274,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup>-{1 \over 
2}\left({x-\mu \over \sigma}\
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div><em>i j
+<div><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup>h</sup><sub>l</sub>
 
@@ -5148,8 +5148,8 @@ kbd: <kbd>``simple-double--three---four----''</kbd>
 @`i &igrave;
 @'{e} &eacute;
 @'{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @`{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@'C} &#262;&#807;
@@ -5336,7 +5336,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup>-{1 \over 
2}\left({x-\mu \over \sigma}\
 
 </em></div><pre>
 
-</pre><div><em>i j
+</pre><div><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup>h</sup><sub>l</sub>
 
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 73f26b56ac..fa1574e044 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
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
@@ -977,8 +977,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -1156,7 +1156,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -2053,8 +2053,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -2232,7 +2232,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -3133,8 +3133,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @`i &igrave;
 @'{e} &eacute;
 @'{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @`{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@'C} &#262;&#807;
@@ -3321,7 +3321,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 
 </em></div><pre class="example-preformatted">
 
-</pre><div class="displaymath"><em>i j
+</pre><div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
index 1a2ff54af2..1e74500169 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
@@ -38,7 +38,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -221,7 +221,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
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 c96faaf827..6e9025bbcf 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
@@ -939,8 +939,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -1118,7 +1118,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -2015,8 +2015,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -2194,7 +2194,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -3095,8 +3095,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @`i &igrave;
 @'{e} &eacute;
 @'{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @`{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@'C} &#262;&#807;
@@ -3283,7 +3283,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 
 </em></div><pre class="example-preformatted">
 
-</pre><div class="displaymath"><em>i j
+</pre><div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
index 129bc34299..9db4d6a75d 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git 
a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html
index e8363c62de..f5846e4efc 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git 
a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
index 81aad951c1..692e9f8e8c 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git 
a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html
index f6ea471449..74cb814557 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git 
a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html
index 51a158f254..da140c80ac 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
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 2d89ec3914..ac7f6a9216 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
@@ -912,8 +912,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -1091,7 +1091,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -1990,8 +1990,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -2169,7 +2169,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
diff --git 
a/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
index 4197cf0e34..8a64ebff8c 100644
--- 
a/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
+++ 
b/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
index 14aae81341..023d65b4e6 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git 
a/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
 
b/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index e612e24fc5..512e4afc8b 100644
--- 
a/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++ 
b/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git 
a/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
 
b/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index e8e99d1064..9ac3cc7d29 100644
--- 
a/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++ 
b/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git a/tp/tests/layout/res_parser/formatting_info/formatting.info 
b/tp/tests/layout/res_parser/formatting_info/formatting.info
index ca697fa7f4..970d0b8aad 100644
--- a/tp/tests/layout/res_parser/formatting_info/formatting.info
+++ b/tp/tests/layout/res_parser/formatting_info/formatting.info
@@ -14,7 +14,7 @@ kbd: '``simple-double--three---four----'''
    ''simple-double--three--four---''
 
    @"u ü @"{U} Ü @~n ñ @^a â @'e é @=o ō @'i ì @'{e} é @'{@dotless{i}} í
-@dotless{i} ı @dotless{j} j @'{@=E} Ḕ @l{} ł @,{@'C} Ḉ @,c ç @,c@"u çü
+@dotless{i} ı @dotless{j} ȷ @'{@=E} Ḕ @l{} ł @,{@'C} Ḉ @,c ç @,c@"u çü
 
    @U{0075} u
 
@@ -84,7 +84,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 
2}\left({x-\mu \over \sigma}\rig
 ``simple-double--three---four----''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą a^{h}_{l}
 
@@ -724,7 +724,7 @@ kbd: '``simple-double--three---four----'''
    ''simple-double--three--four---''
 
    @"u ü @"{U} Ü @~n ñ @^a â @'e é @=o ō @'i ì @'{e} é @'{@dotless{i}} í
-@dotless{i} ı @dotless{j} j @'{@=E} Ḕ @l{} ł @,{@'C} Ḉ @,c ç @,c@"u çü
+@dotless{i} ı @dotless{j} ȷ @'{@=E} Ḕ @l{} ł @,{@'C} Ḉ @,c ç @,c@"u çü
 
    @U{0075} u
 
@@ -794,7 +794,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 
2}\left({x-\mu \over \sigma}\rig
 ``simple-double--three---four----''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą a^{h}_{l}
 
@@ -1391,7 +1391,7 @@ kbd: '``simple-double--three---four----'''
    ''simple-double--three--four---''
 
    @"u ü @"{U} Ü @~n ñ @^a â @'e é @=o ō @'i ì @'{e} é @'{@dotless{i}} í
-@dotless{i} ı @dotless{j} j @'{@=E} Ḕ @l{} ł @,{@'C} Ḉ @,c ç @,c@"u çü
+@dotless{i} ı @dotless{j} ȷ @'{@=E} Ḕ @l{} ł @,{@'C} Ḉ @,c ç @,c@"u çü
 
    @U{0075} u
 
@@ -1461,7 +1461,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 
2}\left({x-\mu \over \sigma}\rig
 ``simple-double--three---four----''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą a^{h}_{l}
 
@@ -2079,7 +2079,7 @@ cross ref name: (file name). '@inforef{}' *note ::
      @'{e} é
      @'{@dotless{i}} í
      @dotless{i} ı
-     @dotless{j} j
+     @dotless{j} ȷ
      @`{@=E} Ḕ
      @l{} ł
      @,{@'C} Ḉ
@@ -2263,7 +2263,7 @@ cross ref name: (file name). '@inforef{}' *note ::
      ``simple-double--three---four----''
 
 
-     ı j
+     ı ȷ
      ł ç
      a̲ ạ ą a^{h}_{l}
 
@@ -3574,22 +3574,22 @@ chapter 2
 
 
 Tag Table:
-Node: Top18465
-Node: chapter18650
-Ref: chapter-Footnote-196757
-Ref: chapter-Footnote-296777
-Ref: chapter-Footnote-396798
-Ref: chapter-Footnote-496818
-Ref: chapter-Footnote-596839
-Ref: chapter-Footnote-696859
-Ref: chapter-Footnote-796880
-Ref: chapter-Footnote-896918
-Node: s--ect,ion96938
-Node: subsection97141
-Ref: anchor97322
-Node: subsubsection ``simple-double--97322
-Node: subsubsection three---four----''97522
-Node: chapter297694
+Node: Top18467
+Node: chapter18652
+Ref: chapter-Footnote-196765
+Ref: chapter-Footnote-296785
+Ref: chapter-Footnote-396806
+Ref: chapter-Footnote-496826
+Ref: chapter-Footnote-596847
+Ref: chapter-Footnote-696867
+Ref: chapter-Footnote-796888
+Ref: chapter-Footnote-896926
+Node: s--ect,ion96946
+Node: subsection97149
+Ref: anchor97330
+Node: subsubsection ``simple-double--97330
+Node: subsubsection three---four----''97530
+Node: chapter297702
 
 End Tag Table
 
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 59c75ba658..86823c5be2 100644
--- a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
@@ -885,8 +885,8 @@ kbd: <kbd class="kbd" style="font-style: 
oblique">``simple-double--three---four-
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -1064,7 +1064,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -1963,8 +1963,8 @@ kbd: <kbd class="kbd" style="font-style: 
oblique">``simple-double--three---four-
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -2142,7 +2142,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -3097,8 +3097,8 @@ kbd: <kbd class="kbd" style="font-style: 
oblique">``simple-double--three---four-
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -3276,7 +3276,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -4173,8 +4173,8 @@ kbd: <kbd class="kbd" style="font-style: 
oblique">``simple-double--three---four-
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -4352,7 +4352,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -5253,8 +5253,8 @@ kbd: <kbd class="kbd" style="font-style: 
oblique">``simple-double--three---four-
 @`i &igrave;
 @'{e} &eacute;
 @'{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @`{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@'C} &#262;&#807;
@@ -5441,7 +5441,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 
 </em></div><pre class="example-preformatted">
 
-</pre><div class="displaymath"><em>i j
+</pre><div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html 
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
index cea2b9cf4d..fc4d85a79d 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
@@ -933,8 +933,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -2009,8 +2009,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -3141,8 +3141,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -4215,8 +4215,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -5293,8 +5293,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @`i &igrave;
 @'{e} &eacute;
 @'{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @`{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@'C} &#262;&#807;
diff --git a/tp/tests/layout/res_parser/formatting_nodes/anchor.html 
b/tp/tests/layout/res_parser/formatting_nodes/anchor.html
index 1a2ff54af2..1e74500169 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/anchor.html
@@ -38,7 +38,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -221,7 +221,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter.html 
b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
index c96faaf827..6e9025bbcf 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
@@ -939,8 +939,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -1118,7 +1118,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -2015,8 +2015,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -2194,7 +2194,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -3095,8 +3095,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @`i &igrave;
 @'{e} &eacute;
 @'{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @`{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@'C} &#262;&#807;
@@ -3283,7 +3283,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 
 </em></div><pre class="example-preformatted">
 
-</pre><div class="displaymath"><em>i j
+</pre><div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter2.html 
b/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
index 129bc34299..9db4d6a75d 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git a/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html 
b/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
index e8363c62de..f5846e4efc 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git a/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html 
b/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
index 81aad951c1..692e9f8e8c 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git a/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html 
b/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
index f6ea471449..74cb814557 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git a/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html 
b/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
index 51a158f254..da140c80ac 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git a/tp/tests/layout/res_parser/formatting_nodes/index.html 
b/tp/tests/layout/res_parser/formatting_nodes/index.html
index 2d89ec3914..ac7f6a9216 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/index.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
@@ -912,8 +912,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -1091,7 +1091,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -1990,8 +1990,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -2169,7 +2169,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
diff --git 
a/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html 
b/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html
index 4197cf0e34..8a64ebff8c 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git a/tp/tests/layout/res_parser/formatting_nodes/subsection.html 
b/tp/tests/layout/res_parser/formatting_nodes/subsection.html
index 14aae81341..023d65b4e6 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/subsection.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git 
a/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
 
b/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index e612e24fc5..512e4afc8b 100644
--- 
a/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++ 
b/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git 
a/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
 
b/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index e8e99d1064..9ac3cc7d29 100644
--- 
a/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++ 
b/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
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 f0c4d4f744..9be2997204 100644
--- a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
@@ -923,8 +923,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&#8216;i &#236;
 @&#8217;{e} &#233;
 @&#8217;{@dotless{i}} &#237; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &#305;
+@dotless{j} &#567;
 @&#8216;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&#8217;C} &#262;&#807;
@@ -1102,7 +1102,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&#305; &#567;
 &#322; &#231;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -2001,8 +2001,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&#8216;i &#236;
 @&#8217;{e} &#233;
 @&#8217;{@dotless{i}} &#237; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &#305;
+@dotless{j} &#567;
 @&#8216;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&#8217;C} &#262;&#807;
@@ -2180,7 +2180,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&#305; &#567;
 &#322; &#231;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -3135,8 +3135,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&#8216;i &#236;
 @&#8217;{e} &#233;
 @&#8217;{@dotless{i}} &#237; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &#305;
+@dotless{j} &#567;
 @&#8216;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&#8217;C} &#262;&#807;
@@ -3314,7 +3314,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&#305; &#567;
 &#322; &#231;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -4211,8 +4211,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&#8216;i &#236;
 @&#8217;{e} &#233;
 @&#8217;{@dotless{i}} &#237; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &#305;
+@dotless{j} &#567;
 @&#8216;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&#8217;C} &#262;&#807;
@@ -4390,7 +4390,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&#305; &#567;
 &#322; &#231;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -5291,8 +5291,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @`i &#236;
 @'{e} &#233;
 @'{@dotless{i}} &#237; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &#305;
+@dotless{j} &#567;
 @`{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@'C} &#262;&#807;
@@ -5479,7 +5479,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 
 </em></div><pre class="example-preformatted">
 
-</pre><div class="displaymath"><em>i j
+</pre><div class="displaymath"><em>&#305; &#567;
 &#322; &#231;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
diff --git a/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt 
b/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
index bb6cbbaef5..c2dba8aa34 100644
--- a/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
+++ b/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
@@ -27,7 +27,7 @@ kbd: '``simple-double--three---four----'''
    ''simple-double--three--four---''
 
    @"u ü @"{U} Ü @~n ñ @^a â @'e é @=o ō @'i ì @'{e} é @'{@dotless{i}} í
-@dotless{i} ı @dotless{j} j @'{@=E} Ḕ @l{} ł @,{@'C} Ḉ @,c ç @,c@"u çü
+@dotless{i} ı @dotless{j} ȷ @'{@=E} Ḕ @l{} ł @,{@'C} Ḉ @,c ç @,c@"u çü
 
    @U{0075} u
 
@@ -97,7 +97,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 
2}\left({x-\mu \over \sigma}\rig
 ``simple-double--three---four----''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą a^{h}_{l}
 
@@ -694,7 +694,7 @@ kbd: '``simple-double--three---four----'''
    ''simple-double--three--four---''
 
    @"u ü @"{U} Ü @~n ñ @^a â @'e é @=o ō @'i ì @'{e} é @'{@dotless{i}} í
-@dotless{i} ı @dotless{j} j @'{@=E} Ḕ @l{} ł @,{@'C} Ḉ @,c ç @,c@"u çü
+@dotless{i} ı @dotless{j} ȷ @'{@=E} Ḕ @l{} ł @,{@'C} Ḉ @,c ç @,c@"u çü
 
    @U{0075} u
 
@@ -764,7 +764,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 
2}\left({x-\mu \over \sigma}\rig
 ``simple-double--three---four----''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą a^{h}_{l}
 
@@ -1382,7 +1382,7 @@ cross ref name: (file name). '@inforef{}' *note ::
      @'{e} é
      @'{@dotless{i}} í
      @dotless{i} ı
-     @dotless{j} j
+     @dotless{j} ȷ
      @`{@=E} Ḕ
      @l{} ł
      @,{@'C} Ḉ
@@ -1566,7 +1566,7 @@ cross ref name: (file name). '@inforef{}' *note ::
      ``simple-double--three---four----''
 
 
-     ı j
+     ı ȷ
      ł ç
      a̲ ạ ą a^{h}_{l}
 
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 0cf1a6fd7f..7f18e2538a 100644
--- a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
@@ -36,7 +36,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -219,7 +219,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
@@ -922,8 +922,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -1101,7 +1101,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -1999,8 +1999,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -2178,7 +2178,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -3109,8 +3109,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -3288,7 +3288,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -4188,8 +4188,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @`i &igrave;
 @'{e} &eacute;
 @'{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @`{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@'C} &#262;&#807;
@@ -4376,7 +4376,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 
 </em></div><pre class="example-preformatted">
 
-</pre><div class="displaymath"><em>i j
+</pre><div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -5415,8 +5415,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -5594,7 +5594,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
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 054cc4552c..02d9800693 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
@@ -923,8 +923,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -1102,7 +1102,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -2001,8 +2001,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -2180,7 +2180,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -3135,8 +3135,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -3314,7 +3314,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -4211,8 +4211,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -4390,7 +4390,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -5291,8 +5291,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @`i &igrave;
 @'{e} &eacute;
 @'{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @`{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@'C} &#262;&#807;
@@ -5479,7 +5479,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 
 </em></div><pre class="example-preformatted">
 
-</pre><div class="displaymath"><em>i j
+</pre><div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
diff --git a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html 
b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
index 206545a52f..418702cfcc 100644
--- a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
@@ -923,8 +923,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -1102,7 +1102,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -2001,8 +2001,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -2180,7 +2180,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -3135,8 +3135,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -3314,7 +3314,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -4211,8 +4211,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br/>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -4390,7 +4390,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 </em></div>
-<div class="displaymath"><em>i j
+<div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
@@ -5291,8 +5291,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @`i &igrave;
 @'{e} &eacute;
 @'{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @`{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@'C} &#262;&#807;
@@ -5479,7 +5479,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup class="sup">-{1 
\over 2}\left({x-\mu \o
 
 </em></div><pre class="example-preformatted">
 
-</pre><div class="displaymath"><em>i j
+</pre><div class="displaymath"><em>&inodot; &#567;
 &#322; &ccedil;
 a&#818; &#7841; &#261; a<sup class="sup">h</sup><sub class="sub">l</sub>
 
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/anchor.html 
b/tp/tests/tex_html/res_parser/formatting_singular/anchor.html
index 8f0a306f32..121d892a9b 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/anchor.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/anchor.html
@@ -38,7 +38,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -221,7 +221,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
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 a7b587936e..2e6f7418ad 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
@@ -964,8 +964,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -2177,8 +2177,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd> <br>
 @&lsquo;i &igrave;
 @&rsquo;{e} &eacute;
 @&rsquo;{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @&lsquo;{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@&rsquo;C} &#262;&#807;
@@ -3394,8 +3394,8 @@ kbd: <kbd 
class="kbd">``simple-double--three---four----''</kbd>
 @`i &igrave;
 @'{e} &eacute;
 @'{@dotless{i}} &iacute; 
-@dotless{i} i
-@dotless{j} j
+@dotless{i} &inodot;
+@dotless{j} &#567;
 @`{@=E} &#274;&#768; 
 @l{} &#322;
 @,{@'C} &#262;&#807;
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html 
b/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
index cd6e6a3ab0..49e3a5ee59 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/index.htm 
b/tp/tests/tex_html/res_parser/formatting_singular/index.htm
index 67a8458162..b64cc80846 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/index.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/index.htm
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/index.html 
b/tp/tests/tex_html/res_parser/formatting_singular/index.html
index 7b1dc1d7e5..f6077ecc35 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/index.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/index.html
@@ -38,7 +38,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -221,7 +221,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git 
a/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html 
b/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html
index 55ad98555e..e4b2965b77 100644
--- 
a/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html
+++ 
b/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm 
b/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm
index 8b74900a68..b3fc16023c 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm 
b/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm
index dd7a8167ca..aaadd6efe7 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm 
b/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm
index 824c2b9c3e..c069bd4d3e 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm 
b/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm
index 0e4fc423ad..7e52e09c1d 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/subsection.html 
b/tp/tests/tex_html/res_parser/formatting_singular/subsection.html
index afc8ad8fea..7b75f0fa92 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/subsection.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/subsection.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git 
a/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
 
b/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index ecd39c6318..109f8c6b31 100644
--- 
a/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++ 
b/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 
diff --git 
a/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
 
b/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index 94176b2ad5..9f99bc037d 100644
--- 
a/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++ 
b/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -37,7 +37,7 @@ kbd: ``simple-double-three-four-''
 @'{e} é
 @'{@dotless{i}} í 
 @dotless{i} ı
-@dotless{j} j
+@dotless{j} ȷ
 @`{@=E} Ḕ 
 @l{} ł
 @,{@'C} Ḉ
@@ -220,7 +220,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e-{1 \over 
2}\left({x-\mu \over \sigma}\right
 ``simple-double-three-four-''
 
 
-ı j
+ı ȷ
 ł ç
 a̲ ạ ą ahl
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]