texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: * tp/Texinfo/Structuring.pm (sort_indices): when


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/Structuring.pm (sort_indices): when splitting at letters, determine letters by removing diacritics to associate accented letters to the main letter.
Date: Mon, 26 Dec 2022 13:56:40 -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 558af3fedd * tp/Texinfo/Structuring.pm (sort_indices): when splitting 
at letters, determine letters by removing diacritics to associate accented 
letters to the main letter.
558af3fedd is described below

commit 558af3fedd689dc4d0235d98c7134d9856e32a01
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Dec 26 19:56:28 2022 +0100

    * tp/Texinfo/Structuring.pm (sort_indices): when splitting at letters,
    determine letters by removing diacritics to associate accented letters
    to the main letter.
---
 ChangeLog                                          |  6 ++++
 tp/Texinfo/Structuring.pm                          | 14 +++++++++-
 .../res_html/a-e-i-o-u-y-A-E-I-O-U.html            | 32 +++++++---------------
 .../char_latin1_utf8_in_refs/res_html/index.html   | 32 +++++++---------------
 .../char_latin2_latin2_in_refs/res_html/index.html |  2 +-
 .../sample_utf8/res_html/Index-node.html           | 12 ++++----
 .../encoding_index_latin1/res_html/index.html      |  8 +-----
 .../res_html/index.html                            | 22 ++-------------
 .../encoding_index_utf8/res_html/index.html        |  8 +-----
 .../res_html/index.html                            | 20 +-------------
 tp/t/test_sort.t                                   |  6 ++--
 .../char_latin1_latin1_in_refs.html                | 32 +++++++---------------
 .../char_latin1_utf8_in_refs.html                  | 32 +++++++---------------
 13 files changed, 75 insertions(+), 151 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2f2db9a9cb..42d964b56d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022-12-26  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Structuring.pm (sort_indices): when splitting at letters,
+       determine letters by removing diacritics to associate accented letters
+       to the main letter.
+
 2022-12-26  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Structuring.pm (setup_index_entry_keys_formatting): set
diff --git a/tp/Texinfo/Structuring.pm b/tp/Texinfo/Structuring.pm
index 10523e57d3..3b42890358 100644
--- a/tp/Texinfo/Structuring.pm
+++ b/tp/Texinfo/Structuring.pm
@@ -34,6 +34,7 @@ use strict;
 use Carp qw(cluck confess);
 
 use Unicode::Collate;
+use Unicode::Normalize;
 
 # for %root_commands
 use Texinfo::Commands;
@@ -1858,7 +1859,18 @@ sub sort_indices($$$;$)
       } else {
         push @entry_keys, $entry_key;
         if ($sort_by_letter) {
-          $letter = uc(substr($entry_key, 0, 1));
+          # the following line leads to each accented letter being separate
+          # $letter = uc(substr($entry_key, 0, 1));
+          my $letter_string = uc(substr($entry_key, 0, 1));
+          # determine main letter by decomposing and removing diacritics
+          $letter = Unicode::Normalize::NFKD($letter_string);
+          $letter =~ s/\p{NonspacingMark}//g;
+          # following code is less good, as the upper-casing may lead to
+          # two letters in case of the german Eszett that becomes SS.  So
+          # it is better to upper-case first and remove diacritics after.
+          #my $normalized_string = Unicode::Normalize::NFKD(uc($entry_key));
+          #$normalized_string =~ s/\p{NonspacingMark}//g;
+          #$letter = substr($normalized_string, 0, 1);
         }
       }
       my $subentry_nr = 0;
diff --git 
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
 
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
index 07d730bc29..3b05d09187 100644
--- 
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
+++ 
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
@@ -39,46 +39,34 @@ Next: <a href="e.html" accesskey="n" rel="next">
 <h2 class="chapter" id="a-e-i-o-u-y-A-E-I-O-U">1 � � � � � � � � � � �</h2>
 
 <div class="printindex cp-printindex">
-<table class="cp-letters-header-printindex"><tr><th>Jump to: &nbsp; 
</th><td><a class="summary-letter-printindex" 
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-�"><b>�</b></a>
+<table class="cp-letters-header-printindex"><tr><th>Jump to: &nbsp; 
</th><td><a class="summary-letter-printindex" 
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-A"><b>A</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" 
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-�"><b>�</b></a>
+<a class="summary-letter-printindex" 
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-C"><b>C</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" 
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-�"><b>�</b></a>
- &nbsp; 
-<a class="summary-letter-printindex" 
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-�"><b>�</b></a>
- &nbsp; 
-<a class="summary-letter-printindex" 
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-�"><b>�</b></a>
+<a class="summary-letter-printindex" 
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-E"><b>E</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>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th 
id="g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-�">�</th></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="c.html#index-a-e-i-o-u-A-E-I-O-U">� � � � � � � � � �</a></td><td 
class="printindex-index-section"><a href="c.html">�</a></td></tr>
-<tr><td colspan="3"><hr></td></tr>
-<tr><th 
id="g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-�">�</th></tr>
+<tr><th 
id="g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-A">A</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="c.html#index-A-E-I-O-U">� � � � �</a></td><td 
class="printindex-index-section"><a href="c.html">�</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="c.html#index-a-e-i-o-u-A-E-I-O-U">� � � � � � � � � �</a></td><td 
class="printindex-index-section"><a href="c.html">�</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="c.html#index-a-e-i-o-u-y">� � � � � �</a></td><td 
class="printindex-index-section"><a href="c.html">�</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th 
id="g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-�">�</th></tr>
+<tr><th 
id="g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-C">C</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="c.html#index-c">�</a></td><td class="printindex-index-section"><a 
href="c.html">�</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th 
id="g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-�">�</th></tr>
+<tr><th 
id="g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-E">E</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="c.html#index-e">�</a></td><td class="printindex-index-section"><a 
href="c.html">�</a></td></tr>
-<tr><td colspan="3"><hr></td></tr>
-<tr><th 
id="g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-�">�</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="c.html#index-e-1">�</a></td><td class="printindex-index-section"><a 
href="c.html">�</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="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-�"><b>�</b></a>
- &nbsp; 
-<a class="summary-letter-printindex" 
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-�"><b>�</b></a>
- &nbsp; 
-<a class="summary-letter-printindex" 
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-�"><b>�</b></a>
+<table class="cp-letters-footer-printindex"><tr><th>Jump to: &nbsp; 
</th><td><a class="summary-letter-printindex" 
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-A"><b>A</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" 
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-�"><b>�</b></a>
+<a class="summary-letter-printindex" 
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-C"><b>C</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" 
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-�"><b>�</b></a>
+<a class="summary-letter-printindex" 
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-E"><b>E</b></a>
  &nbsp; 
 </td></tr></table>
 </div>
diff --git 
a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/index.html 
b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/index.html
index 2d9de81c38..7bef4953e2 100644
--- 
a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/index.html
+++ 
b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/index.html
@@ -38,46 +38,34 @@ Next: <a href="a-e-i-o-u-y-A-E-I-O-U.html" accesskey="n" 
rel="next">ä ë ï ö
 <h1 class="top" id="char-latin1-utf8-in-refs">char latin1 utf8 in refs</h1>
 
 <div class="printindex cp-printindex">
-<table class="cp-letters-header-printindex"><tr><th>Jump to: &nbsp; 
</th><td><a class="summary-letter-printindex" 
href="#Top_cp_letter-Â"><b>Â</b></a>
+<table class="cp-letters-header-printindex"><tr><th>Jump to: &nbsp; 
</th><td><a class="summary-letter-printindex" 
href="#Top_cp_letter-A"><b>A</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#Top_cp_letter-Ä"><b>Ä</b></a>
+<a class="summary-letter-printindex" href="#Top_cp_letter-C"><b>C</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#Top_cp_letter-Ç"><b>Ç</b></a>
- &nbsp; 
-<a class="summary-letter-printindex" href="#Top_cp_letter-É"><b>É</b></a>
- &nbsp; 
-<a class="summary-letter-printindex" href="#Top_cp_letter-È"><b>È</b></a>
+<a class="summary-letter-printindex" href="#Top_cp_letter-E"><b>E</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>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="Top_cp_letter-Â">Â</th></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="c.html#index-a-e-i-o-u-A-E-I-O-U">â ê î ô û Â Ê Î Ô Û</a></td><td 
class="printindex-index-section"><a href="c.html">ç</a></td></tr>
-<tr><td colspan="3"><hr></td></tr>
-<tr><th id="Top_cp_letter-Ä">Ä</th></tr>
+<tr><th id="Top_cp_letter-A">A</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="c.html#index-A-E-I-O-U">Ä Ë Ï Ö Ü</a></td><td 
class="printindex-index-section"><a href="c.html">ç</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="c.html#index-a-e-i-o-u-A-E-I-O-U">â ê î ô û Â Ê Î Ô Û</a></td><td 
class="printindex-index-section"><a href="c.html">ç</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="c.html#index-a-e-i-o-u-y">ä ë ï ö ü ÿ</a></td><td 
class="printindex-index-section"><a href="c.html">ç</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="Top_cp_letter-Ç">Ç</th></tr>
+<tr><th id="Top_cp_letter-C">C</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="c.html#index-c">ç</a></td><td class="printindex-index-section"><a 
href="c.html">ç</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="Top_cp_letter-É">É</th></tr>
+<tr><th id="Top_cp_letter-E">E</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="c.html#index-e">é</a></td><td class="printindex-index-section"><a 
href="c.html">ç</a></td></tr>
-<tr><td colspan="3"><hr></td></tr>
-<tr><th id="Top_cp_letter-È">È</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="c.html#index-e-1">è</a></td><td class="printindex-index-section"><a 
href="c.html">ç</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="#Top_cp_letter-Â"><b>Â</b></a>
- &nbsp; 
-<a class="summary-letter-printindex" href="#Top_cp_letter-Ä"><b>Ä</b></a>
- &nbsp; 
-<a class="summary-letter-printindex" href="#Top_cp_letter-Ç"><b>Ç</b></a>
+<table class="cp-letters-footer-printindex"><tr><th>Jump to: &nbsp; 
</th><td><a class="summary-letter-printindex" 
href="#Top_cp_letter-A"><b>A</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#Top_cp_letter-É"><b>É</b></a>
+<a class="summary-letter-printindex" href="#Top_cp_letter-C"><b>C</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#Top_cp_letter-È"><b>È</b></a>
+<a class="summary-letter-printindex" href="#Top_cp_letter-E"><b>E</b></a>
  &nbsp; 
 </td></tr></table>
 </div>
diff --git 
a/tp/t/results/formats_encodings/char_latin2_latin2_in_refs/res_html/index.html 
b/tp/t/results/formats_encodings/char_latin2_latin2_in_refs/res_html/index.html
index 2b15361a1b..7b44944c1e 100644
--- 
a/tp/t/results/formats_encodings/char_latin2_latin2_in_refs/res_html/index.html
+++ 
b/tp/t/results/formats_encodings/char_latin2_latin2_in_refs/res_html/index.html
@@ -43,7 +43,7 @@ Next: <a href="A-a-_002c-E-e.html" accesskey="n" rel="next">
 <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>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="Top_cp_letter-�">�</th></tr>
+<tr><th id="Top_cp_letter-A">A</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="A-a-_002c-E-e.html#index-A-a-_002c-E-e">� � � � �</a></td><td 
class="printindex-index-section"><a href="A-a-_002c-E-e.html">� � � � 
�</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 </table>
diff --git 
a/tp/t/results/formats_encodings/sample_utf8/res_html/Index-node.html 
b/tp/t/results/formats_encodings/sample_utf8/res_html/Index-node.html
index 61b2905d64..a5c4a463d1 100644
--- a/tp/t/results/formats_encodings/sample_utf8/res_html/Index-node.html
+++ b/tp/t/results/formats_encodings/sample_utf8/res_html/Index-node.html
@@ -43,11 +43,11 @@ Previous: <a href="Second-Chapter-AE-AE-ae-ae.html" 
accesskey="p" rel="prev">Cha
 <h2 class="unnumbered" id="Index">Index</h2>
 
 <div class="printindex cp-printindex">
-<table class="cp-letters-header-printindex"><tr><th>Jump to: &nbsp; 
</th><td><a class="summary-letter-printindex" 
href="#Index-node_cp_letter-Ą"><b>Ą</b></a>
+<table class="cp-letters-header-printindex"><tr><th>Jump to: &nbsp; 
</th><td><a class="summary-letter-printindex" 
href="#Index-node_cp_letter-A"><b>A</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" 
href="#Index-node_cp_letter-C"><b>C</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" 
href="#Index-node_cp_letter-É"><b>É</b></a>
+<a class="summary-letter-printindex" 
href="#Index-node_cp_letter-E"><b>E</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" 
href="#Index-node_cp_letter-另"><b>另</b></a>
  &nbsp; 
@@ -55,24 +55,24 @@ Previous: <a href="Second-Chapter-AE-AE-ae-ae.html" 
accesskey="p" rel="prev">Cha
 <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>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="Index-node_cp_letter-Ą">Ą</th></tr>
+<tr><th id="Index-node_cp_letter-A">A</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="DiYiZhang_0028First-Chapter_0029.html#index-AE-ae-ae">ĄĘ ae 
ąę</a></td><td class="printindex-index-section"><a 
href="DiYiZhang_0028First-Chapter_0029.html">第一章(First Chapter)</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="Index-node_cp_letter-C">C</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="DiYiZhang_0028First-Chapter_0029.html#index-chapter_002c-first">chapter, 
first</a></td><td class="printindex-index-section"><a 
href="DiYiZhang_0028First-Chapter_0029.html">第一章(First Chapter)</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="Index-node_cp_letter-É">É</th></tr>
+<tr><th id="Index-node_cp_letter-E">E</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="DiYiZhang_0028First-Chapter_0029.html#index-e-A">é Â</a></td><td 
class="printindex-index-section"><a 
href="DiYiZhang_0028First-Chapter_0029.html">第一章(First Chapter)</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="Index-node_cp_letter-另">另</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="DiYiZhang_0028First-Chapter_0029.html#index-LingYiGe_002cindex-entry">另一个,index
 entry</a></td><td class="printindex-index-section"><a 
href="DiYiZhang_0028First-Chapter_0029.html">第一章(First Chapter)</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="#Index-node_cp_letter-Ą"><b>Ą</b></a>
+<table class="cp-letters-footer-printindex"><tr><th>Jump to: &nbsp; 
</th><td><a class="summary-letter-printindex" 
href="#Index-node_cp_letter-A"><b>A</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" 
href="#Index-node_cp_letter-C"><b>C</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" 
href="#Index-node_cp_letter-É"><b>É</b></a>
+<a class="summary-letter-printindex" 
href="#Index-node_cp_letter-E"><b>E</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" 
href="#Index-node_cp_letter-另"><b>另</b></a>
  &nbsp; 
diff --git a/tp/t/results/indices/encoding_index_latin1/res_html/index.html 
b/tp/t/results/indices/encoding_index_latin1/res_html/index.html
index dc048acf29..f4feab7cbc 100644
--- a/tp/t/results/indices/encoding_index_latin1/res_html/index.html
+++ b/tp/t/results/indices/encoding_index_latin1/res_html/index.html
@@ -119,8 +119,6 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
  &nbsp; 
 <a class="summary-letter-printindex" href="#Top_cp_letter-E"><b>E</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#Top_cp_letter-�"><b>�</b></a>
- &nbsp; 
 <a class="summary-letter-printindex" href="#Top_cp_letter-F"><b>F</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#Top_cp_letter-G"><b>G</b></a>
@@ -219,10 +217,8 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="Top_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="#Top">Top</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="#index-_20ac">&euro;</a></td><td class="printindex-index-section"><a 
href="#Top">Top</a></td></tr>
-<tr><td colspan="3"><hr></td></tr>
-<tr><th id="Top_cp_letter-�">�</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-e-e">� 
�</a></td><td class="printindex-index-section"><a href="#Top">Top</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-_20ac">&euro;</a></td><td class="printindex-index-section"><a 
href="#Top">Top</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="Top_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="#Top">Top</a></td></tr>
@@ -328,8 +324,6 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
  &nbsp; 
 <a class="summary-letter-printindex" href="#Top_cp_letter-E"><b>E</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#Top_cp_letter-�"><b>�</b></a>
- &nbsp; 
 <a class="summary-letter-printindex" href="#Top_cp_letter-F"><b>F</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#Top_cp_letter-G"><b>G</b></a>
diff --git 
a/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_html/index.html
 
b/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_html/index.html
index 512a8235be..af29a79cad 100644
--- 
a/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_html/index.html
+++ 
b/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_html/index.html
@@ -125,8 +125,6 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
  � 
 <a class="summary-letter-printindex" href="#Top_cp_letter-E"><b>E</b></a>
  � 
-<a class="summary-letter-printindex" href="#Top_cp_letter-�"><b>�</b></a>
- � 
 <a class="summary-letter-printindex" href="#Top_cp_letter-F"><b>F</b></a>
  � 
 <a class="summary-letter-printindex" href="#Top_cp_letter-G"><b>G</b></a>
@@ -135,10 +133,6 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
  � 
 <a class="summary-letter-printindex" href="#Top_cp_letter-I"><b>I</b></a>
  � 
-<a class="summary-letter-printindex" href="#Top_cp_letter-�"><b>�</b></a>
- � 
-<a class="summary-letter-printindex" href="#Top_cp_letter-�"><b>�</b></a>
- � 
 <a class="summary-letter-printindex" href="#Top_cp_letter-J"><b>J</b></a>
  � 
 <a class="summary-letter-printindex" href="#Top_cp_letter-K"><b>K</b></a>
@@ -240,10 +234,8 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="Top_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="#Top">Top</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="#index-_20ac">&euro;</a></td><td class="printindex-index-section"><a 
href="#Top">Top</a></td></tr>
-<tr><td colspan="3"><hr></td></tr>
-<tr><th id="Top_cp_letter-�">�</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-e-e">� 
�</a></td><td class="printindex-index-section"><a href="#Top">Top</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-_20ac">&euro;</a></td><td class="printindex-index-section"><a 
href="#Top">Top</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="Top_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="#Top">Top</a></td></tr>
@@ -257,13 +249,9 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 <tr><th id="Top_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="#Top">Top</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-i-i-_0028dotless_0029">&inodot; &inodot; (dotless)</a></td><td 
class="printindex-index-section"><a href="#Top">Top</a></td></tr>
-<tr><td colspan="3"><hr></td></tr>
-<tr><th id="Top_cp_letter-�">�</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-i-i-_0028dotless_0029-1">� � (dotless)</a></td><td 
class="printindex-index-section"><a href="#Top">Top</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a href="#index-i-iiii">� 
����</a></td><td class="printindex-index-section"><a 
href="#Top">Top</a></td></tr>
-<tr><td colspan="3"><hr></td></tr>
-<tr><th id="Top_cp_letter-�">�</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-i-iii">� 
���</a></td><td class="printindex-index-section"><a 
href="#Top">Top</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-i-iiii">� 
����</a></td><td class="printindex-index-section"><a 
href="#Top">Top</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="Top_cp_letter-J">J</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-j">j</a></td><td class="printindex-index-section"><a 
href="#Top">Top</a></td></tr>
@@ -362,8 +350,6 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
  � 
 <a class="summary-letter-printindex" href="#Top_cp_letter-E"><b>E</b></a>
  � 
-<a class="summary-letter-printindex" href="#Top_cp_letter-�"><b>�</b></a>
- � 
 <a class="summary-letter-printindex" href="#Top_cp_letter-F"><b>F</b></a>
  � 
 <a class="summary-letter-printindex" href="#Top_cp_letter-G"><b>G</b></a>
@@ -372,10 +358,6 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
  � 
 <a class="summary-letter-printindex" href="#Top_cp_letter-I"><b>I</b></a>
  � 
-<a class="summary-letter-printindex" href="#Top_cp_letter-�"><b>�</b></a>
- � 
-<a class="summary-letter-printindex" href="#Top_cp_letter-�"><b>�</b></a>
- � 
 <a class="summary-letter-printindex" href="#Top_cp_letter-J"><b>J</b></a>
  � 
 <a class="summary-letter-printindex" href="#Top_cp_letter-K"><b>K</b></a>
diff --git a/tp/t/results/indices/encoding_index_utf8/res_html/index.html 
b/tp/t/results/indices/encoding_index_utf8/res_html/index.html
index ad908ae7f5..dab9267856 100644
--- a/tp/t/results/indices/encoding_index_utf8/res_html/index.html
+++ b/tp/t/results/indices/encoding_index_utf8/res_html/index.html
@@ -119,8 +119,6 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
  &nbsp; 
 <a class="summary-letter-printindex" href="#Top_cp_letter-E"><b>E</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#Top_cp_letter-É"><b>É</b></a>
- &nbsp; 
 <a class="summary-letter-printindex" href="#Top_cp_letter-F"><b>F</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#Top_cp_letter-G"><b>G</b></a>
@@ -219,10 +217,8 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="Top_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="#Top">Top</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="#index-_20ac">&euro;</a></td><td class="printindex-index-section"><a 
href="#Top">Top</a></td></tr>
-<tr><td colspan="3"><hr></td></tr>
-<tr><th id="Top_cp_letter-É">É</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-e-e">é 
é</a></td><td class="printindex-index-section"><a href="#Top">Top</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-_20ac">&euro;</a></td><td class="printindex-index-section"><a 
href="#Top">Top</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="Top_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="#Top">Top</a></td></tr>
@@ -328,8 +324,6 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
  &nbsp; 
 <a class="summary-letter-printindex" href="#Top_cp_letter-E"><b>E</b></a>
  &nbsp; 
-<a class="summary-letter-printindex" href="#Top_cp_letter-É"><b>É</b></a>
- &nbsp; 
 <a class="summary-letter-printindex" href="#Top_cp_letter-F"><b>F</b></a>
  &nbsp; 
 <a class="summary-letter-printindex" href="#Top_cp_letter-G"><b>G</b></a>
diff --git 
a/tp/t/results/indices/encoding_index_utf8_enable_encoding/res_html/index.html 
b/tp/t/results/indices/encoding_index_utf8_enable_encoding/res_html/index.html
index 7c13b2152a..168d427dcd 100644
--- 
a/tp/t/results/indices/encoding_index_utf8_enable_encoding/res_html/index.html
+++ 
b/tp/t/results/indices/encoding_index_utf8_enable_encoding/res_html/index.html
@@ -127,8 +127,6 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
    
 <a class="summary-letter-printindex" href="#Top_cp_letter-E"><b>E</b></a>
    
-<a class="summary-letter-printindex" href="#Top_cp_letter-É"><b>É</b></a>
-   
 <a class="summary-letter-printindex" href="#Top_cp_letter-F"><b>F</b></a>
    
 <a class="summary-letter-printindex" href="#Top_cp_letter-G"><b>G</b></a>
@@ -137,10 +135,6 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
    
 <a class="summary-letter-printindex" href="#Top_cp_letter-I"><b>I</b></a>
    
-<a class="summary-letter-printindex" href="#Top_cp_letter-Î"><b>Î</b></a>
-   
-<a class="summary-letter-printindex" href="#Top_cp_letter-Ï"><b>Ï</b></a>
-   
 <a class="summary-letter-printindex" href="#Top_cp_letter-J"><b>J</b></a>
    
 <a class="summary-letter-printindex" href="#Top_cp_letter-K"><b>K</b></a>
@@ -247,8 +241,6 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="Top_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="#Top">Top</a></td></tr>
-<tr><td colspan="3"><hr></td></tr>
-<tr><th id="Top_cp_letter-É">É</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-e-e">é 
é</a></td><td class="printindex-index-section"><a href="#Top">Top</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="Top_cp_letter-F">F</th></tr>
@@ -263,13 +255,9 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
 <tr><th id="Top_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="#Top">Top</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-i-i-_0028dotless_0029">ı ı (dotless)</a></td><td 
class="printindex-index-section"><a href="#Top">Top</a></td></tr>
-<tr><td colspan="3"><hr></td></tr>
-<tr><th id="Top_cp_letter-Î">Î</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-i-i-_0028dotless_0029-1">î î (dotless)</a></td><td 
class="printindex-index-section"><a href="#Top">Top</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a href="#index-i-iiii">î 
îîîî</a></td><td class="printindex-index-section"><a 
href="#Top">Top</a></td></tr>
-<tr><td colspan="3"><hr></td></tr>
-<tr><th id="Top_cp_letter-Ï">Ï</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-i-iii">ï 
ïïï</a></td><td class="printindex-index-section"><a 
href="#Top">Top</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-i-iiii">î 
îîîî</a></td><td class="printindex-index-section"><a 
href="#Top">Top</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 <tr><th id="Top_cp_letter-J">J</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-j">j</a></td><td class="printindex-index-section"><a 
href="#Top">Top</a></td></tr>
@@ -372,8 +360,6 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
    
 <a class="summary-letter-printindex" href="#Top_cp_letter-E"><b>E</b></a>
    
-<a class="summary-letter-printindex" href="#Top_cp_letter-É"><b>É</b></a>
-   
 <a class="summary-letter-printindex" href="#Top_cp_letter-F"><b>F</b></a>
    
 <a class="summary-letter-printindex" href="#Top_cp_letter-G"><b>G</b></a>
@@ -382,10 +368,6 @@ th.sections-header-printindex {text-align:left; 
padding-left: 1em}
    
 <a class="summary-letter-printindex" href="#Top_cp_letter-I"><b>I</b></a>
    
-<a class="summary-letter-printindex" href="#Top_cp_letter-Î"><b>Î</b></a>
-   
-<a class="summary-letter-printindex" href="#Top_cp_letter-Ï"><b>Ï</b></a>
-   
 <a class="summary-letter-printindex" href="#Top_cp_letter-J"><b>J</b></a>
    
 <a class="summary-letter-printindex" href="#Top_cp_letter-K"><b>K</b></a>
diff --git a/tp/t/test_sort.t b/tp/t/test_sort.t
index 9d7771d21b..14eb506aa6 100644
--- a/tp/t/test_sort.t
+++ b/tp/t/test_sort.t
@@ -72,8 +72,10 @@ my @letter_entries_ref = (
    {'!' => [ '!' ]},
    {'"' => [ '"' ]},
    {'A' => [ 'aaaaaaaaaaaa' ]},
-   {'E' => [ 'e', 'E']},
-   {'Ẽ' => [ 'ẽ' ]},
+# result with accented letters separate
+#   {'E' => [ 'e', 'E']},
+#   {'Ẽ' => [ 'ẽ' ]},
+   {'E' => [ 'e', 'E', 'ẽ' ]},
    {'Ł' => [ 'ł' ]},
 );
  
diff --git 
a/tp/tests/many_input_files/different_encodings_res/char_latin1_latin1_in_refs.html
 
b/tp/tests/many_input_files/different_encodings_res/char_latin1_latin1_in_refs.html
index 8674ae39f7..b663ebbdd7 100644
--- 
a/tp/tests/many_input_files/different_encodings_res/char_latin1_latin1_in_refs.html
+++ 
b/tp/tests/many_input_files/different_encodings_res/char_latin1_latin1_in_refs.html
@@ -54,46 +54,34 @@ Next: <a href="#g_t_00e9" accesskey="n" rel="next">
 <h2 class="chapter" id="a-e-i-o-u-y-A-E-I-O-U">1 � � � � � � � � � � �</h2>
 
 <div class="printindex cp-printindex">
-<table class="cp-letters-header-printindex"><tr><th>Jump to: � </th><td><a 
class="summary-letter-printindex" 
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-�"><b>�</b></a>
+<table class="cp-letters-header-printindex"><tr><th>Jump to: � </th><td><a 
class="summary-letter-printindex" 
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-A"><b>A</b></a>
  � 
-<a class="summary-letter-printindex" 
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-�"><b>�</b></a>
+<a class="summary-letter-printindex" 
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-C"><b>C</b></a>
  � 
-<a class="summary-letter-printindex" 
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-�"><b>�</b></a>
- � 
-<a class="summary-letter-printindex" 
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-�"><b>�</b></a>
- � 
-<a class="summary-letter-printindex" 
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-�"><b>�</b></a>
+<a class="summary-letter-printindex" 
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-E"><b>E</b></a>
  � 
 </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>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th 
id="g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-�">�</th></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="#index-a-e-i-o-u-A-E-I-O-U">� � � � � � � � � �</a></td><td 
class="printindex-index-section"><a href="#g_t_00e7">�</a></td></tr>
-<tr><td colspan="3"><hr></td></tr>
-<tr><th 
id="g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-�">�</th></tr>
+<tr><th 
id="g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-A">A</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-A-E-I-O-U">� � 
� � �</a></td><td class="printindex-index-section"><a 
href="#g_t_00e7">�</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-a-e-i-o-u-A-E-I-O-U">� � � � � � � � � �</a></td><td 
class="printindex-index-section"><a href="#g_t_00e7">�</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-a-e-i-o-u-y">� 
� � � � �</a></td><td class="printindex-index-section"><a 
href="#g_t_00e7">�</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th 
id="g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-�">�</th></tr>
+<tr><th 
id="g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-C">C</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-c">�</a></td><td class="printindex-index-section"><a 
href="#g_t_00e7">�</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th 
id="g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-�">�</th></tr>
+<tr><th 
id="g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-E">E</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-e">�</a></td><td class="printindex-index-section"><a 
href="#g_t_00e7">�</a></td></tr>
-<tr><td colspan="3"><hr></td></tr>
-<tr><th 
id="g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-�">�</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-e-1">�</a></td><td class="printindex-index-section"><a 
href="#g_t_00e7">�</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 </table>
-<table class="cp-letters-footer-printindex"><tr><th>Jump to: � </th><td><a 
class="summary-letter-printindex" 
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-�"><b>�</b></a>
- � 
-<a class="summary-letter-printindex" 
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-�"><b>�</b></a>
- � 
-<a class="summary-letter-printindex" 
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-�"><b>�</b></a>
+<table class="cp-letters-footer-printindex"><tr><th>Jump to: � </th><td><a 
class="summary-letter-printindex" 
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-A"><b>A</b></a>
  � 
-<a class="summary-letter-printindex" 
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-�"><b>�</b></a>
+<a class="summary-letter-printindex" 
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-C"><b>C</b></a>
  � 
-<a class="summary-letter-printindex" 
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-�"><b>�</b></a>
+<a class="summary-letter-printindex" 
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc_cp_letter-E"><b>E</b></a>
  � 
 </td></tr></table>
 </div>
diff --git 
a/tp/tests/many_input_files/different_encodings_res/char_latin1_utf8_in_refs.html
 
b/tp/tests/many_input_files/different_encodings_res/char_latin1_utf8_in_refs.html
index 82f1de41cf..9c9b0df778 100644
--- 
a/tp/tests/many_input_files/different_encodings_res/char_latin1_utf8_in_refs.html
+++ 
b/tp/tests/many_input_files/different_encodings_res/char_latin1_utf8_in_refs.html
@@ -38,46 +38,34 @@ Next: <a 
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_
 <h1 class="top" id="char-latin1-utf8-in-refs">char latin1 utf8 in refs</h1>
 
 <div class="printindex cp-printindex">
-<table class="cp-letters-header-printindex"><tr><th>Jump to:   </th><td><a 
class="summary-letter-printindex" href="#Top_cp_letter-Â"><b>Â</b></a>
+<table class="cp-letters-header-printindex"><tr><th>Jump to:   </th><td><a 
class="summary-letter-printindex" href="#Top_cp_letter-A"><b>A</b></a>
    
-<a class="summary-letter-printindex" href="#Top_cp_letter-Ä"><b>Ä</b></a>
+<a class="summary-letter-printindex" href="#Top_cp_letter-C"><b>C</b></a>
    
-<a class="summary-letter-printindex" href="#Top_cp_letter-Ç"><b>Ç</b></a>
-   
-<a class="summary-letter-printindex" href="#Top_cp_letter-É"><b>É</b></a>
-   
-<a class="summary-letter-printindex" href="#Top_cp_letter-È"><b>È</b></a>
+<a class="summary-letter-printindex" href="#Top_cp_letter-E"><b>E</b></a>
    
 </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>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="Top_cp_letter-Â">Â</th></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="#index-a-e-i-o-u-A-E-I-O-U">â ê î ô û Â Ê Î Ô Û</a></td><td 
class="printindex-index-section"><a href="#g_t_00e7">ç</a></td></tr>
-<tr><td colspan="3"><hr></td></tr>
-<tr><th id="Top_cp_letter-Ä">Ä</th></tr>
+<tr><th id="Top_cp_letter-A">A</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-A-E-I-O-U">Ä Ë 
Ï Ö Ü</a></td><td class="printindex-index-section"><a 
href="#g_t_00e7">ç</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-a-e-i-o-u-A-E-I-O-U">â ê î ô û Â Ê Î Ô Û</a></td><td 
class="printindex-index-section"><a href="#g_t_00e7">ç</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-a-e-i-o-u-y">ä 
ë ï ö ü ÿ</a></td><td class="printindex-index-section"><a 
href="#g_t_00e7">ç</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="Top_cp_letter-Ç">Ç</th></tr>
+<tr><th id="Top_cp_letter-C">C</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-c">ç</a></td><td class="printindex-index-section"><a 
href="#g_t_00e7">ç</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><th id="Top_cp_letter-É">É</th></tr>
+<tr><th id="Top_cp_letter-E">E</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-e">é</a></td><td class="printindex-index-section"><a 
href="#g_t_00e7">ç</a></td></tr>
-<tr><td colspan="3"><hr></td></tr>
-<tr><th id="Top_cp_letter-È">È</th></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-e-1">è</a></td><td class="printindex-index-section"><a 
href="#g_t_00e7">ç</a></td></tr>
 <tr><td colspan="3"><hr></td></tr>
 </table>
-<table class="cp-letters-footer-printindex"><tr><th>Jump to:   </th><td><a 
class="summary-letter-printindex" href="#Top_cp_letter-Â"><b>Â</b></a>
-   
-<a class="summary-letter-printindex" href="#Top_cp_letter-Ä"><b>Ä</b></a>
-   
-<a class="summary-letter-printindex" href="#Top_cp_letter-Ç"><b>Ç</b></a>
+<table class="cp-letters-footer-printindex"><tr><th>Jump to:   </th><td><a 
class="summary-letter-printindex" href="#Top_cp_letter-A"><b>A</b></a>
    
-<a class="summary-letter-printindex" href="#Top_cp_letter-É"><b>É</b></a>
+<a class="summary-letter-printindex" href="#Top_cp_letter-C"><b>C</b></a>
    
-<a class="summary-letter-printindex" href="#Top_cp_letter-È"><b>È</b></a>
+<a class="summary-letter-printindex" href="#Top_cp_letter-E"><b>E</b></a>
    
 </td></tr></table>
 </div>



reply via email to

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