branch master updated: Make indices sorting independent of the output en

texinfo-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Make indices sorting independent of the output en

From:	Patrice Dumas
Subject:	branch master updated: Make indices sorting independent of the output encodings
Date:	Sun, 04 Feb 2024 05:19:30 -0500
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 9a82eedcbb Make indices sorting independent of the output encodings
9a82eedcbb is described below

commit 9a82eedcbbb7e458334bf9de6a6f333797d850e4
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Feb 4 11:19:17 2024 +0100

    Make indices sorting independent of the output encodings
    
    * NEWS, tp/Texinfo/Indices.pm (setup_sortable_index_entries),
    tp/Texinfo/XS/main/manipulate_indices.c
    (setup_sortable_index_entries): do not use
    setup_index_entry_keys_formatting to setup the conversion to text of
    sort strings.  Instead setup the conversion to always use unicode if
    possible and never pass a converter.
    
    * tp/Texinfo/Indices.pm (setup_index_entry_keys_formatting): rename
    $customization_info as $customization_information.
---
 ChangeLog                                          |  14 +++
 NEWS                                               |   3 +-
 tp/Texinfo/Indices.pm                              |  26 +++---
 tp/Texinfo/XS/main/manipulate_indices.c            |   9 +-
 tp/t/results/html_tests/letter_command_in_index.pl |   6 +-
 tp/t/results/indices/def_syn_indices.pl            |   2 +-
 tp/t/results/indices/encoding_index_ascii.pl       |  34 ++++----
 .../encoding_index_ascii/res_html/chap.html        |  94 ++++++++++++++++-----
 .../res_info/encoding_index_ascii.info             | Bin 4329 -> 4329 bytes
 .../res_plaintext/encoding_index_ascii.txt         |   8 +-
 .../encoding_index_ascii_enable_encoding.pl        |  34 ++++----
 .../res_html/chap.html                             |  94 ++++++++++++++++-----
 .../encoding_index_ascii_enable_encoding.info      | Bin 4377 -> 4377 bytes
 .../encoding_index_ascii_enable_encoding.txt       |   8 +-
 tp/t/results/indices/encoding_index_latin1.pl      |  32 +++----
 .../encoding_index_latin1/res_html/chap.html       |  94 ++++++++++++++++-----
 .../res_info/encoding_index_latin1.info            | Bin 4396 -> 4396 bytes
 .../res_plaintext/encoding_index_latin1.txt        |   8 +-
 .../encoding_index_latin1_enable_encoding.pl       |  12 +--
 .../res_html/chap.html                             |  70 +++++++++------
 .../res_info/encoding_index_latin1.info            | Bin 4396 -> 4396 bytes
 .../encoding_index_latin1_enable_encoding.txt      |   2 +-
 tp/t/results/indices/encoding_index_utf8.pl        |  32 +++----
 .../indices/encoding_index_utf8/res_html/chap.html |  94 ++++++++++++++++-----
 .../res_info/encoding_index_utf8.info              | Bin 4381 -> 4381 bytes
 .../res_plaintext/encoding_index_utf8.txt          |   8 +-
 tp/t/results/info_tests/test_index.pl              |   2 +-
 tp/t/results/latex_tests/indices.pl                |   6 +-
 .../latex_tests/indices_disable_encoding.pl        |   6 +-
 tp/t/results/macro/macro_in_index_commands.pl      |   2 +-
 tp/t/results/value/value_in_index_commands.pl      |   2 +-
 31 files changed, 466 insertions(+), 236 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index af45365ab1..9add648630 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2024-02-04  Patrice Dumas  <pertusus@free.fr>
+
+       Make indices sorting independent of the output encodings
+
+       * NEWS, tp/Texinfo/Indices.pm (setup_sortable_index_entries),
+       tp/Texinfo/XS/main/manipulate_indices.c
+       (setup_sortable_index_entries): do not use
+       setup_index_entry_keys_formatting to setup the conversion to text of
+       sort strings.  Instead setup the conversion to always use unicode if
+       possible and never pass a converter.
+
+       * tp/Texinfo/Indices.pm (setup_index_entry_keys_formatting): rename
+       $customization_info as $customization_information.
+
 2024-02-03  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/HTML.pm (_convert_printindex_command),
diff --git a/NEWS b/NEWS
index 2a763f600c..367ab537f7 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,7 @@ See the manual for detailed information.
 * texi2any
  . info output: output Info-documentlanguage in Local Variables section
    of output file if @documentlanguage is given
+ . Indices sorting is independent of the input or output encodings.
  . new variable USE_UNICODE_COLLATION to allow turning off the slower
    use of Unicode collation when sorting indices
  . remove SIMPLE_MENU customization option and tree transformation.
@@ -24,7 +25,7 @@ See the manual for detailed information.
  . some unused translation files have been removed for the
    "texinfo_document" domain
  . the us-ascii encoding is not tried anymore when looking for a document
-   output string locale.  Accents @-command can still be used in translations.
+   output string locale.  Accent @-commands can still be used in translations.
  . HTML, Texinfo and raw text output:
    An implementation of the conversion in C has been included.  Set the
     `TEXINFO_XS_CONVERT' environment variable to 1 to use.
diff --git a/tp/Texinfo/Indices.pm b/tp/Texinfo/Indices.pm
index 1bd54c1c22..ff45f49a3b 100644
--- a/tp/Texinfo/Indices.pm
+++ b/tp/Texinfo/Indices.pm
@@ -197,26 +197,21 @@ sub _collator_sort_index_entries($$$)
 
 sub setup_index_entry_keys_formatting($)
 {
-  my $customization_info = shift;
+  my $customization_information = shift;
 
   my $text_options;
 
-  #$text_options = {};
-  #$text_options->{'enabled_encoding'} = 'utf-8';
-  #$text_options->{'INCLUDE_DIRECTORIES'}
-  #   = $customization_info->get_conf('INCLUDE_DIRECTORIES');
-  #return $text_options;
-
   my $additional_options = {};
 
-  if (not $customization_info->get_conf('ENABLE_ENCODING')
-      or lc($customization_info->get_conf('OUTPUT_ENCODING_NAME')) ne 'utf-8') 
{
+  if (not $customization_information->get_conf('ENABLE_ENCODING')
+      or lc($customization_information->get_conf('OUTPUT_ENCODING_NAME'))
+           ne 'utf-8') {
     $additional_options->{'sort_string'} = 1;
   }
 
   $text_options
-    = 
Texinfo::Convert::Text::copy_options_for_convert_text($customization_info,
-                                                           
$additional_options);
+    = Texinfo::Convert::Text::copy_options_for_convert_text(
+                             $customization_information, $additional_options);
   return $text_options;
 }
 
@@ -359,6 +354,13 @@ sub setup_sortable_index_entries($$$$$)
   my $indices_information = shift;
   my $preset_keys = shift;
 
+  # convert index entries to sort string using unicode when possible
+  # independently of input and output encodings
+  my $convert_text_options = {};
+  $convert_text_options->{'enabled_encoding'} = 'utf-8';
+  $convert_text_options->{'INCLUDE_DIRECTORIES'}
+     = $customization_information->get_conf('INCLUDE_DIRECTORIES');
+
   # The 'Non-Ignorable' for variable collation elements means that they are
   # treated as normal characters.   This allows to have spaces and punctuation
   # marks sort before letters.
@@ -417,8 +419,6 @@ sub setup_sortable_index_entries($$$$$)
   return $index_sortable_index_entries, $collator, $index_entries_sort_strings
     unless ($index_entries);
 
-  my $convert_text_options
-    = setup_index_entry_keys_formatting($customization_information);
   $index_sortable_index_entries = {};
   foreach my $index_name (keys(%$index_entries)) {
     my $sortable_index_entries = [];
diff --git a/tp/Texinfo/XS/main/manipulate_indices.c 
b/tp/Texinfo/XS/main/manipulate_indices.c
index 7d34822fc7..82c1d81338 100644
--- a/tp/Texinfo/XS/main/manipulate_indices.c
+++ b/tp/Texinfo/XS/main/manipulate_indices.c
@@ -305,8 +305,13 @@ setup_sortable_index_entries (ERROR_MESSAGE_LIST 
*error_messages,
                       locale_t *collation_locale)
 {
   size_t i;
-  TEXT_OPTIONS *convert_text_options
-    = setup_index_entry_keys_formatting (options);
+
+  /* convert index entries to sort string using unicode when possible
+     independently of input and output encodings */
+  TEXT_OPTIONS *convert_text_options = new_text_options ();
+  convert_text_options->encoding = strdup ("utf-8");
+  copy_strings (&convert_text_options->include_directories,
+                options->INCLUDE_DIRECTORIES.strlist);
 
   /* similar to using Unicode::Collate in Perl */
   *collation_locale = 0;
diff --git a/tp/t/results/html_tests/letter_command_in_index.pl 
b/tp/t/results/html_tests/letter_command_in_index.pl
index cdd95f7c78..c1d4e9df02 100644
--- a/tp/t/results/html_tests/letter_command_in_index.pl
+++ b/tp/t/results/html_tests/letter_command_in_index.pl
@@ -469,9 +469,9 @@ $result_floats{'letter_command_in_index'} = {};
 
 $result_indices_sort_strings{'letter_command_in_index'} = {
   'cp' => [
-    'e^',
-    'l',
-    'TH'
+    "\x{ea}",
+    "\x{142}",
+    "\x{de}"
   ]
 };
 
diff --git a/tp/t/results/indices/def_syn_indices.pl 
b/tp/t/results/indices/def_syn_indices.pl
index aa360c8c26..a5a77c0ac0 100644
--- a/tp/t/results/indices/def_syn_indices.pl
+++ b/tp/t/results/indices/def_syn_indices.pl
@@ -1575,7 +1575,7 @@ $result_floats{'def_syn_indices'} = {};
 
 $result_indices_sort_strings{'def_syn_indices'} = {
   'codeidx' => [
-    'a index entry te~ i^'
+    "a index entry t\x{1ebd} \x{ee}"
   ],
   'fn' => [
     'cindex entry',
diff --git a/tp/t/results/indices/encoding_index_ascii.pl 
b/tp/t/results/indices/encoding_index_ascii.pl
index 095792af3e..b976429ed4 100644
--- a/tp/t/results/indices/encoding_index_ascii.pl
+++ b/tp/t/results/indices/encoding_index_ascii.pl
@@ -2789,58 +2789,58 @@ $result_indices_sort_strings{'encoding_index_ascii'} = {
     '-',
     '--',
     ',',
-    '!',
+    "\x{a1}",
     '\'',
     '"',
     '"',
     '"',
-    '"',
+    "\x{201c}",
     '@',
     '`',
-    '>=',
+    "\x{b0}",
+    "\x{2265}",
+    "\x{20ac}",
     '0',
     '9',
     'a',
     'A',
-    'AE',
+    "\x{c6}",
     'b',
     'B',
     'c',
     'd',
-    'D',
+    "\x{d0}",
     'e',
-    'e\' e\'',
-    'Euro',
+    "\x{e9} \x{e9}",
     'f',
     'g',
     'h',
     'i',
-    'i i (dotless)',
-    'i" i"i"i"',
-    'i^ i^ (dotless)',
-    'i^ i^i^i^i^',
+    "\x{131} \x{131} (dotless)",
+    "\x{ee} \x{ee} (dotless)",
+    "\x{ef} \x{ef}\x{ef}\x{ef}",
+    "\x{ee} \x{ee}\x{ee}\x{ee}\x{ee}",
     'j',
     'k',
     'l',
-    'l',
-    'L',
+    "\x{142}",
+    "\x{141}",
     'm',
     'n',
     'o',
-    'o',
     'p',
     'q',
     'r',
     's',
-    'ss',
+    "\x{df}",
     't',
-    'TH',
     'u',
     'v',
     'w',
     'x',
     'y',
-    'z'
+    'z',
+    "\x{de}"
   ]
 };
 
diff --git a/tp/t/results/indices/encoding_index_ascii/res_html/chap.html 
b/tp/t/results/indices/encoding_index_ascii/res_html/chap.html
index 7f20d0edd2..0d9d70a4b5 100644
--- a/tp/t/results/indices/encoding_index_ascii/res_html/chap.html
+++ b/tp/t/results/indices/encoding_index_ascii/res_html/chap.html
@@ -102,27 +102,37 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">top</a> &nbsp; [<a href=
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_symbol-4"><b>'</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" 
href="#chap_cp_symbol-5"><b>&ldquo;</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-5"><b>&quot;</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-6"><b>@</b></a>
+<a class="summary-letter-printindex" 
href="#chap_cp_symbol-6"><b>&ldquo;</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-7"><b>`</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-7"><b>@</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-8"><b>&ge;</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-8"><b>`</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-9"><b>0</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-9"><b>&deg;</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-10"><b>9</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-10"><b>&ge;</b></a>
+ &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_symbol-11"><b>&euro;</b></a>
+ &nbsp; 
+<a class="summary-letter-printindex" href="#chap_cp_symbol-12"><b>0</b></a>
+ &nbsp; 
+<a class="summary-letter-printindex" href="#chap_cp_symbol-13"><b>9</b></a>
  &nbsp; 
 <br>
 <a class="summary-letter-printindex" href="#chap_cp_letter-A"><b>A</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-AE-1"><b>&AElig;</b></a>
+ &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-B"><b>B</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-C"><b>C</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-D"><b>D</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-D-2"><b>&ETH;</b></a>
+ &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-E"><b>E</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-F"><b>F</b></a>
@@ -139,6 +149,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">top</a> &nbsp; [<a href=
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-L"><b>L</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-L-3"><b>&#321;</b></a>
+ &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-M"><b>M</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-N"><b>N</b></a>
@@ -153,6 +165,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">top</a> &nbsp; [<a href=
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-S"><b>S</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" href="#chap_cp_letter-SS"><b>SS</b></a>
+ &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-T"><b>T</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-U"><b>U</b></a>
@@ -167,6 +181,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">top</a> &nbsp; [<a href=
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-Z"><b>Z</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-TH-4"><b>&THORN;</b></a>
+ &nbsp; 
 </td></tr></table>
 <table class="cp-entries-printindex" border="0">
 <tr><td></td><th class="entries-header-printindex">Index Entry</th><th 
class="sections-header-printindex">Section</th></tr>
@@ -184,30 +200,40 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">top</a> &nbsp; [<a href=
 <tr><th id="chap_cp_symbol-4">'</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_0027">&rsquo;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="chap_cp_symbol-5">&ldquo;</th></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="#index-_201c">&ldquo;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><th id="chap_cp_symbol-5">&quot;</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_0060_0060">&ldquo;</a></td><td 
class="printindex-index-section"><a href="#chap">chap</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_0027_0027">&rdquo;</a></td><td 
class="printindex-index-section"><a href="#chap">chap</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_0022">&quot;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="chap_cp_symbol-6">@</th></tr>
+<tr><th id="chap_cp_symbol-6">&ldquo;</th></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-_201c">&ldquo;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_symbol-7">@</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_0040">@</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="chap_cp_symbol-7">`</th></tr>
+<tr><th id="chap_cp_symbol-8">`</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_0060">&lsquo;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="chap_cp_symbol-8">&ge;</th></tr>
+<tr><th id="chap_cp_symbol-9">&deg;</th></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-_00b0">&deg;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_symbol-10">&ge;</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_003e_003d">&ge;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="chap_cp_symbol-9">0</th></tr>
+<tr><th id="chap_cp_symbol-11">&euro;</th></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-EUR">&euro;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_symbol-12">0</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-0">0</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="chap_cp_symbol-10">9</th></tr>
+<tr><th id="chap_cp_symbol-13">9</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-9">9</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-A">A</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-a">a</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-A">A</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_letter-AE-1">&AElig;</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-AE">&AElig;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-B">B</th></tr>
@@ -219,12 +245,13 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">top</a> &nbsp; [<a href=
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-D">D</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-d">d</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_letter-D-2">&ETH;</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-D">&ETH;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-E">E</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-e">e</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-e-e">&eacute; 
&eacute;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="#index-EUR">&euro;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-F">F</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-f">f</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
@@ -238,8 +265,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">top</a> &nbsp; [<a href=
 <tr><th id="chap_cp_letter-I">I</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-i">i</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-i-i-_0028dotless_0029">&inodot; &inodot; (dotless)</a></td><td 
class="printindex-index-section"><a href="#chap">chap</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a href="#index-i-iii">&iuml; 
&iuml;&iuml;&iuml;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</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 
class="printindex-index-section"><a href="#chap">chap</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-i-iii">&iuml; 
&iuml;&iuml;&iuml;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-i-iiii">&icirc; &icirc;&icirc;&icirc;&icirc;</a></td><td 
class="printindex-index-section"><a href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-J">J</th></tr>
@@ -250,6 +277,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">top</a> &nbsp; [<a href=
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-L">L</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-l">l</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_letter-L-3">&#321;</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-l-1">&#322;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-L">&#321;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
@@ -261,7 +290,6 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">top</a> &nbsp; [<a href=
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-O">O</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-o">o</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="#index-_00b0">&deg;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-P">P</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-p">p</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
@@ -274,11 +302,12 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">top</a> &nbsp; [<a href=
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-S">S</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-s">s</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_letter-SS">SS</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-ss">&szlig;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-T">T</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-t">t</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="#index-TH">&THORN;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-U">U</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-u">u</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
@@ -298,6 +327,9 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">top</a> &nbsp; [<a href=
 <tr><th id="chap_cp_letter-Z">Z</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-z">z</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_letter-TH-4">&THORN;</th></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-TH">&THORN;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
 </table>
 <table class="cp-letters-footer-printindex"><tr><th>Jump to: &nbsp; 
</th><td><a class="summary-letter-printindex" 
href="#chap_cp_symbol-1"><b>-</b></a>
  &nbsp; 
@@ -307,27 +339,37 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">top</a> &nbsp; [<a href=
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_symbol-4"><b>'</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" 
href="#chap_cp_symbol-5"><b>&ldquo;</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-5"><b>&quot;</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-6"><b>@</b></a>
+<a class="summary-letter-printindex" 
href="#chap_cp_symbol-6"><b>&ldquo;</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-7"><b>`</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-7"><b>@</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-8"><b>&ge;</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-8"><b>`</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-9"><b>0</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-9"><b>&deg;</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-10"><b>9</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-10"><b>&ge;</b></a>
+ &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_symbol-11"><b>&euro;</b></a>
+ &nbsp; 
+<a class="summary-letter-printindex" href="#chap_cp_symbol-12"><b>0</b></a>
+ &nbsp; 
+<a class="summary-letter-printindex" href="#chap_cp_symbol-13"><b>9</b></a>
  &nbsp; 
 <br>
 <a class="summary-letter-printindex" href="#chap_cp_letter-A"><b>A</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-AE-1"><b>&AElig;</b></a>
+ &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-B"><b>B</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-C"><b>C</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-D"><b>D</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-D-2"><b>&ETH;</b></a>
+ &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-E"><b>E</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-F"><b>F</b></a>
@@ -344,6 +386,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">top</a> &nbsp; [<a href=
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-L"><b>L</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-L-3"><b>&#321;</b></a>
+ &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-M"><b>M</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-N"><b>N</b></a>
@@ -358,6 +402,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">top</a> &nbsp; [<a href=
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-S"><b>S</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" href="#chap_cp_letter-SS"><b>SS</b></a>
+ &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-T"><b>T</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-U"><b>U</b></a>
@@ -372,6 +418,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">top</a> &nbsp; [<a href=
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-Z"><b>Z</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-TH-4"><b>&THORN;</b></a>
+ &nbsp; 
 </td></tr></table>
 </div>
 <hr>
diff --git 
a/tp/t/results/indices/encoding_index_ascii/res_info/encoding_index_ascii.info 
b/tp/t/results/indices/encoding_index_ascii/res_info/encoding_index_ascii.info
index 60b166f240..b23c2fba18 100644
Binary files 
a/tp/t/results/indices/encoding_index_ascii/res_info/encoding_index_ascii.info 
and 
b/tp/t/results/indices/encoding_index_ascii/res_info/encoding_index_ascii.info 
differ
diff --git 
a/tp/t/results/indices/encoding_index_ascii/res_plaintext/encoding_index_ascii.txt
 
b/tp/t/results/indices/encoding_index_ascii/res_plaintext/encoding_index_ascii.txt
index 65c2f99994..922a8aa0a0 100644
--- 
a/tp/t/results/indices/encoding_index_ascii/res_plaintext/encoding_index_ascii.txt
+++ 
b/tp/t/results/indices/encoding_index_ascii/res_plaintext/encoding_index_ascii.txt
@@ -14,7 +14,9 @@ top
 * " <3>:                                 chap.                  (line 3)
 * @:                                     chap.                  (line 3)
 * ' <1>:                                 chap.                  (line 3)
+* o:                                     chap.                  (line 3)
 * >=:                                    chap.                  (line 3)
+* Euro:                                  chap.                  (line 3)
 * 0:                                     chap.                  (line 3)
 * 9:                                     chap.                  (line 3)
 * a:                                     chap.                  (line 3)
@@ -27,14 +29,13 @@ top
 * D:                                     chap.                  (line 3)
 * e:                                     chap.                  (line 3)
 * e' e':                                 chap.                  (line 3)
-* Euro:                                  chap.                  (line 3)
 * f:                                     chap.                  (line 3)
 * g:                                     chap.                  (line 3)
 * h:                                     chap.                  (line 3)
 * i:                                     chap.                  (line 3)
 * i i (dotless):                         chap.                  (line 3)
-* i" i"i"i":                             chap.                  (line 3)
 * i^ i^ (dotless):                       chap.                  (line 3)
+* i" i"i"i":                             chap.                  (line 3)
 * i^ i^i^i^i^:                           chap.                  (line 3)
 * j:                                     chap.                  (line 3)
 * k:                                     chap.                  (line 3)
@@ -43,7 +44,6 @@ top
 * /L:                                    chap.                  (line 3)
 * m:                                     chap.                  (line 3)
 * n:                                     chap.                  (line 3)
-* o:                                     chap.                  (line 3)
 * o <1>:                                 chap.                  (line 3)
 * p:                                     chap.                  (line 3)
 * q:                                     chap.                  (line 3)
@@ -51,11 +51,11 @@ top
 * s:                                     chap.                  (line 3)
 * ss:                                    chap.                  (line 3)
 * t:                                     chap.                  (line 3)
-* TH:                                    chap.                  (line 3)
 * u:                                     chap.                  (line 3)
 * v:                                     chap.                  (line 3)
 * w:                                     chap.                  (line 3)
 * x:                                     chap.                  (line 3)
 * y:                                     chap.                  (line 3)
 * z:                                     chap.                  (line 3)
+* TH:                                    chap.                  (line 3)
 
diff --git a/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl 
b/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
index ef4b4ef41f..0073affb91 100644
--- a/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
@@ -2789,58 +2789,58 @@ 
$result_indices_sort_strings{'encoding_index_ascii_enable_encoding'} = {
     '-',
     '--',
     ',',
-    '!',
+    "\x{a1}",
     '\'',
     '"',
     '"',
     '"',
-    '"',
+    "\x{201c}",
     '@',
     '`',
-    '>=',
+    "\x{b0}",
+    "\x{2265}",
+    "\x{20ac}",
     '0',
     '9',
     'a',
     'A',
-    'AE',
+    "\x{c6}",
     'b',
     'B',
     'c',
     'd',
-    'D',
+    "\x{d0}",
     'e',
-    'e\' e\'',
-    'Euro',
+    "\x{e9} \x{e9}",
     'f',
     'g',
     'h',
     'i',
-    'i i (dotless)',
-    'i" i"i"i"',
-    'i^ i^ (dotless)',
-    'i^ i^i^i^i^',
+    "\x{131} \x{131} (dotless)",
+    "\x{ee} \x{ee} (dotless)",
+    "\x{ef} \x{ef}\x{ef}\x{ef}",
+    "\x{ee} \x{ee}\x{ee}\x{ee}\x{ee}",
     'j',
     'k',
     'l',
-    'l',
-    'L',
+    "\x{142}",
+    "\x{141}",
     'm',
     'n',
     'o',
-    'o',
     'p',
     'q',
     'r',
     's',
-    'ss',
+    "\x{df}",
     't',
-    'TH',
     'u',
     'v',
     'w',
     'x',
     'y',
-    'z'
+    'z',
+    "\x{de}"
   ]
 };
 
diff --git 
a/tp/t/results/indices/encoding_index_ascii_enable_encoding/res_html/chap.html 
b/tp/t/results/indices/encoding_index_ascii_enable_encoding/res_html/chap.html
index 7f20d0edd2..0d9d70a4b5 100644
--- 
a/tp/t/results/indices/encoding_index_ascii_enable_encoding/res_html/chap.html
+++ 
b/tp/t/results/indices/encoding_index_ascii_enable_encoding/res_html/chap.html
@@ -102,27 +102,37 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">top</a> &nbsp; [<a href=
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_symbol-4"><b>'</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" 
href="#chap_cp_symbol-5"><b>&ldquo;</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-5"><b>&quot;</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-6"><b>@</b></a>
+<a class="summary-letter-printindex" 
href="#chap_cp_symbol-6"><b>&ldquo;</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-7"><b>`</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-7"><b>@</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-8"><b>&ge;</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-8"><b>`</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-9"><b>0</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-9"><b>&deg;</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-10"><b>9</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-10"><b>&ge;</b></a>
+ &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_symbol-11"><b>&euro;</b></a>
+ &nbsp; 
+<a class="summary-letter-printindex" href="#chap_cp_symbol-12"><b>0</b></a>
+ &nbsp; 
+<a class="summary-letter-printindex" href="#chap_cp_symbol-13"><b>9</b></a>
  &nbsp; 
 <br>
 <a class="summary-letter-printindex" href="#chap_cp_letter-A"><b>A</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-AE-1"><b>&AElig;</b></a>
+ &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-B"><b>B</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-C"><b>C</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-D"><b>D</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-D-2"><b>&ETH;</b></a>
+ &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-E"><b>E</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-F"><b>F</b></a>
@@ -139,6 +149,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">top</a> &nbsp; [<a href=
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-L"><b>L</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-L-3"><b>&#321;</b></a>
+ &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-M"><b>M</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-N"><b>N</b></a>
@@ -153,6 +165,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">top</a> &nbsp; [<a href=
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-S"><b>S</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" href="#chap_cp_letter-SS"><b>SS</b></a>
+ &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-T"><b>T</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-U"><b>U</b></a>
@@ -167,6 +181,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">top</a> &nbsp; [<a href=
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-Z"><b>Z</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-TH-4"><b>&THORN;</b></a>
+ &nbsp; 
 </td></tr></table>
 <table class="cp-entries-printindex" border="0">
 <tr><td></td><th class="entries-header-printindex">Index Entry</th><th 
class="sections-header-printindex">Section</th></tr>
@@ -184,30 +200,40 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">top</a> &nbsp; [<a href=
 <tr><th id="chap_cp_symbol-4">'</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_0027">&rsquo;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="chap_cp_symbol-5">&ldquo;</th></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="#index-_201c">&ldquo;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><th id="chap_cp_symbol-5">&quot;</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_0060_0060">&ldquo;</a></td><td 
class="printindex-index-section"><a href="#chap">chap</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_0027_0027">&rdquo;</a></td><td 
class="printindex-index-section"><a href="#chap">chap</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_0022">&quot;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="chap_cp_symbol-6">@</th></tr>
+<tr><th id="chap_cp_symbol-6">&ldquo;</th></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-_201c">&ldquo;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_symbol-7">@</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_0040">@</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="chap_cp_symbol-7">`</th></tr>
+<tr><th id="chap_cp_symbol-8">`</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_0060">&lsquo;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="chap_cp_symbol-8">&ge;</th></tr>
+<tr><th id="chap_cp_symbol-9">&deg;</th></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-_00b0">&deg;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_symbol-10">&ge;</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_003e_003d">&ge;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="chap_cp_symbol-9">0</th></tr>
+<tr><th id="chap_cp_symbol-11">&euro;</th></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-EUR">&euro;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_symbol-12">0</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-0">0</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="chap_cp_symbol-10">9</th></tr>
+<tr><th id="chap_cp_symbol-13">9</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-9">9</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-A">A</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-a">a</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-A">A</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_letter-AE-1">&AElig;</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-AE">&AElig;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-B">B</th></tr>
@@ -219,12 +245,13 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">top</a> &nbsp; [<a href=
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-D">D</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-d">d</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_letter-D-2">&ETH;</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-D">&ETH;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-E">E</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-e">e</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-e-e">&eacute; 
&eacute;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="#index-EUR">&euro;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-F">F</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-f">f</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
@@ -238,8 +265,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">top</a> &nbsp; [<a href=
 <tr><th id="chap_cp_letter-I">I</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-i">i</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-i-i-_0028dotless_0029">&inodot; &inodot; (dotless)</a></td><td 
class="printindex-index-section"><a href="#chap">chap</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a href="#index-i-iii">&iuml; 
&iuml;&iuml;&iuml;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</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 
class="printindex-index-section"><a href="#chap">chap</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-i-iii">&iuml; 
&iuml;&iuml;&iuml;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-i-iiii">&icirc; &icirc;&icirc;&icirc;&icirc;</a></td><td 
class="printindex-index-section"><a href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-J">J</th></tr>
@@ -250,6 +277,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">top</a> &nbsp; [<a href=
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-L">L</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-l">l</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_letter-L-3">&#321;</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-l-1">&#322;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-L">&#321;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
@@ -261,7 +290,6 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">top</a> &nbsp; [<a href=
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-O">O</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-o">o</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="#index-_00b0">&deg;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-P">P</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-p">p</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
@@ -274,11 +302,12 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">top</a> &nbsp; [<a href=
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-S">S</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-s">s</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_letter-SS">SS</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-ss">&szlig;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-T">T</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-t">t</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="#index-TH">&THORN;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-U">U</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-u">u</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
@@ -298,6 +327,9 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">top</a> &nbsp; [<a href=
 <tr><th id="chap_cp_letter-Z">Z</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-z">z</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_letter-TH-4">&THORN;</th></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-TH">&THORN;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
 </table>
 <table class="cp-letters-footer-printindex"><tr><th>Jump to: &nbsp; 
</th><td><a class="summary-letter-printindex" 
href="#chap_cp_symbol-1"><b>-</b></a>
  &nbsp; 
@@ -307,27 +339,37 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">top</a> &nbsp; [<a href=
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_symbol-4"><b>'</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" 
href="#chap_cp_symbol-5"><b>&ldquo;</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-5"><b>&quot;</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-6"><b>@</b></a>
+<a class="summary-letter-printindex" 
href="#chap_cp_symbol-6"><b>&ldquo;</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-7"><b>`</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-7"><b>@</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-8"><b>&ge;</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-8"><b>`</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-9"><b>0</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-9"><b>&deg;</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-10"><b>9</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-10"><b>&ge;</b></a>
+ &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_symbol-11"><b>&euro;</b></a>
+ &nbsp; 
+<a class="summary-letter-printindex" href="#chap_cp_symbol-12"><b>0</b></a>
+ &nbsp; 
+<a class="summary-letter-printindex" href="#chap_cp_symbol-13"><b>9</b></a>
  &nbsp; 
 <br>
 <a class="summary-letter-printindex" href="#chap_cp_letter-A"><b>A</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-AE-1"><b>&AElig;</b></a>
+ &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-B"><b>B</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-C"><b>C</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-D"><b>D</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-D-2"><b>&ETH;</b></a>
+ &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-E"><b>E</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-F"><b>F</b></a>
@@ -344,6 +386,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">top</a> &nbsp; [<a href=
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-L"><b>L</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-L-3"><b>&#321;</b></a>
+ &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-M"><b>M</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-N"><b>N</b></a>
@@ -358,6 +402,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">top</a> &nbsp; [<a href=
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-S"><b>S</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" href="#chap_cp_letter-SS"><b>SS</b></a>
+ &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-T"><b>T</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-U"><b>U</b></a>
@@ -372,6 +418,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">top</a> &nbsp; [<a href=
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-Z"><b>Z</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-TH-4"><b>&THORN;</b></a>
+ &nbsp; 
 </td></tr></table>
 </div>
 <hr>
diff --git 
a/tp/t/results/indices/encoding_index_ascii_enable_encoding/res_info/encoding_index_ascii_enable_encoding.info
 
b/tp/t/results/indices/encoding_index_ascii_enable_encoding/res_info/encoding_index_ascii_enable_encoding.info
index 82a2208e40..c2d0ec6f93 100644
Binary files 
a/tp/t/results/indices/encoding_index_ascii_enable_encoding/res_info/encoding_index_ascii_enable_encoding.info
 and 
b/tp/t/results/indices/encoding_index_ascii_enable_encoding/res_info/encoding_index_ascii_enable_encoding.info
 differ
diff --git 
a/tp/t/results/indices/encoding_index_ascii_enable_encoding/res_plaintext/encoding_index_ascii_enable_encoding.txt
 
b/tp/t/results/indices/encoding_index_ascii_enable_encoding/res_plaintext/encoding_index_ascii_enable_encoding.txt
index 65c2f99994..922a8aa0a0 100644
--- 
a/tp/t/results/indices/encoding_index_ascii_enable_encoding/res_plaintext/encoding_index_ascii_enable_encoding.txt
+++ 
b/tp/t/results/indices/encoding_index_ascii_enable_encoding/res_plaintext/encoding_index_ascii_enable_encoding.txt
@@ -14,7 +14,9 @@ top
 * " <3>:                                 chap.                  (line 3)
 * @:                                     chap.                  (line 3)
 * ' <1>:                                 chap.                  (line 3)
+* o:                                     chap.                  (line 3)
 * >=:                                    chap.                  (line 3)
+* Euro:                                  chap.                  (line 3)
 * 0:                                     chap.                  (line 3)
 * 9:                                     chap.                  (line 3)
 * a:                                     chap.                  (line 3)
@@ -27,14 +29,13 @@ top
 * D:                                     chap.                  (line 3)
 * e:                                     chap.                  (line 3)
 * e' e':                                 chap.                  (line 3)
-* Euro:                                  chap.                  (line 3)
 * f:                                     chap.                  (line 3)
 * g:                                     chap.                  (line 3)
 * h:                                     chap.                  (line 3)
 * i:                                     chap.                  (line 3)
 * i i (dotless):                         chap.                  (line 3)
-* i" i"i"i":                             chap.                  (line 3)
 * i^ i^ (dotless):                       chap.                  (line 3)
+* i" i"i"i":                             chap.                  (line 3)
 * i^ i^i^i^i^:                           chap.                  (line 3)
 * j:                                     chap.                  (line 3)
 * k:                                     chap.                  (line 3)
@@ -43,7 +44,6 @@ top
 * /L:                                    chap.                  (line 3)
 * m:                                     chap.                  (line 3)
 * n:                                     chap.                  (line 3)
-* o:                                     chap.                  (line 3)
 * o <1>:                                 chap.                  (line 3)
 * p:                                     chap.                  (line 3)
 * q:                                     chap.                  (line 3)
@@ -51,11 +51,11 @@ top
 * s:                                     chap.                  (line 3)
 * ss:                                    chap.                  (line 3)
 * t:                                     chap.                  (line 3)
-* TH:                                    chap.                  (line 3)
 * u:                                     chap.                  (line 3)
 * v:                                     chap.                  (line 3)
 * w:                                     chap.                  (line 3)
 * x:                                     chap.                  (line 3)
 * y:                                     chap.                  (line 3)
 * z:                                     chap.                  (line 3)
+* TH:                                    chap.                  (line 3)
 
diff --git a/tp/t/results/indices/encoding_index_latin1.pl 
b/tp/t/results/indices/encoding_index_latin1.pl
index 0318a682d5..e374916c2e 100644
--- a/tp/t/results/indices/encoding_index_latin1.pl
+++ b/tp/t/results/indices/encoding_index_latin1.pl
@@ -2828,58 +2828,58 @@ $result_indices_sort_strings{'encoding_index_latin1'} = 
{
     '-',
     '--',
     ',',
-    '!',
+    "\x{a1}",
     '\'',
     '"',
     '"',
     '"',
-    '"',
+    "\x{201c}",
     '@',
     '`',
-    '>=',
+    "\x{b0}",
+    "\x{2265}",
+    "\x{20ac}",
     '0',
     '9',
     'a',
     'A',
-    'AE',
+    "\x{c6}",
     'b',
     'B',
     'c',
     'd',
-    'D',
+    "\x{d0}",
     'e',
     "\x{e9} \x{e9}",
-    'Euro',
     'f',
     'g',
     'h',
     'i',
-    'i i (dotless)',
-    'i" i"i"i"',
-    'i^ i^ (dotless)',
-    'i^ i^i^i^i^',
+    "\x{131} \x{131} (dotless)",
+    "\x{ee} \x{ee} (dotless)",
+    "\x{ef} \x{ef}\x{ef}\x{ef}",
+    "\x{ee} \x{ee}\x{ee}\x{ee}\x{ee}",
     'j',
     'k',
     'l',
-    'l',
-    'L',
+    "\x{142}",
+    "\x{141}",
     'm',
     'n',
     'o',
-    'o',
     'p',
     'q',
     'r',
     's',
-    'ss',
+    "\x{df}",
     't',
-    'TH',
     'u',
     'v',
     'w',
     'x',
     'y',
-    'z'
+    'z',
+    "\x{de}"
   ]
 };
 
diff --git a/tp/t/results/indices/encoding_index_latin1/res_html/chap.html 
b/tp/t/results/indices/encoding_index_latin1/res_html/chap.html
index 756820acfd..8c3459c267 100644
--- a/tp/t/results/indices/encoding_index_latin1/res_html/chap.html
+++ b/tp/t/results/indices/encoding_index_latin1/res_html/chap.html
@@ -102,27 +102,37 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index latin1</a
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_symbol-4"><b>'</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" 
href="#chap_cp_symbol-5"><b>&ldquo;</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-5"><b>&quot;</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-6"><b>@</b></a>
+<a class="summary-letter-printindex" 
href="#chap_cp_symbol-6"><b>&ldquo;</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-7"><b>`</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-7"><b>@</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-8"><b>&ge;</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-8"><b>`</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-9"><b>0</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-9"><b>&deg;</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-10"><b>9</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-10"><b>&ge;</b></a>
+ &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_symbol-11"><b>&euro;</b></a>
+ &nbsp; 
+<a class="summary-letter-printindex" href="#chap_cp_symbol-12"><b>0</b></a>
+ &nbsp; 
+<a class="summary-letter-printindex" href="#chap_cp_symbol-13"><b>9</b></a>
  &nbsp; 
 <br>
 <a class="summary-letter-printindex" href="#chap_cp_letter-A"><b>A</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-AE-1"><b>&AElig;</b></a>
+ &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-B"><b>B</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-C"><b>C</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-D"><b>D</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-D-2"><b>&ETH;</b></a>
+ &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-E"><b>E</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-F"><b>F</b></a>
@@ -139,6 +149,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index latin1</a
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-L"><b>L</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-L-3"><b>&#321;</b></a>
+ &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-M"><b>M</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-N"><b>N</b></a>
@@ -153,6 +165,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index latin1</a
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-S"><b>S</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" href="#chap_cp_letter-SS"><b>SS</b></a>
+ &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-T"><b>T</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-U"><b>U</b></a>
@@ -167,6 +181,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index latin1</a
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-Z"><b>Z</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-TH-4"><b>&THORN;</b></a>
+ &nbsp; 
 </td></tr></table>
 <table class="cp-entries-printindex" border="0">
 <tr><td></td><th class="entries-header-printindex">Index Entry</th><th 
class="sections-header-printindex">Section</th></tr>
@@ -184,30 +200,40 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index latin1</a
 <tr><th id="chap_cp_symbol-4">'</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_0027">&rsquo;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="chap_cp_symbol-5">&ldquo;</th></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="#index-_201c">&ldquo;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><th id="chap_cp_symbol-5">&quot;</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_0060_0060">&ldquo;</a></td><td 
class="printindex-index-section"><a href="#chap">chap</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_0027_0027">&rdquo;</a></td><td 
class="printindex-index-section"><a href="#chap">chap</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_0022">&quot;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="chap_cp_symbol-6">@</th></tr>
+<tr><th id="chap_cp_symbol-6">&ldquo;</th></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-_201c">&ldquo;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_symbol-7">@</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_0040">@</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="chap_cp_symbol-7">`</th></tr>
+<tr><th id="chap_cp_symbol-8">`</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_0060">&lsquo;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="chap_cp_symbol-8">&ge;</th></tr>
+<tr><th id="chap_cp_symbol-9">&deg;</th></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-_00b0">&deg;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_symbol-10">&ge;</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_003e_003d">&ge;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="chap_cp_symbol-9">0</th></tr>
+<tr><th id="chap_cp_symbol-11">&euro;</th></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-EUR">&euro;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_symbol-12">0</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-0">0</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="chap_cp_symbol-10">9</th></tr>
+<tr><th id="chap_cp_symbol-13">9</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-9">9</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-A">A</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-a">a</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-A">A</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_letter-AE-1">&AElig;</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-AE">&AElig;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-B">B</th></tr>
@@ -219,12 +245,13 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index latin1</a
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-D">D</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-d">d</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_letter-D-2">&ETH;</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-D">&ETH;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-E">E</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-e">e</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-e-e">� 
�</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="#index-EUR">&euro;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-F">F</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-f">f</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
@@ -238,8 +265,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index latin1</a
 <tr><th id="chap_cp_letter-I">I</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-i">i</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-i-i-_0028dotless_0029">&inodot; &inodot; (dotless)</a></td><td 
class="printindex-index-section"><a href="#chap">chap</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a href="#index-i-iii">&iuml; 
&iuml;&iuml;&iuml;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</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 
class="printindex-index-section"><a href="#chap">chap</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-i-iii">&iuml; 
&iuml;&iuml;&iuml;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-i-iiii">&icirc; &icirc;&icirc;&icirc;&icirc;</a></td><td 
class="printindex-index-section"><a href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-J">J</th></tr>
@@ -250,6 +277,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index latin1</a
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-L">L</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-l">l</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_letter-L-3">&#321;</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-l-1">&#322;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-L">&#321;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
@@ -261,7 +290,6 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index latin1</a
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-O">O</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-o">o</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="#index-_00b0">&deg;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-P">P</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-p">p</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
@@ -274,11 +302,12 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index latin1</a
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-S">S</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-s">s</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_letter-SS">SS</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-ss">&szlig;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-T">T</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-t">t</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="#index-TH">&THORN;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-U">U</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-u">u</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
@@ -298,6 +327,9 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index latin1</a
 <tr><th id="chap_cp_letter-Z">Z</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-z">z</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_letter-TH-4">&THORN;</th></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-TH">&THORN;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
 </table>
 <table class="cp-letters-footer-printindex"><tr><th>Jump to: &nbsp; 
</th><td><a class="summary-letter-printindex" 
href="#chap_cp_symbol-1"><b>-</b></a>
  &nbsp; 
@@ -307,27 +339,37 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index latin1</a
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_symbol-4"><b>'</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" 
href="#chap_cp_symbol-5"><b>&ldquo;</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-5"><b>&quot;</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-6"><b>@</b></a>
+<a class="summary-letter-printindex" 
href="#chap_cp_symbol-6"><b>&ldquo;</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-7"><b>`</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-7"><b>@</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-8"><b>&ge;</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-8"><b>`</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-9"><b>0</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-9"><b>&deg;</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-10"><b>9</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-10"><b>&ge;</b></a>
+ &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_symbol-11"><b>&euro;</b></a>
+ &nbsp; 
+<a class="summary-letter-printindex" href="#chap_cp_symbol-12"><b>0</b></a>
+ &nbsp; 
+<a class="summary-letter-printindex" href="#chap_cp_symbol-13"><b>9</b></a>
  &nbsp; 
 <br>
 <a class="summary-letter-printindex" href="#chap_cp_letter-A"><b>A</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-AE-1"><b>&AElig;</b></a>
+ &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-B"><b>B</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-C"><b>C</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-D"><b>D</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-D-2"><b>&ETH;</b></a>
+ &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-E"><b>E</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-F"><b>F</b></a>
@@ -344,6 +386,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index latin1</a
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-L"><b>L</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-L-3"><b>&#321;</b></a>
+ &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-M"><b>M</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-N"><b>N</b></a>
@@ -358,6 +402,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index latin1</a
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-S"><b>S</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" href="#chap_cp_letter-SS"><b>SS</b></a>
+ &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-T"><b>T</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-U"><b>U</b></a>
@@ -372,6 +418,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index latin1</a
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-Z"><b>Z</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-TH-4"><b>&THORN;</b></a>
+ &nbsp; 
 </td></tr></table>
 </div>
 <hr>
diff --git 
a/tp/t/results/indices/encoding_index_latin1/res_info/encoding_index_latin1.info
 
b/tp/t/results/indices/encoding_index_latin1/res_info/encoding_index_latin1.info
index 48f6a064c7..6ee7cdaa9e 100644
Binary files 
a/tp/t/results/indices/encoding_index_latin1/res_info/encoding_index_latin1.info
 and 
b/tp/t/results/indices/encoding_index_latin1/res_info/encoding_index_latin1.info
 differ
diff --git 
a/tp/t/results/indices/encoding_index_latin1/res_plaintext/encoding_index_latin1.txt
 
b/tp/t/results/indices/encoding_index_latin1/res_plaintext/encoding_index_latin1.txt
index ec8fe455e8..14757c5356 100644
--- 
a/tp/t/results/indices/encoding_index_latin1/res_plaintext/encoding_index_latin1.txt
+++ 
b/tp/t/results/indices/encoding_index_latin1/res_plaintext/encoding_index_latin1.txt
@@ -14,7 +14,9 @@ encoding index latin1
 * " <3>:                                 chap.                  (line 3)
 * @:                                     chap.                  (line 3)
 * ' <1>:                                 chap.                  (line 3)
+* o:                                     chap.                  (line 3)
 * >=:                                    chap.                  (line 3)
+* Euro:                                  chap.                  (line 3)
 * 0:                                     chap.                  (line 3)
 * 9:                                     chap.                  (line 3)
 * a:                                     chap.                  (line 3)
@@ -27,14 +29,13 @@ encoding index latin1
 * D:                                     chap.                  (line 3)
 * e:                                     chap.                  (line 3)
 * � �:                                   chap.                  (line 3)
-* Euro:                                  chap.                  (line 3)
 * f:                                     chap.                  (line 3)
 * g:                                     chap.                  (line 3)
 * h:                                     chap.                  (line 3)
 * i:                                     chap.                  (line 3)
 * i i (dotless):                         chap.                  (line 3)
-* i" i"i"i":                             chap.                  (line 3)
 * i^ i^ (dotless):                       chap.                  (line 3)
+* i" i"i"i":                             chap.                  (line 3)
 * i^ i^i^i^i^:                           chap.                  (line 3)
 * j:                                     chap.                  (line 3)
 * k:                                     chap.                  (line 3)
@@ -43,7 +44,6 @@ encoding index latin1
 * /L:                                    chap.                  (line 3)
 * m:                                     chap.                  (line 3)
 * n:                                     chap.                  (line 3)
-* o:                                     chap.                  (line 3)
 * o <1>:                                 chap.                  (line 3)
 * p:                                     chap.                  (line 3)
 * q:                                     chap.                  (line 3)
@@ -51,11 +51,11 @@ encoding index latin1
 * s:                                     chap.                  (line 3)
 * ss:                                    chap.                  (line 3)
 * t:                                     chap.                  (line 3)
-* TH:                                    chap.                  (line 3)
 * u:                                     chap.                  (line 3)
 * v:                                     chap.                  (line 3)
 * w:                                     chap.                  (line 3)
 * x:                                     chap.                  (line 3)
 * y:                                     chap.                  (line 3)
 * z:                                     chap.                  (line 3)
+* TH:                                    chap.                  (line 3)
 
diff --git a/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl 
b/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
index 311086aa30..d601de9924 100644
--- a/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
@@ -2833,11 +2833,12 @@ 
$result_indices_sort_strings{'encoding_index_latin1_enable_encoding'} = {
     '"',
     '"',
     '"',
-    '"',
+    "\x{201c}",
     '@',
     '`',
     "\x{b0}",
-    '>=',
+    "\x{2265}",
+    "\x{20ac}",
     '0',
     '9',
     'a',
@@ -2850,20 +2851,19 @@ 
$result_indices_sort_strings{'encoding_index_latin1_enable_encoding'} = {
     "\x{d0}",
     'e',
     "\x{e9} \x{e9}",
-    'Euro',
     'f',
     'g',
     'h',
     'i',
-    'i i (dotless)',
+    "\x{131} \x{131} (dotless)",
     "\x{ee} \x{ee} (dotless)",
     "\x{ef} \x{ef}\x{ef}\x{ef}",
     "\x{ee} \x{ee}\x{ee}\x{ee}\x{ee}",
     'j',
     'k',
     'l',
-    'l',
-    'L',
+    "\x{142}",
+    "\x{141}",
     'm',
     'n',
     'o',
diff --git 
a/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_html/chap.html 
b/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_html/chap.html
index 6a2b3ecb3d..ec9eb438c0 100644
--- 
a/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_html/chap.html
+++ 
b/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_html/chap.html
@@ -102,19 +102,23 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index latin1</a
  � 
 <a class="summary-letter-printindex" href="#chap_cp_symbol-4"><b>'</b></a>
  � 
-<a class="summary-letter-printindex" 
href="#chap_cp_symbol-5"><b>&ldquo;</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-5"><b>&quot;</b></a>
  � 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-6"><b>@</b></a>
+<a class="summary-letter-printindex" 
href="#chap_cp_symbol-6"><b>&ldquo;</b></a>
  � 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-7"><b>`</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-7"><b>@</b></a>
  � 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-8"><b>�</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-8"><b>`</b></a>
  � 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-9"><b>&ge;</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-9"><b>�</b></a>
  � 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-10"><b>0</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-10"><b>&ge;</b></a>
  � 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-11"><b>9</b></a>
+<a class="summary-letter-printindex" 
href="#chap_cp_symbol-11"><b>&euro;</b></a>
+ � 
+<a class="summary-letter-printindex" href="#chap_cp_symbol-12"><b>0</b></a>
+ � 
+<a class="summary-letter-printindex" href="#chap_cp_symbol-13"><b>9</b></a>
  � 
 <br>
 <a class="summary-letter-printindex" href="#chap_cp_letter-A"><b>A</b></a>
@@ -145,6 +149,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index latin1</a
  � 
 <a class="summary-letter-printindex" href="#chap_cp_letter-L"><b>L</b></a>
  � 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-L-3"><b>&#321;</b></a>
+ � 
 <a class="summary-letter-printindex" href="#chap_cp_letter-M"><b>M</b></a>
  � 
 <a class="summary-letter-printindex" href="#chap_cp_letter-N"><b>N</b></a>
@@ -175,7 +181,7 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index latin1</a
  � 
 <a class="summary-letter-printindex" href="#chap_cp_letter-Z"><b>Z</b></a>
  � 
-<a class="summary-letter-printindex" href="#chap_cp_letter-TH-3"><b>�</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_letter-TH-4"><b>�</b></a>
  � 
 </td></tr></table>
 <table class="cp-entries-printindex" border="0">
@@ -194,28 +200,33 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index latin1</a
 <tr><th id="chap_cp_symbol-4">'</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_0027">&rsquo;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="chap_cp_symbol-5">&ldquo;</th></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="#index-_201c">&ldquo;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><th id="chap_cp_symbol-5">&quot;</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_0060_0060">&ldquo;</a></td><td 
class="printindex-index-section"><a href="#chap">chap</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_0027_0027">&rdquo;</a></td><td 
class="printindex-index-section"><a href="#chap">chap</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_0022">&quot;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="chap_cp_symbol-6">@</th></tr>
+<tr><th id="chap_cp_symbol-6">&ldquo;</th></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-_201c">&ldquo;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_symbol-7">@</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_0040">@</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="chap_cp_symbol-7">`</th></tr>
+<tr><th id="chap_cp_symbol-8">`</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_0060">&lsquo;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="chap_cp_symbol-8">�</th></tr>
+<tr><th id="chap_cp_symbol-9">�</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_00b0">�</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="chap_cp_symbol-9">&ge;</th></tr>
+<tr><th id="chap_cp_symbol-10">&ge;</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_003e_003d">&ge;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="chap_cp_symbol-10">0</th></tr>
+<tr><th id="chap_cp_symbol-11">&euro;</th></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-EUR">&euro;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_symbol-12">0</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-0">0</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="chap_cp_symbol-11">9</th></tr>
+<tr><th id="chap_cp_symbol-13">9</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-9">9</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-A">A</th></tr>
@@ -241,7 +252,6 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index latin1</a
 <tr><th id="chap_cp_letter-E">E</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-e">e</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-e-e">� 
�</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="#index-EUR">&euro;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-F">F</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-f">f</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
@@ -267,6 +277,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index latin1</a
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-L">L</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-l">l</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_letter-L-3">&#321;</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-l-1">&#322;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-L">&#321;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
@@ -315,7 +327,7 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index latin1</a
 <tr><th id="chap_cp_letter-Z">Z</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-z">z</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="chap_cp_letter-TH-3">�</th></tr>
+<tr><th id="chap_cp_letter-TH-4">�</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-TH">�</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 </table>
@@ -327,19 +339,23 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index latin1</a
  � 
 <a class="summary-letter-printindex" href="#chap_cp_symbol-4"><b>'</b></a>
  � 
-<a class="summary-letter-printindex" 
href="#chap_cp_symbol-5"><b>&ldquo;</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-5"><b>&quot;</b></a>
  � 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-6"><b>@</b></a>
+<a class="summary-letter-printindex" 
href="#chap_cp_symbol-6"><b>&ldquo;</b></a>
  � 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-7"><b>`</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-7"><b>@</b></a>
  � 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-8"><b>�</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-8"><b>`</b></a>
  � 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-9"><b>&ge;</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-9"><b>�</b></a>
  � 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-10"><b>0</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-10"><b>&ge;</b></a>
  � 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-11"><b>9</b></a>
+<a class="summary-letter-printindex" 
href="#chap_cp_symbol-11"><b>&euro;</b></a>
+ � 
+<a class="summary-letter-printindex" href="#chap_cp_symbol-12"><b>0</b></a>
+ � 
+<a class="summary-letter-printindex" href="#chap_cp_symbol-13"><b>9</b></a>
  � 
 <br>
 <a class="summary-letter-printindex" href="#chap_cp_letter-A"><b>A</b></a>
@@ -370,6 +386,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index latin1</a
  � 
 <a class="summary-letter-printindex" href="#chap_cp_letter-L"><b>L</b></a>
  � 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-L-3"><b>&#321;</b></a>
+ � 
 <a class="summary-letter-printindex" href="#chap_cp_letter-M"><b>M</b></a>
  � 
 <a class="summary-letter-printindex" href="#chap_cp_letter-N"><b>N</b></a>
@@ -400,7 +418,7 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index latin1</a
  � 
 <a class="summary-letter-printindex" href="#chap_cp_letter-Z"><b>Z</b></a>
  � 
-<a class="summary-letter-printindex" href="#chap_cp_letter-TH-3"><b>�</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_letter-TH-4"><b>�</b></a>
  � 
 </td></tr></table>
 </div>
diff --git 
a/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_info/encoding_index_latin1.info
 
b/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_info/encoding_index_latin1.info
index 2148becb82..5d56c11479 100644
Binary files 
a/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_info/encoding_index_latin1.info
 and 
b/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_info/encoding_index_latin1.info
 differ
diff --git 
a/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_plaintext/encoding_index_latin1_enable_encoding.txt
 
b/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_plaintext/encoding_index_latin1_enable_encoding.txt
index 3f9d0af875..ec49ef6ced 100644
--- 
a/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_plaintext/encoding_index_latin1_enable_encoding.txt
+++ 
b/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_plaintext/encoding_index_latin1_enable_encoding.txt
@@ -16,6 +16,7 @@ encoding index latin1
 * ' <1>:                                 chap.                  (line 3)
 * �:                                     chap.                  (line 3)
 * >=:                                    chap.                  (line 3)
+* Euro:                                  chap.                  (line 3)
 * 0:                                     chap.                  (line 3)
 * 9:                                     chap.                  (line 3)
 * a:                                     chap.                  (line 3)
@@ -28,7 +29,6 @@ encoding index latin1
 * �:                                     chap.                  (line 3)
 * e:                                     chap.                  (line 3)
 * � �:                                   chap.                  (line 3)
-* Euro:                                  chap.                  (line 3)
 * f:                                     chap.                  (line 3)
 * g:                                     chap.                  (line 3)
 * h:                                     chap.                  (line 3)
diff --git a/tp/t/results/indices/encoding_index_utf8.pl 
b/tp/t/results/indices/encoding_index_utf8.pl
index 19c4cf03e5..70605b806a 100644
--- a/tp/t/results/indices/encoding_index_utf8.pl
+++ b/tp/t/results/indices/encoding_index_utf8.pl
@@ -2828,58 +2828,58 @@ $result_indices_sort_strings{'encoding_index_utf8'} = {
     '-',
     '--',
     ',',
-    '!',
+    "\x{a1}",
     '\'',
     '"',
     '"',
     '"',
-    '"',
+    "\x{201c}",
     '@',
     '`',
-    '>=',
+    "\x{b0}",
+    "\x{2265}",
+    "\x{20ac}",
     '0',
     '9',
     'a',
     'A',
-    'AE',
+    "\x{c6}",
     'b',
     'B',
     'c',
     'd',
-    'D',
+    "\x{d0}",
     'e',
     "\x{e9} \x{e9}",
-    'Euro',
     'f',
     'g',
     'h',
     'i',
-    'i i (dotless)',
-    'i" i"i"i"',
-    'i^ i^ (dotless)',
-    'i^ i^i^i^i^',
+    "\x{131} \x{131} (dotless)",
+    "\x{ee} \x{ee} (dotless)",
+    "\x{ef} \x{ef}\x{ef}\x{ef}",
+    "\x{ee} \x{ee}\x{ee}\x{ee}\x{ee}",
     'j',
     'k',
     'l',
-    'l',
-    'L',
+    "\x{142}",
+    "\x{141}",
     'm',
     'n',
     'o',
-    'o',
     'p',
     'q',
     'r',
     's',
-    'ss',
+    "\x{df}",
     't',
-    'TH',
     'u',
     'v',
     'w',
     'x',
     'y',
-    'z'
+    'z',
+    "\x{de}"
   ]
 };
 
diff --git a/tp/t/results/indices/encoding_index_utf8/res_html/chap.html 
b/tp/t/results/indices/encoding_index_utf8/res_html/chap.html
index a867f3849e..99d96d2b88 100644
--- a/tp/t/results/indices/encoding_index_utf8/res_html/chap.html
+++ b/tp/t/results/indices/encoding_index_utf8/res_html/chap.html
@@ -102,27 +102,37 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index utf8</a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_symbol-4"><b>'</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" 
href="#chap_cp_symbol-5"><b>&ldquo;</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-5"><b>&quot;</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-6"><b>@</b></a>
+<a class="summary-letter-printindex" 
href="#chap_cp_symbol-6"><b>&ldquo;</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-7"><b>`</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-7"><b>@</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-8"><b>&ge;</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-8"><b>`</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-9"><b>0</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-9"><b>&deg;</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-10"><b>9</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-10"><b>&ge;</b></a>
+ &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_symbol-11"><b>&euro;</b></a>
+ &nbsp; 
+<a class="summary-letter-printindex" href="#chap_cp_symbol-12"><b>0</b></a>
+ &nbsp; 
+<a class="summary-letter-printindex" href="#chap_cp_symbol-13"><b>9</b></a>
  &nbsp; 
 <br>
 <a class="summary-letter-printindex" href="#chap_cp_letter-A"><b>A</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-AE-1"><b>&AElig;</b></a>
+ &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-B"><b>B</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-C"><b>C</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-D"><b>D</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-D-2"><b>&ETH;</b></a>
+ &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-E"><b>E</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-F"><b>F</b></a>
@@ -139,6 +149,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index utf8</a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-L"><b>L</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-L-3"><b>&#321;</b></a>
+ &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-M"><b>M</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-N"><b>N</b></a>
@@ -153,6 +165,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index utf8</a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-S"><b>S</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" href="#chap_cp_letter-SS"><b>SS</b></a>
+ &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-T"><b>T</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-U"><b>U</b></a>
@@ -167,6 +181,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index utf8</a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-Z"><b>Z</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-TH-4"><b>&THORN;</b></a>
+ &nbsp; 
 </td></tr></table>
 <table class="cp-entries-printindex" border="0">
 <tr><td></td><th class="entries-header-printindex">Index Entry</th><th 
class="sections-header-printindex">Section</th></tr>
@@ -184,30 +200,40 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index utf8</a>
 <tr><th id="chap_cp_symbol-4">'</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_0027">&rsquo;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="chap_cp_symbol-5">&ldquo;</th></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="#index-_201c">&ldquo;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><th id="chap_cp_symbol-5">&quot;</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_0060_0060">&ldquo;</a></td><td 
class="printindex-index-section"><a href="#chap">chap</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_0027_0027">&rdquo;</a></td><td 
class="printindex-index-section"><a href="#chap">chap</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_0022">&quot;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="chap_cp_symbol-6">@</th></tr>
+<tr><th id="chap_cp_symbol-6">&ldquo;</th></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-_201c">&ldquo;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_symbol-7">@</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_0040">@</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="chap_cp_symbol-7">`</th></tr>
+<tr><th id="chap_cp_symbol-8">`</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_0060">&lsquo;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="chap_cp_symbol-8">&ge;</th></tr>
+<tr><th id="chap_cp_symbol-9">&deg;</th></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-_00b0">&deg;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_symbol-10">&ge;</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-_003e_003d">&ge;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="chap_cp_symbol-9">0</th></tr>
+<tr><th id="chap_cp_symbol-11">&euro;</th></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-EUR">&euro;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_symbol-12">0</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-0">0</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="chap_cp_symbol-10">9</th></tr>
+<tr><th id="chap_cp_symbol-13">9</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-9">9</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-A">A</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-a">a</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-A">A</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_letter-AE-1">&AElig;</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-AE">&AElig;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-B">B</th></tr>
@@ -219,12 +245,13 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index utf8</a>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-D">D</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-d">d</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_letter-D-2">&ETH;</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-D">&ETH;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-E">E</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-e">e</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-e-e">é 
é</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="#index-EUR">&euro;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-F">F</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-f">f</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
@@ -238,8 +265,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index utf8</a>
 <tr><th id="chap_cp_letter-I">I</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-i">i</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-i-i-_0028dotless_0029">&inodot; &inodot; (dotless)</a></td><td 
class="printindex-index-section"><a href="#chap">chap</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a href="#index-i-iii">&iuml; 
&iuml;&iuml;&iuml;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</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 
class="printindex-index-section"><a href="#chap">chap</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-i-iii">&iuml; 
&iuml;&iuml;&iuml;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-i-iiii">&icirc; &icirc;&icirc;&icirc;&icirc;</a></td><td 
class="printindex-index-section"><a href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-J">J</th></tr>
@@ -250,6 +277,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index utf8</a>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-L">L</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-l">l</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_letter-L-3">&#321;</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-l-1">&#322;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-L">&#321;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
@@ -261,7 +290,6 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index utf8</a>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-O">O</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-o">o</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="#index-_00b0">&deg;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-P">P</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-p">p</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
@@ -274,11 +302,12 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index utf8</a>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-S">S</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-s">s</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_letter-SS">SS</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-ss">&szlig;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-T">T</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-t">t</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="#index-TH">&THORN;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="chap_cp_letter-U">U</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-u">u</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
@@ -298,6 +327,9 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index utf8</a>
 <tr><th id="chap_cp_letter-Z">Z</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-z">z</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
+<tr><th id="chap_cp_letter-TH-4">&THORN;</th></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-TH">&THORN;</a></td><td class="printindex-index-section"><a 
href="#chap">chap</a></td></tr>
+<tr><td colspan="3"><hr></td></tr>
 </table>
 <table class="cp-letters-footer-printindex"><tr><th>Jump to: &nbsp; 
</th><td><a class="summary-letter-printindex" 
href="#chap_cp_symbol-1"><b>-</b></a>
  &nbsp; 
@@ -307,27 +339,37 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index utf8</a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_symbol-4"><b>'</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" 
href="#chap_cp_symbol-5"><b>&ldquo;</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-5"><b>&quot;</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-6"><b>@</b></a>
+<a class="summary-letter-printindex" 
href="#chap_cp_symbol-6"><b>&ldquo;</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-7"><b>`</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-7"><b>@</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-8"><b>&ge;</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-8"><b>`</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-9"><b>0</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-9"><b>&deg;</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#chap_cp_symbol-10"><b>9</b></a>
+<a class="summary-letter-printindex" href="#chap_cp_symbol-10"><b>&ge;</b></a>
+ &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_symbol-11"><b>&euro;</b></a>
+ &nbsp; 
+<a class="summary-letter-printindex" href="#chap_cp_symbol-12"><b>0</b></a>
+ &nbsp; 
+<a class="summary-letter-printindex" href="#chap_cp_symbol-13"><b>9</b></a>
  &nbsp; 
 <br>
 <a class="summary-letter-printindex" href="#chap_cp_letter-A"><b>A</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-AE-1"><b>&AElig;</b></a>
+ &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-B"><b>B</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-C"><b>C</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-D"><b>D</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-D-2"><b>&ETH;</b></a>
+ &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-E"><b>E</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-F"><b>F</b></a>
@@ -344,6 +386,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index utf8</a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-L"><b>L</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-L-3"><b>&#321;</b></a>
+ &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-M"><b>M</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-N"><b>N</b></a>
@@ -358,6 +402,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index utf8</a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-S"><b>S</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" href="#chap_cp_letter-SS"><b>SS</b></a>
+ &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-T"><b>T</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-U"><b>U</b></a>
@@ -372,6 +418,8 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">encoding index utf8</a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#chap_cp_letter-Z"><b>Z</b></a>
  &nbsp; 
+<a class="summary-letter-printindex" 
href="#chap_cp_letter-TH-4"><b>&THORN;</b></a>
+ &nbsp; 
 </td></tr></table>
 </div>
 <hr>
diff --git 
a/tp/t/results/indices/encoding_index_utf8/res_info/encoding_index_utf8.info 
b/tp/t/results/indices/encoding_index_utf8/res_info/encoding_index_utf8.info
index b34f41a98a..da25599f60 100644
Binary files 
a/tp/t/results/indices/encoding_index_utf8/res_info/encoding_index_utf8.info 
and 
b/tp/t/results/indices/encoding_index_utf8/res_info/encoding_index_utf8.info 
differ
diff --git 
a/tp/t/results/indices/encoding_index_utf8/res_plaintext/encoding_index_utf8.txt
 
b/tp/t/results/indices/encoding_index_utf8/res_plaintext/encoding_index_utf8.txt
index 46559abde7..44483c2888 100644
--- 
a/tp/t/results/indices/encoding_index_utf8/res_plaintext/encoding_index_utf8.txt
+++ 
b/tp/t/results/indices/encoding_index_utf8/res_plaintext/encoding_index_utf8.txt
@@ -14,7 +14,9 @@ encoding index utf8
 * " <3>:                                 chap.                  (line 3)
 * @:                                     chap.                  (line 3)
 * ' <1>:                                 chap.                  (line 3)
+* o:                                     chap.                  (line 3)
 * >=:                                    chap.                  (line 3)
+* Euro:                                  chap.                  (line 3)
 * 0:                                     chap.                  (line 3)
 * 9:                                     chap.                  (line 3)
 * a:                                     chap.                  (line 3)
@@ -27,14 +29,13 @@ encoding index utf8
 * D:                                     chap.                  (line 3)
 * e:                                     chap.                  (line 3)
 * é é:                                   chap.                  (line 3)
-* Euro:                                  chap.                  (line 3)
 * f:                                     chap.                  (line 3)
 * g:                                     chap.                  (line 3)
 * h:                                     chap.                  (line 3)
 * i:                                     chap.                  (line 3)
 * i i (dotless):                         chap.                  (line 3)
-* i" i"i"i":                             chap.                  (line 3)
 * i^ i^ (dotless):                       chap.                  (line 3)
+* i" i"i"i":                             chap.                  (line 3)
 * i^ i^i^i^i^:                           chap.                  (line 3)
 * j:                                     chap.                  (line 3)
 * k:                                     chap.                  (line 3)
@@ -43,7 +44,6 @@ encoding index utf8
 * /L:                                    chap.                  (line 3)
 * m:                                     chap.                  (line 3)
 * n:                                     chap.                  (line 3)
-* o:                                     chap.                  (line 3)
 * o <1>:                                 chap.                  (line 3)
 * p:                                     chap.                  (line 3)
 * q:                                     chap.                  (line 3)
@@ -51,11 +51,11 @@ encoding index utf8
 * s:                                     chap.                  (line 3)
 * ss:                                    chap.                  (line 3)
 * t:                                     chap.                  (line 3)
-* TH:                                    chap.                  (line 3)
 * u:                                     chap.                  (line 3)
 * v:                                     chap.                  (line 3)
 * w:                                     chap.                  (line 3)
 * x:                                     chap.                  (line 3)
 * y:                                     chap.                  (line 3)
 * z:                                     chap.                  (line 3)
+* TH:                                    chap.                  (line 3)
 
diff --git a/tp/t/results/info_tests/test_index.pl 
b/tp/t/results/info_tests/test_index.pl
index 523eddc392..e75dc41082 100644
--- a/tp/t/results/info_tests/test_index.pl
+++ b/tp/t/results/info_tests/test_index.pl
@@ -3565,7 +3565,7 @@ $result_floats{'test_index'} = {};
 
 $result_indices_sort_strings{'test_index'} = {
   'cp' => [
-    '!',
+    "\x{a1}",
     '"',
     '@',
     'in Top',
diff --git a/tp/t/results/latex_tests/indices.pl 
b/tp/t/results/latex_tests/indices.pl
index 5d1925497c..94cacc6d7c 100644
--- a/tp/t/results/latex_tests/indices.pl
+++ b/tp/t/results/latex_tests/indices.pl
@@ -1281,13 +1281,13 @@ $result_indices_sort_strings{'indices'} = {
   'cp' => [
     '\\cmd',
     '\\some\\command for file',
-    'a!"@b "!@ a" o", a!"@b',
-    'a" o"',
+    "\x{e4} \x{f6}",
+    "a!\"\@b \"!\@ \x{e4} \x{f6}, a!\"\@b",
     'AA',
     'aa',
     'cmd',
     'i',
-    'i^',
+    "\x{ee}",
     'Z'
   ],
   'fn' => [
diff --git a/tp/t/results/latex_tests/indices_disable_encoding.pl 
b/tp/t/results/latex_tests/indices_disable_encoding.pl
index c0505c50ee..8f1412e3d2 100644
--- a/tp/t/results/latex_tests/indices_disable_encoding.pl
+++ b/tp/t/results/latex_tests/indices_disable_encoding.pl
@@ -1281,13 +1281,13 @@ 
$result_indices_sort_strings{'indices_disable_encoding'} = {
   'cp' => [
     '\\cmd',
     '\\some\\command for file',
-    'a!"@b "!@ a" o", a!"@b',
-    'a" o"',
+    "\x{e4} \x{f6}",
+    "a!\"\@b \"!\@ \x{e4} \x{f6}, a!\"\@b",
     'AA',
     'aa',
     'cmd',
     'i',
-    'i^',
+    "\x{ee}",
     'Z'
   ],
   'fn' => [
diff --git a/tp/t/results/macro/macro_in_index_commands.pl 
b/tp/t/results/macro/macro_in_index_commands.pl
index 46c5d9021c..7961cb4f9b 100644
--- a/tp/t/results/macro/macro_in_index_commands.pl
+++ b/tp/t/results/macro/macro_in_index_commands.pl
@@ -1421,7 +1421,7 @@ $result_floats{'macro_in_index_commands'} = {};
 
 $result_indices_sort_strings{'macro_in_index_commands'} = {
   'codeidx' => [
-    'a index entry te\' i^'
+    "a index entry t\x{e9} \x{ee}"
   ],
   'ky' => [
     'truc kindex'
diff --git a/tp/t/results/value/value_in_index_commands.pl 
b/tp/t/results/value/value_in_index_commands.pl
index c082c34102..bb288aae97 100644
--- a/tp/t/results/value/value_in_index_commands.pl
+++ b/tp/t/results/value/value_in_index_commands.pl
@@ -1175,7 +1175,7 @@ $result_floats{'value_in_index_commands'} = {};
 
 $result_indices_sort_strings{'value_in_index_commands'} = {
   'codeidx' => [
-    'a index entry te\' i^'
+    "a index entry t\x{e9} \x{ee}"
   ],
   'ky' => [
     'truc kindex'
[Prev in Thread]
Current Thread
[Next in Thread]
branch master updated: Make indices sorting independent of the output encodings, Patrice Dumas <=