texinfo-commits
[Top][All Lists]
Advanced

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

[no subject]


From: Patrice Dumas
Date: Thu, 18 Aug 2022 14:37:04 -0400 (EDT)

branch: master
commit e08fcb07ecf9e40f5d6a017e909effc24dfd1d9e
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Aug 18 20:34:44 2022 +0200

    Multiple consecutive space transformed to one in node normalization
    
    * tp/Texinfo/Convert/NodeNameNormalization.pm (_unicode_to_protected)
    (_unicode_to_file_name): transform multiple spaces to one.
---
 ChangeLog                                          |  7 +++
 tp/Texinfo/Convert/NodeNameNormalization.pm        |  4 +-
 tp/t/nodenormalization.t                           |  6 +-
 .../converters_tests/spaces_in_empty_node_names.pl | 10 +--
 .../converters_tests/spaces_in_node_names.pl       | 28 ++++-----
 .../results/float/comment_space_comand_in_float.pl |  8 +--
 .../formats_encodings/at_commands_in_refs.pl       | 68 ++++++++++----------
 .../at_commands_in_refs_latin1.pl                  | 28 ++++-----
 .../----_0021---_002e--_002e-_003f-_0040.html      | 39 ------------
 .../res_html/-_007b-_007d.html                     |  4 +-
 .../AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html       |  4 +-
 .../res_html/_0040-_007b-_007d-_005c-_0023.html    |  4 +-
 .../_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html |  4 +-
 .../res_html/_21d2-_00b0-a-b--aa.html              | 36 -----------
 ..._005faaa-url-_002fman_002ecgi_002f1_002fls.html |  4 +-
 .../at_commands_in_refs_latin1/res_html/index.html |  4 +-
 .../formats_encodings/at_commands_in_refs_utf8.pl  | 28 ++++-----
 .../----_0021---_002e--_002e-_003f-_0040.html      | 39 ------------
 .../res_html/-_007b-_007d.html                     |  4 +-
 .../AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html       |  4 +-
 .../res_html/_0040-_007b-_007d-_005c-_0023.html    |  4 +-
 .../_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html |  4 +-
 .../res_html/_21d2-_00b0-a-b--aa.html              | 36 -----------
 ..._005faaa-url-_002fman_002ecgi_002f1_002fls.html |  4 +-
 .../at_commands_in_refs_utf8/res_html/index.html   |  4 +-
 .../end_of_line_command_in_node_lines.pl           | 28 ++++-----
 .../menu/space_and_commands_in_menu_node.pl        | 72 +++++++++++-----------
 .../misc_commands/comment_space_command_on_line.pl |  6 +-
 28 files changed, 174 insertions(+), 317 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a5601bbf7e..ae7053d74f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2022-08-17  Patrice Dumas  <pertusus@free.fr>
+
+       Multiple consecutive space transformed to one in node normalization
+
+       * tp/Texinfo/Convert/NodeNameNormalization.pm (_unicode_to_protected)
+       (_unicode_to_file_name): transform multiple spaces to one.
+
 2022-08-17  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/xspara.c (xspara__add_next),
diff --git a/tp/Texinfo/Convert/NodeNameNormalization.pm 
b/tp/Texinfo/Convert/NodeNameNormalization.pm
index e45252d3de..25ede17e3c 100644
--- a/tp/Texinfo/Convert/NodeNameNormalization.pm
+++ b/tp/Texinfo/Convert/NodeNameNormalization.pm
@@ -136,7 +136,7 @@ sub _unicode_to_protected($)
   while ($text ne '') {
     if ($text =~ s/^([A-Za-z0-9]+)//o) {
       $result .= $1;
-    } elsif ($text =~ s/^ //o) {
+    } elsif ($text =~ s/^ +//o) {
       $result .= '-';
     } elsif ($text =~ s/^(.)//o) {
       $result .= _protect_unicode_char($1);
@@ -156,7 +156,7 @@ sub _unicode_to_file_name($)
   while ($text ne '') {
     if ($text =~ s/^([A-Za-z0-9_\.\-]+)//o) {
       $result .= $1;
-    } elsif ($text =~ s/^ //o) {
+    } elsif ($text =~ s/^ +//o) {
       $result .= '-';
     } elsif ($text =~ s/^(.)//o) {
       $result .= _protect_unicode_char($1);
diff --git a/tp/t/nodenormalization.t b/tp/t/nodenormalization.t
index 17122f18b5..c5393198d4 100644
--- a/tp/t/nodenormalization.t
+++ b/tp/t/nodenormalization.t
@@ -154,15 +154,15 @@ my $texi_line = 'A @sc{sc} accents @"i @"{@dotless{i}} 
@`{@=E} @l{} @,{@\'C} @={
 my $line_tree = $parser->parse_texi_line($texi_line);
 my $normalized_line = normalize_node($line_tree);
 is ($normalized_line,
-'A-SC-accents-_00ef-_00ef-_1e14-_0142-_1e08-_0146_0303_0304-_0155_030c-_0129_0304-_00ff-_0131-_0237-_00c7-_0118-_1ea1-a_0361-_0227-characters-_0142-_00a1-_00e5-_0153-_002c-error_002d_002d_003e--_2026-_002e_002e_002e-no-brace-commands-_0040--_002e-----_007d-signs-_002d_002d-_002d_002d_002d-_0060_0060-_0027_0027-_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e-_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
+'A-SC-accents-_00ef-_00ef-_1e14-_0142-_1e08-_0146_0303_0304-_0155_030c-_0129_0304-_00ff-_0131-_0237-_00c7-_0118-_1ea1-a_0361-_0227-characters-_0142-_00a1-_00e5-_0153-_002c-error_002d_002d_003e-_2026-_002e_002e_002e-no-brace-commands-_0040-_002e-_007d-signs-_002d_002d-_002d_002d_002d-_0060_0060-_0027_0027-_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e-_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
   'normalized complex line');
 my $transliterated_line = transliterate_texinfo($line_tree);
 is ($transliterated_line,
-'A-SC-accents-i-i-E-l-C-n-r-i-y-i-j-C-E-a-a-a-characters-l-_00a1-aa-oe-_002c-error_002d_002d_003e--_2026-_002e_002e_002e-no-brace-commands-_0040--_002e-----_007d-signs-_002d_002d-_002d_002d_002d-_0060_0060-_0027_0027-_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e-_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
+'A-SC-accents-i-i-E-l-C-n-r-i-y-i-j-C-E-a-a-a-characters-l-_00a1-aa-oe-_002c-error_002d_002d_003e-_2026-_002e_002e_002e-no-brace-commands-_0040-_002e-_007d-signs-_002d_002d-_002d_002d_002d-_0060_0060-_0027_0027-_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e-_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
  'transliterated complex line');
 my $transliterated_line_no_unidecode = transliterate_texinfo($line_tree, 1);
 is ($transliterated_line_no_unidecode,
-'A-SC-accents-i-i-_1e14-l-_1e08-n-r-i-y-i-j-C-E-a-a-a-characters-l-_00a1-aa-oe-_002c-error_002d_002d_003e--_2026-_002e_002e_002e-no-brace-commands-_0040--_002e-----_007d-signs-_002d_002d-_002d_002d_002d-_0060_0060-_0027_0027-_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e-_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
+'A-SC-accents-i-i-_1e14-l-_1e08-n-r-i-y-i-j-C-E-a-a-a-characters-l-_00a1-aa-oe-_002c-error_002d_002d_003e-_2026-_002e_002e_002e-no-brace-commands-_0040-_002e-_007d-signs-_002d_002d-_002d_002d_002d-_0060_0060-_0027_0027-_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e-_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
   'transliterated complex line no unidecode');
 
 my $top_no_space = 'tOp';
diff --git a/tp/t/results/converters_tests/spaces_in_empty_node_names.pl 
b/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
index 92187d4576..19fd42e14d 100644
--- a/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
+++ b/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
@@ -100,7 +100,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
                     {},
                     {}
                   ],
-                  'normalized' => '--'
+                  'normalized' => '-'
                 }
               },
               'parent' => {},
@@ -354,7 +354,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
               {},
               {}
             ],
-            'normalized' => '--'
+            'normalized' => '-'
           }
         ],
         'spaces_before_argument' => ' '
@@ -502,7 +502,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
                     {},
                     {}
                   ],
-                  'normalized' => '--'
+                  'normalized' => '-'
                 }
               },
               'parent' => {},
@@ -993,7 +993,7 @@ $result_converted{'xml'}->{'spaces_in_empty_node_names'} = 
'<node name="Top" spa
 
 <node name="" spaces=" "><nodename></nodename></node>
 
-<para><ref label="--"><xrefnodename><spacecmd type="spc"/><spacecmd 
type="spc"/></xrefnodename></ref>
+<para><ref label="-"><xrefnodename><spacecmd type="spc"/><spacecmd 
type="spc"/></xrefnodename></ref>
 </para>
 <para><ref label="-"><xrefnodename><verb delimiter=":">  
</verb></xrefnodename></ref>
 </para>
@@ -1004,7 +1004,7 @@ $result_converted{'xml'}->{'spaces_in_empty_node_names'} 
= '<node name="Top" spa
 $result_converted{'docbook'}->{'spaces_in_empty_node_names'} = '
 
 
-<para><link linkend="--">&#160;&#160;</link>
+<para><link linkend="-">&#160;&#160;</link>
 </para>
 <para><link linkend="-"><literal>  </literal></link>
 </para>
diff --git a/tp/t/results/converters_tests/spaces_in_node_names.pl 
b/tp/t/results/converters_tests/spaces_in_node_names.pl
index ab4049b4f4..9c0447f301 100644
--- a/tp/t/results/converters_tests/spaces_in_node_names.pl
+++ b/tp/t/results/converters_tests/spaces_in_node_names.pl
@@ -105,7 +105,7 @@ $result_trees{'spaces_in_node_names'} = {
                     {},
                     {}
                   ],
-                  'normalized' => 'a--'
+                  'normalized' => 'a-'
                 }
               },
               'parent' => {},
@@ -379,10 +379,10 @@ $result_trees{'spaces_in_node_names'} = {
               {},
               {}
             ],
-            'normalized' => 'a--'
+            'normalized' => 'a-'
           }
         ],
-        'normalized' => 'a--',
+        'normalized' => 'a-',
         'spaces_before_argument' => ' '
       },
       'parent' => {},
@@ -548,7 +548,7 @@ $result_trees{'spaces_in_node_names'} = {
                     {},
                     {}
                   ],
-                  'normalized' => 'a--'
+                  'normalized' => 'a-'
                 }
               },
               'parent' => {},
@@ -918,7 +918,7 @@ $result_nodes{'spaces_in_node_names'} = {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'a--'
+        'normalized' => 'a-'
       },
       'structure' => {
         'node_next' => {
@@ -965,7 +965,7 @@ $result_menus{'spaces_in_node_names'} = {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'a--'
+        'normalized' => 'a-'
       },
       'structure' => {
         'menu_next' => {
@@ -1059,7 +1059,7 @@ $result_converted{'html_text'}->{'spaces_in_node_names'} 
= '<a class="node-id" i
 
 
 <hr>
-<a class="node-id" id="a--"></a><div class="nav-panel">
+<a class="node-id" id="a-"></a><div class="nav-panel">
 <p>
  &nbsp; </p>
 </div>
@@ -1079,7 +1079,7 @@ $result_converted{'html_text'}->{'spaces_in_node_names'} 
= '<a class="node-id" i
 </div>
 <h4 class="node">c&nbsp;&nbsp;<!-- /@w --></h4>
 
-<p><a class="ref" href="#a--">a&nbsp;&nbsp;</a>
+<p><a class="ref" href="#a-">a&nbsp;&nbsp;</a>
 </p>
 <p><a class="ref" href="#b-">b<code class="verb">  </code></a>
 </p>
@@ -1095,13 +1095,13 @@ $result_converted{'xml'}->{'spaces_in_node_names'} = 
'<node name="Top" spaces="
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">c<spacecmd type="spc"/></menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
-<node name="a--" spaces=" "><nodename>a<spacecmd type="spc"/><spacecmd 
type="spc"/></nodename><nodenext automatic="on">b<verb delimiter=":">  
</verb></nodenext><nodeprev automatic="on">Top</nodeprev><nodeup 
automatic="on">Top</nodeup></node>
+<node name="a-" spaces=" "><nodename>a<spacecmd type="spc"/><spacecmd 
type="spc"/></nodename><nodenext automatic="on">b<verb delimiter=":">  
</verb></nodenext><nodeprev automatic="on">Top</nodeprev><nodeup 
automatic="on">Top</nodeup></node>
 
 <node name="b-" spaces=" "><nodename>b<verb delimiter=":">  
</verb></nodename><nodenext automatic="on">c<w>  </w></nodenext><nodeprev 
automatic="on">a<spacecmd type="spc"/><spacecmd type="spc"/></nodeprev><nodeup 
automatic="on">Top</nodeup></node>
 
 <node name="c-" spaces=" "><nodename>c<w>  </w></nodename><nodeprev 
automatic="on">b<verb delimiter=":">  </verb></nodeprev><nodeup 
automatic="on">Top</nodeup></node>
 
-<para><ref label="a--"><xrefnodename>a<spacecmd type="spc"/><spacecmd 
type="spc"/></xrefnodename></ref>
+<para><ref label="a-"><xrefnodename>a<spacecmd type="spc"/><spacecmd 
type="spc"/></xrefnodename></ref>
 </para>
 <para><ref label="b-"><xrefnodename>b<verb delimiter=":">  
</verb></xrefnodename></ref>
 </para>
@@ -1109,13 +1109,13 @@ $result_converted{'xml'}->{'spaces_in_node_names'} = 
'<node name="Top" spaces="
 </para>';
 
 
-$result_converted{'docbook'}->{'spaces_in_node_names'} = '<anchor id="a--"/>
+$result_converted{'docbook'}->{'spaces_in_node_names'} = '<anchor id="a-"/>
 
 <anchor id="b-"/>
 
 <anchor id="c-"/>
 
-<para><link linkend="a--">a&#160;&#160;</link>
+<para><link linkend="a-">a&#160;&#160;</link>
 </para>
 <para><link linkend="b-">b<literal>  </literal></link>
 </para>
@@ -1124,13 +1124,13 @@ $result_converted{'docbook'}->{'spaces_in_node_names'} 
= '<anchor id="a--"/>
 
 
 $result_converted{'latex'}->{'spaces_in_node_names'} = '\\label{anchor:Top}%
-\\label{anchor:a--}%
+\\label{anchor:a-}%
 
 \\label{anchor:b-}%
 
 \\label{anchor:c-}%
 
-\\hyperref[anchor:a--]{[a\\ {}\\ {}], page~\\pageref*{anchor:a--}}
+\\hyperref[anchor:a-]{[a\\ {}\\ {}], page~\\pageref*{anchor:a-}}
 
 \\hyperref[anchor:b-]{[b\\verb:  :], page~\\pageref*{anchor:b-}}
 
diff --git a/tp/t/results/float/comment_space_comand_in_float.pl 
b/tp/t/results/float/comment_space_comand_in_float.pl
index 8e85d9e514..1dec691dc2 100644
--- a/tp/t/results/float/comment_space_comand_in_float.pl
+++ b/tp/t/results/float/comment_space_comand_in_float.pl
@@ -145,7 +145,7 @@ $result_trees{'comment_space_comand_in_float'} = {
               {},
               {}
             ],
-            'normalized' => 'label--',
+            'normalized' => 'label-',
             'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
@@ -324,7 +324,7 @@ $result_floats{'comment_space_comand_in_float'} = {
     {
       'cmdname' => 'float',
       'extra' => {
-        'normalized' => 'label--',
+        'normalized' => 'label-',
         'type' => {
           'content' => [
             {
@@ -406,12 +406,12 @@ 
$result_converted{'html'}->{'comment_space_comand_in_float'} = '<!DOCTYPE html>
 <body lang="en">
 <h1 class="node" id="Top">Top</h1>
 
-<div class="float" id="label--">
+<div class="float" id="label-">
 <p>Float
 </p><div class="type-number-float"><p><strong class="strong">Text &nbsp; 1
 </strong></p></div></div>
 <dl class="listoffloats">
-<dt><a href="#label--">Text &nbsp; 1</a></dt><dd></dd>
+<dt><a href="#label-">Text &nbsp; 1</a></dt><dd></dd>
 </dl>
 
 
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs.pl 
b/tp/t/results/formats_encodings/at_commands_in_refs.pl
index 2537fdd5ea..a5c2059e3a 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs.pl
@@ -299,7 +299,7 @@ $result_trees{'at_commands_in_refs'} = {
                     {},
                     {}
                   ],
-                  'normalized' => '----_0021---_002e--_002e-_003f-_0040'
+                  'normalized' => '-_0021-_002e-_002e-_003f-_0040'
                 }
               },
               'parent' => {},
@@ -1340,7 +1340,7 @@ $result_trees{'at_commands_in_refs'} = {
                     {},
                     {}
                   ],
-                  'normalized' => '_21d2-_00b0-a-b--_00e5'
+                  'normalized' => '_21d2-_00b0-a-b-_00e5'
                 }
               },
               'parent' => {},
@@ -5013,10 +5013,10 @@ $result_trees{'at_commands_in_refs'} = {
               {},
               {}
             ],
-            'normalized' => '----_0021---_002e--_002e-_003f-_0040'
+            'normalized' => '-_0021-_002e-_002e-_003f-_0040'
           }
         ],
-        'normalized' => '----_0021---_002e--_002e-_003f-_0040',
+        'normalized' => '-_0021-_002e-_002e-_003f-_0040',
         'spaces_before_argument' => ' '
       },
       'parent' => {},
@@ -6840,10 +6840,10 @@ $result_trees{'at_commands_in_refs'} = {
               {},
               {}
             ],
-            'normalized' => '_21d2-_00b0-a-b--_00e5'
+            'normalized' => '_21d2-_00b0-a-b-_00e5'
           }
         ],
-        'normalized' => '_21d2-_00b0-a-b--_00e5',
+        'normalized' => '_21d2-_00b0-a-b-_00e5',
         'spaces_before_argument' => ' '
       },
       'parent' => {},
@@ -13169,7 +13169,7 @@ $result_trees{'at_commands_in_refs'} = {
                     {},
                     {}
                   ],
-                  'normalized' => '----_0021---_002e--_002e-_003f-_0040'
+                  'normalized' => '-_0021-_002e-_002e-_003f-_0040'
                 }
               },
               'parent' => {},
@@ -14156,7 +14156,7 @@ $result_trees{'at_commands_in_refs'} = {
                     {},
                     {}
                   ],
-                  'normalized' => '_21d2-_00b0-a-b--_00e5'
+                  'normalized' => '_21d2-_00b0-a-b-_00e5'
                 }
               },
               'parent' => {},
@@ -21026,7 +21026,7 @@ $result_sectioning{'at_commands_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '----_0021---_002e--_002e-_003f-_0040'
+                    'normalized' => '-_0021-_002e-_002e-_003f-_0040'
                   },
                   'structure' => {}
                 }
@@ -21146,7 +21146,7 @@ $result_sectioning{'at_commands_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_21d2-_00b0-a-b--_00e5'
+                    'normalized' => '_21d2-_00b0-a-b-_00e5'
                   },
                   'structure' => {}
                 }
@@ -21698,7 +21698,7 @@ $result_nodes{'at_commands_in_refs'} = {
                 'section_number' => 2
               }
             },
-            'normalized' => '----_0021---_002e--_002e-_003f-_0040'
+            'normalized' => '-_0021-_002e-_002e-_003f-_0040'
           },
           'structure' => {
             'node_next' => {
@@ -21776,7 +21776,7 @@ $result_nodes{'at_commands_in_refs'} = {
                                         'section_number' => 8
                                       }
                                     },
-                                    'normalized' => '_21d2-_00b0-a-b--_00e5'
+                                    'normalized' => '_21d2-_00b0-a-b-_00e5'
                                   },
                                   'structure' => {
                                     'node_next' => {
@@ -22208,7 +22208,7 @@ $result_menus{'at_commands_in_refs'} = {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => '----_0021---_002e--_002e-_003f-_0040'
+            'normalized' => '-_0021-_002e-_002e-_003f-_0040'
           },
           'structure' => {
             'menu_next' => {
@@ -22244,7 +22244,7 @@ $result_menus{'at_commands_in_refs'} = {
                                 'menu_next' => {
                                   'cmdname' => 'node',
                                   'extra' => {
-                                    'normalized' => '_21d2-_00b0-a-b--_00e5'
+                                    'normalized' => '_21d2-_00b0-a-b-_00e5'
                                   },
                                   'structure' => {
                                     'menu_next' => {
@@ -22852,13 +22852,13 @@ Next: <a href="#-_007b-_007d" accesskey="n" 
rel="next"> { }</a> &nbsp; </p>
 
 <ul class="mini-toc">
 <li><a href="#-_007b-_007d" accesskey="1"> { }</a></li>
-<li><a href="#----_0021---_002e--_002e-_003f-_0040" accesskey="2">&nbsp; 
&nbsp; ! <br> .  . ? @</a></li>
+<li><a href="#-_0021-_002e-_002e-_003f-_0040" accesskey="2">&nbsp; &nbsp; ! 
<br> .  . ? @</a></li>
 <li><a href="#g_t_0040-_007b-_007d-_005c-_0023" accesskey="3">@ { } \\ 
#</a></li>
 <li><a href="#LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e" 
accesskey="4">LaTeX TeX &bull; , &copy; &hellip; <small 
class="enddots">...</small></a></li>
 <li><a href="#g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212" 
accesskey="5">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a></li>
 <li><a href="#g_t_2265-_2264-_2192" accesskey="6">&ge; &le; &rarr;</a></li>
 <li><a href="#g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae" 
accesskey="7">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a></li>
-<li><a href="#g_t_21d2-_00b0-a-b--_00e5" accesskey="8">&rArr; &deg; a&nbsp;b a 
sunny day &aring;</a></li>
+<li><a href="#g_t_21d2-_00b0-a-b-_00e5" accesskey="8">&rArr; &deg; a&nbsp;b a 
sunny day &aring;</a></li>
 <li><a 
href="#g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe"
 accesskey="9">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; 
&szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</a></li>
 <li><a 
href="#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119">&auml;
 &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e&#778; e&#779; 
&#281;</a></li>
 <li><a href="#g_t_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e">&#279; &#277; 
e&#818; &#7865; &#283; &#567; e&#865;e</a></li>
@@ -22883,25 +22883,25 @@ Next: <a href="#-_007b-_007d" accesskey="n" 
rel="next"> { }</a> &nbsp; </p>
 <div class="chapter-level-extent" id="-_007b-_007d">
 <div class="nav-panel">
 <p>
-Next: <a href="#----_0021---_002e--_002e-_003f-_0040" accesskey="n" 
rel="next">&nbsp; &nbsp; ! <br> .  . ? @</a>, Previous: <a href="#Top" 
accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
+Next: <a href="#-_0021-_002e-_002e-_003f-_0040" accesskey="n" 
rel="next">&nbsp; &nbsp; ! <br> .  . ? @</a>, Previous: <a href="#Top" 
accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
 <h2 class="chapter" id="-_007b-_007d-1">1  { }</h2>
 
 <hr>
 </div>
-<div class="chapter-level-extent" id="----_0021---_002e--_002e-_003f-_0040">
+<div class="chapter-level-extent" id="-_0021-_002e-_002e-_003f-_0040">
 <div class="nav-panel">
 <p>
 Next: <a href="#g_t_0040-_007b-_007d-_005c-_0023" accesskey="n" rel="next">@ { 
} \\ #</a>, Previous: <a href="#-_007b-_007d" accesskey="p" rel="prev"> { 
}</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
-<h2 class="chapter" id="----_0021---_002e--_002e-_003f-_0040-1">2 &nbsp; 
&nbsp; ! <br> .  . ? @</h2>
+<h2 class="chapter" id="-_0021-_002e-_002e-_003f-_0040-1">2 &nbsp; &nbsp; ! 
<br> .  . ? @</h2>
 
 <hr>
 </div>
 <div class="chapter-level-extent" id="g_t_0040-_007b-_007d-_005c-_0023">
 <div class="nav-panel">
 <p>
-Next: <a href="#LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e" 
accesskey="n" rel="next">LaTeX TeX &bull; , &copy; &hellip; <small 
class="enddots">...</small></a>, Previous: <a 
href="#----_0021---_002e--_002e-_003f-_0040" accesskey="p" rel="prev">&nbsp; 
&nbsp; ! <br> .  . ? @</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> 
&nbsp; </p>
+Next: <a href="#LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e" 
accesskey="n" rel="next">LaTeX TeX &bull; , &copy; &hellip; <small 
class="enddots">...</small></a>, Previous: <a 
href="#-_0021-_002e-_002e-_003f-_0040" accesskey="p" rel="prev">&nbsp; &nbsp; ! 
<br> .  . ? @</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <h2 class="chapter" id="g_t_0040-_007b-_007d-_005c-_0023-1">3 @ { } \\ #</h2>
 
@@ -22937,25 +22937,25 @@ Next: <a 
href="#g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae" accesskey="n" rel=
 <div class="chapter-level-extent" 
id="g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae">
 <div class="nav-panel">
 <p>
-Next: <a href="#g_t_21d2-_00b0-a-b--_00e5" accesskey="n" rel="next">&rArr; 
&deg; a&nbsp;b a sunny day &aring;</a>, Previous: <a 
href="#g_t_2265-_2264-_2192" accesskey="p" rel="prev">&ge; &le; &rarr;</a>, Up: 
<a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="#g_t_21d2-_00b0-a-b-_00e5" accesskey="n" rel="next">&rArr; 
&deg; a&nbsp;b a sunny day &aring;</a>, Previous: <a 
href="#g_t_2265-_2264-_2192" accesskey="p" rel="prev">&ge; &le; &rarr;</a>, Up: 
<a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <h2 class="chapter" id="g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae-1">7 
&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</h2>
 
 <hr>
 </div>
-<div class="chapter-level-extent" id="g_t_21d2-_00b0-a-b--_00e5">
+<div class="chapter-level-extent" id="g_t_21d2-_00b0-a-b-_00e5">
 <div class="nav-panel">
 <p>
 Next: <a 
href="#g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe"
 accesskey="n" rel="next">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; 
&Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</a>, Previous: <a 
href="#g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae" accesskey="p" 
rel="prev">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a>, Up: <a 
href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
-<h2 class="chapter" id="g_t_21d2-_00b0-a-b--aa">8 &rArr; &deg; a&nbsp;b a 
sunny day &aring;</h2>
+<h2 class="chapter" id="g_t_21d2-_00b0-a-b-aa">8 &rArr; &deg; a&nbsp;b a sunny 
day &aring;</h2>
 
 <hr>
 </div>
 <div class="chapter-level-extent" 
id="g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe">
 <div class="nav-panel">
 <p>
-Next: <a 
href="#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119" 
accesskey="n" rel="next">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; 
&ccedil; &#275; e&#778; e&#779; &#281;</a>, Previous: <a 
href="#g_t_21d2-_00b0-a-b--_00e5" accesskey="p" rel="prev">&rArr; &deg; 
a&nbsp;b a sunny day &aring;</a>, Up: <a href="#Top" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
+Next: <a 
href="#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119" 
accesskey="n" rel="next">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; 
&ccedil; &#275; e&#778; e&#779; &#281;</a>, Previous: <a 
href="#g_t_21d2-_00b0-a-b-_00e5" accesskey="p" rel="prev">&rArr; &deg; a&nbsp;b 
a sunny day &aring;</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> 
&nbsp; </p>
 </div>
 <h2 class="chapter" id="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th">9 &Aring; &aelig; 
&oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; 
&THORN; &thorn;</h2>
 
@@ -23123,7 +23123,7 @@ Previous: <a href="#gH-3rd" accesskey="p" 
rel="prev"><sub class="sub">g</sub>H 3
 
 <p><a class="ref" href="#-_007b-_007d"> { }</a>
 </p>
-<p><a class="ref" href="#----_0021---_002e--_002e-_003f-_0040">&nbsp; &nbsp; ! 
<br> .  . ? @</a>
+<p><a class="ref" href="#-_0021-_002e-_002e-_003f-_0040">&nbsp; &nbsp; ! <br> 
.  . ? @</a>
 </p>
 <p><a class="ref" href="#g_t_0040-_007b-_007d-_005c-_0023">@ { } \\ #</a>
 </p>
@@ -23135,7 +23135,7 @@ Previous: <a href="#gH-3rd" accesskey="p" 
rel="prev"><sub class="sub">g</sub>H 3
 </p>
 <p><a class="ref" href="#g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae">&ordf; 
&ordm; &lowast; &pound; -| &iquest; &reg;</a>
 </p>
-<p><a class="ref" href="#g_t_21d2-_00b0-a-b--_00e5">&rArr; &deg; a&nbsp;b a 
sunny day &aring;</a>
+<p><a class="ref" href="#g_t_21d2-_00b0-a-b-_00e5">&rArr; &deg; a&nbsp;b a 
sunny day &aring;</a>
 </p>
 <p><a class="ref" 
href="#g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe">&Aring;
 &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; 
&eth; &THORN; &thorn;</a>
 </p>
@@ -23263,7 +23263,7 @@ $result_converted{'xml'}->{'at_commands_in_refs'} = 
'<node name="Top" spaces=" "
 <chapter spaces=" "><sectiontitle>&hyphenbreak; &lbrace; 
&rbrace;</sectiontitle>
 
 </chapter>
-<node name="----_0021---_002e--_002e-_003f-_0040" spaces=" 
"><nodename><spacecmd type="spc"/> <spacecmd type="tab"/> &eosexcl; &linebreak; 
&eosperiod; &noeos; .&noeos; &eosquest; &arobase;</nodename><nodenext 
automatic="on">&atchar; &lbracechar; &rbracechar; &backslashchar; 
&hashchar;</nodenext><nodeprev automatic="on">&hyphenbreak; &lbrace; 
&rbrace;</nodeprev><nodeup automatic="on">Top</nodeup></node>
+<node name="-_0021-_002e-_002e-_003f-_0040" spaces=" "><nodename><spacecmd 
type="spc"/> <spacecmd type="tab"/> &eosexcl; &linebreak; &eosperiod; &noeos; 
.&noeos; &eosquest; &arobase;</nodename><nodenext automatic="on">&atchar; 
&lbracechar; &rbracechar; &backslashchar; &hashchar;</nodenext><nodeprev 
automatic="on">&hyphenbreak; &lbrace; &rbrace;</nodeprev><nodeup 
automatic="on">Top</nodeup></node>
 <chapter spaces=" "><sectiontitle><spacecmd type="spc"/> <spacecmd 
type="tab"/> &eosexcl; &linebreak; &eosperiod; &noeos; .&noeos; &eosquest; 
&arobase;</sectiontitle>
 
 </chapter>
@@ -23287,7 +23287,7 @@ $result_converted{'xml'}->{'at_commands_in_refs'} = 
'<node name="Top" spaces=" "
 <chapter spaces=" "><sectiontitle>&ordf; &ordm; &point; &pound; &printglyph; 
&iquest; &registered;</sectiontitle>
 
 </chapter>
-<node name="_21d2-_00b0-a-b--_00e5" spaces=" "><nodename>&result; &deg; 
a&nbsp;b <today/> &aring;</nodename><nodenext automatic="on">&Aring; &aelig; 
&oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &lslash; &Lslash; &ETH; &eth; 
&THORN; &thorn;</nodenext><nodeprev automatic="on">&ordf; &ordm; &point; 
&pound; &printglyph; &iquest; &registered;</nodeprev><nodeup 
automatic="on">Top</nodeup></node>
+<node name="_21d2-_00b0-a-b-_00e5" spaces=" "><nodename>&result; &deg; 
a&nbsp;b <today/> &aring;</nodename><nodenext automatic="on">&Aring; &aelig; 
&oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &lslash; &Lslash; &ETH; &eth; 
&THORN; &thorn;</nodenext><nodeprev automatic="on">&ordf; &ordm; &point; 
&pound; &printglyph; &iquest; &registered;</nodeprev><nodeup 
automatic="on">Top</nodeup></node>
 <chapter spaces=" "><sectiontitle>&result; &deg; a&nbsp;b <today/> 
&aring;</sectiontitle>
 
 </chapter>
@@ -23368,7 +23368,7 @@ $result_converted{'xml'}->{'at_commands_in_refs'} = 
'<node name="Top" spaces=" "
 
 <para><ref label="-_007b-_007d"><xrefnodename>&hyphenbreak; &lbrace; 
&rbrace;</xrefnodename></ref>
 </para>
-<para><ref 
label="----_0021---_002e--_002e-_003f-_0040"><xrefnodename><spacecmd 
type="spc"/> <spacecmd type="tab"/> &eosexcl; &linebreak; &eosperiod; &noeos; 
.&noeos; &eosquest; &arobase;</xrefnodename></ref>
+<para><ref label="-_0021-_002e-_002e-_003f-_0040"><xrefnodename><spacecmd 
type="spc"/> <spacecmd type="tab"/> &eosexcl; &linebreak; &eosperiod; &noeos; 
.&noeos; &eosquest; &arobase;</xrefnodename></ref>
 </para>
 <para><ref label="_0040-_007b-_007d-_005c-_0023"><xrefnodename>&atchar; 
&lbracechar; &rbracechar; &backslashchar; &hashchar;</xrefnodename></ref>
 </para>
@@ -23380,7 +23380,7 @@ $result_converted{'xml'}->{'at_commands_in_refs'} = 
'<node name="Top" spaces=" "
 </para>
 <para><ref 
label="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae"><xrefnodename>&ordf; &ordm; 
&point; &pound; &printglyph; &iquest; &registered;</xrefnodename></ref>
 </para>
-<para><ref label="_21d2-_00b0-a-b--_00e5"><xrefnodename>&result; &deg; 
a&nbsp;b <today/> &aring;</xrefnodename></ref>
+<para><ref label="_21d2-_00b0-a-b-_00e5"><xrefnodename>&result; &deg; a&nbsp;b 
<today/> &aring;</xrefnodename></ref>
 </para>
 <para><ref 
label="_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe"><xrefnodename>&Aring;
 &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &lslash; &Lslash; 
&ETH; &eth; &THORN; &thorn;</xrefnodename></ref>
 </para>
@@ -23429,7 +23429,7 @@ $result_converted{'docbook'}->{'at_commands_in_refs'} = 
'<chapter label="1" id="
 <title> { }</title>
 
 </chapter>
-<chapter label="2" id="----_0021---_002e--_002e-_003f-_0040">
+<chapter label="2" id="-_0021-_002e-_002e-_003f-_0040">
 <title>&#160; &#160; ! 
  .  . ? @</title>
 
@@ -23454,7 +23454,7 @@ $result_converted{'docbook'}->{'at_commands_in_refs'} = 
'<chapter label="1" id="
 <title>&#170; &#186; &#9733; &#163; &#8867; &#191; &#174;</title>
 
 </chapter>
-<chapter label="8" id="_21d2-_00b0-a-b--_00e5">
+<chapter label="8" id="_21d2-_00b0-a-b-_00e5">
 <title>&#8658; &#176; a&#160;b a sunny day &#229;</title>
 
 </chapter>
@@ -23535,7 +23535,7 @@ $result_converted{'docbook'}->{'at_commands_in_refs'} = 
'<chapter label="1" id="
 
 <para><link linkend="-_007b-_007d"> { }</link>
 </para>
-<para><link linkend="----_0021---_002e--_002e-_003f-_0040">&#160; &#160; ! 
+<para><link linkend="-_0021-_002e-_002e-_003f-_0040">&#160; &#160; ! 
  .  . ? @</link>
 </para>
 <para><link linkend="_0040-_007b-_007d-_005c-_0023">&#64; &#123; &#125; &#92; 
&#35;</link>
@@ -23548,7 +23548,7 @@ $result_converted{'docbook'}->{'at_commands_in_refs'} = 
'<chapter label="1" id="
 </para>
 <para><link linkend="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae">&#170; &#186; 
&#9733; &#163; &#8867; &#191; &#174;</link>
 </para>
-<para><link linkend="_21d2-_00b0-a-b--_00e5">&#8658; &#176; a&#160;b a sunny 
day &#229;</link>
+<para><link linkend="_21d2-_00b0-a-b-_00e5">&#8658; &#176; a&#160;b a sunny 
day &#229;</link>
 </para>
 <para><link 
linkend="_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe">&#197;
 &#230; &#339; &#198; &#338; &#248; &#216; &#223; &#322; &#321; &#208; &#240; 
&#222; &#254;</link>
 </para>
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl
index d02379d8ce..76185b4da7 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl
@@ -366,7 +366,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                     {},
                     {}
                   ],
-                  'normalized' => '----_0021---_002e--_002e-_003f-_0040'
+                  'normalized' => '-_0021-_002e-_002e-_003f-_0040'
                 }
               },
               'parent' => {},
@@ -1407,7 +1407,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                     {},
                     {}
                   ],
-                  'normalized' => '_21d2-_00b0-a-b--_00e5'
+                  'normalized' => '_21d2-_00b0-a-b-_00e5'
                 }
               },
               'parent' => {},
@@ -5080,10 +5080,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               {},
               {}
             ],
-            'normalized' => '----_0021---_002e--_002e-_003f-_0040'
+            'normalized' => '-_0021-_002e-_002e-_003f-_0040'
           }
         ],
-        'normalized' => '----_0021---_002e--_002e-_003f-_0040',
+        'normalized' => '-_0021-_002e-_002e-_003f-_0040',
         'spaces_before_argument' => ' '
       },
       'parent' => {},
@@ -6907,10 +6907,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               {},
               {}
             ],
-            'normalized' => '_21d2-_00b0-a-b--_00e5'
+            'normalized' => '_21d2-_00b0-a-b-_00e5'
           }
         ],
-        'normalized' => '_21d2-_00b0-a-b--_00e5',
+        'normalized' => '_21d2-_00b0-a-b-_00e5',
         'spaces_before_argument' => ' '
       },
       'parent' => {},
@@ -13236,7 +13236,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                     {},
                     {}
                   ],
-                  'normalized' => '----_0021---_002e--_002e-_003f-_0040'
+                  'normalized' => '-_0021-_002e-_002e-_003f-_0040'
                 }
               },
               'parent' => {},
@@ -14223,7 +14223,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                     {},
                     {}
                   ],
-                  'normalized' => '_21d2-_00b0-a-b--_00e5'
+                  'normalized' => '_21d2-_00b0-a-b-_00e5'
                 }
               },
               'parent' => {},
@@ -21104,7 +21104,7 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '----_0021---_002e--_002e-_003f-_0040'
+                    'normalized' => '-_0021-_002e-_002e-_003f-_0040'
                   },
                   'structure' => {}
                 }
@@ -21224,7 +21224,7 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_21d2-_00b0-a-b--_00e5'
+                    'normalized' => '_21d2-_00b0-a-b-_00e5'
                   },
                   'structure' => {}
                 }
@@ -21776,7 +21776,7 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                 'section_number' => 2
               }
             },
-            'normalized' => '----_0021---_002e--_002e-_003f-_0040'
+            'normalized' => '-_0021-_002e-_002e-_003f-_0040'
           },
           'structure' => {
             'node_next' => {
@@ -21854,7 +21854,7 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                         'section_number' => 8
                                       }
                                     },
-                                    'normalized' => '_21d2-_00b0-a-b--_00e5'
+                                    'normalized' => '_21d2-_00b0-a-b-_00e5'
                                   },
                                   'structure' => {
                                     'node_next' => {
@@ -22286,7 +22286,7 @@ $result_menus{'at_commands_in_refs_latin1'} = {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => '----_0021---_002e--_002e-_003f-_0040'
+            'normalized' => '-_0021-_002e-_002e-_003f-_0040'
           },
           'structure' => {
             'menu_next' => {
@@ -22322,7 +22322,7 @@ $result_menus{'at_commands_in_refs_latin1'} = {
                                 'menu_next' => {
                                   'cmdname' => 'node',
                                   'extra' => {
-                                    'normalized' => '_21d2-_00b0-a-b--_00e5'
+                                    'normalized' => '_21d2-_00b0-a-b-_00e5'
                                   },
                                   'structure' => {
                                     'menu_next' => {
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/----_0021---_002e--_002e-_003f-_0040.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/----_0021---_002e--_002e-_003f-_0040.html
deleted file mode 100644
index a55b6bff45..0000000000
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/----_0021---_002e--_002e-_003f-_0040.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<html>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15">
-<title>&nbsp; &nbsp; ! 
- .  . ? @ (Top)</title>
-
-<meta name="description" content="&nbsp; &nbsp; ! 
- .  . ? @ (Top)">
-<meta name="keywords" content="&nbsp; &nbsp; ! 
- .  . ? @ (Top)">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="viewport" content="width=device-width,initial-scale=1">
-
-<link href="index.html" rel="start" title="Top">
-<link href="index.html" rel="up" title="Top">
-<link href="_0040-_007b-_007d-_005c-_0023.html" rel="next" title="@ { } \ #">
-<link href="-_007b-_007d.html" rel="prev" title=" { }">
-
-
-</head>
-
-<body lang="en">
-<div class="chapter-level-extent" id="----_0021---_002e--_002e-_003f-_0040">
-<div class="nav-panel">
-<p>
-Next: <a href="_0040-_007b-_007d-_005c-_0023.html" accesskey="n" rel="next">@ 
{ } \ #</a>, Previous: <a href="-_007b-_007d.html" accesskey="p" rel="prev"> { 
}</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
-</div>
-<hr>
-<h2 class="chapter" id="----_0021---_002e--_002e-_003f-_0040-1">2 &nbsp; 
&nbsp; ! <br> .  . ? @</h2>
-
-</div>
-
-
-
-</body>
-</html>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/-_007b-_007d.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/-_007b-_007d.html
index b66178c667..e16554c1f1 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/-_007b-_007d.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/-_007b-_007d.html
@@ -13,7 +13,7 @@
 
 <link href="index.html" rel="start" title="Top">
 <link href="index.html" rel="up" title="Top">
-<link href="----_0021---_002e--_002e-_003f-_0040.html" rel="next" 
title="&nbsp; &nbsp; ! 
+<link href="-_0021-_002e-_002e-_003f-_0040.html" rel="next" title="&nbsp; 
&nbsp; ! 
  .  . ? @">
 <link href="index.html" rel="prev" title="Top">
 
@@ -24,7 +24,7 @@
 <div class="chapter-level-extent" id="-_007b-_007d">
 <div class="nav-panel">
 <p>
-Next: <a href="----_0021---_002e--_002e-_003f-_0040.html" accesskey="n" 
rel="next">&nbsp; &nbsp; ! <br> .  . ? @</a>, Previous: <a href="index.html" 
accesskey="p" rel="prev">Top</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
+Next: <a href="-_0021-_002e-_002e-_003f-_0040.html" accesskey="n" 
rel="next">&nbsp; &nbsp; ! <br> .  . ? @</a>, Previous: <a href="index.html" 
accesskey="p" rel="prev">Top</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
 <h2 class="chapter" id="-_007b-_007d-1">1  { }</h2>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
index c670b70cac..ba0a1bdf54 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
@@ -14,7 +14,7 @@
 <link href="index.html" rel="start" title="Top">
 <link href="index.html" rel="up" title="Top">
 <link href="a-e-i-a-a-e-c-e-e-e-e.html" rel="next" title="&auml; &#7869; 
&icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e&#778; e&#779; &#281;">
-<link href="_21d2-_00b0-a-b--aa.html" rel="prev" title="&rArr; &deg; a&nbsp;b 
a sunny day &aring;">
+<link href="_21d2-_00b0-a-b-aa.html" rel="prev" title="&rArr; &deg; a&nbsp;b a 
sunny day &aring;">
 
 
 </head>
@@ -23,7 +23,7 @@
 <div class="chapter-level-extent" 
id="g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe">
 <div class="nav-panel">
 <p>
-Next: <a href="a-e-i-a-a-e-c-e-e-e-e.html" accesskey="n" rel="next">&auml; 
&#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e&#778; e&#779; 
&#281;</a>, Previous: <a href="_21d2-_00b0-a-b--aa.html" accesskey="p" 
rel="prev">&rArr; &deg; a&nbsp;b a sunny day &aring;</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="a-e-i-a-a-e-c-e-e-e-e.html" accesskey="n" rel="next">&auml; 
&#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e&#778; e&#779; 
&#281;</a>, Previous: <a href="_21d2-_00b0-a-b-aa.html" accesskey="p" 
rel="prev">&rArr; &deg; a&nbsp;b a sunny day &aring;</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
 <h2 class="chapter" id="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th">9 &Aring; &aelig; 
&oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; 
&THORN; &thorn;</h2>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_0040-_007b-_007d-_005c-_0023.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_0040-_007b-_007d-_005c-_0023.html
index d1e6d00451..1cb6c0999f 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_0040-_007b-_007d-_005c-_0023.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_0040-_007b-_007d-_005c-_0023.html
@@ -14,7 +14,7 @@
 <link href="index.html" rel="start" title="Top">
 <link href="index.html" rel="up" title="Top">
 <link href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html" rel="next" 
title="LaTeX TeX &bull; , &copy; &hellip; ...">
-<link href="----_0021---_002e--_002e-_003f-_0040.html" rel="prev" 
title="&nbsp; &nbsp; ! 
+<link href="-_0021-_002e-_002e-_003f-_0040.html" rel="prev" title="&nbsp; 
&nbsp; ! 
  .  . ? @">
 
 
@@ -24,7 +24,7 @@
 <div class="chapter-level-extent" id="g_t_0040-_007b-_007d-_005c-_0023">
 <div class="nav-panel">
 <p>
-Next: <a href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html" 
accesskey="n" rel="next">LaTeX TeX &bull; , &copy; &hellip; <small 
class="enddots">...</small></a>, Previous: <a 
href="----_0021---_002e--_002e-_003f-_0040.html" accesskey="p" 
rel="prev">&nbsp; &nbsp; ! <br> .  . ? @</a>, Up: <a href="index.html" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html" 
accesskey="n" rel="next">LaTeX TeX &bull; , &copy; &hellip; <small 
class="enddots">...</small></a>, Previous: <a 
href="-_0021-_002e-_002e-_003f-_0040.html" accesskey="p" rel="prev">&nbsp; 
&nbsp; ! <br> .  . ? @</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
 <h2 class="chapter" id="g_t_0040-_007b-_007d-_005c-_0023-1">3 @ { } \ #</h2>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html
index 764faf1fcf..55bbc2f8fe 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html
@@ -13,7 +13,7 @@
 
 <link href="index.html" rel="start" title="Top">
 <link href="index.html" rel="up" title="Top">
-<link href="_21d2-_00b0-a-b--aa.html" rel="next" title="&rArr; &deg; a&nbsp;b 
a sunny day &aring;">
+<link href="_21d2-_00b0-a-b-aa.html" rel="next" title="&rArr; &deg; a&nbsp;b a 
sunny day &aring;">
 <link href="_2265-_2264-_2192.html" rel="prev" title="&ge; &le; &rarr;">
 
 
@@ -23,7 +23,7 @@
 <div class="chapter-level-extent" 
id="g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae">
 <div class="nav-panel">
 <p>
-Next: <a href="_21d2-_00b0-a-b--aa.html" accesskey="n" rel="next">&rArr; &deg; 
a&nbsp;b a sunny day &aring;</a>, Previous: <a href="_2265-_2264-_2192.html" 
accesskey="p" rel="prev">&ge; &le; &rarr;</a>, Up: <a href="index.html" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="_21d2-_00b0-a-b-aa.html" accesskey="n" rel="next">&rArr; &deg; 
a&nbsp;b a sunny day &aring;</a>, Previous: <a href="_2265-_2264-_2192.html" 
accesskey="p" rel="prev">&ge; &le; &rarr;</a>, Up: <a href="index.html" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
 <h2 class="chapter" id="g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae-1">7 
&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</h2>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_21d2-_00b0-a-b--aa.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_21d2-_00b0-a-b--aa.html
deleted file mode 100644
index 3b95dd567b..0000000000
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_21d2-_00b0-a-b--aa.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15">
-<title>&rArr; &deg; a&nbsp;b a sunny day &aring; (Top)</title>
-
-<meta name="description" content="&rArr; &deg; a&nbsp;b a sunny day &aring; 
(Top)">
-<meta name="keywords" content="&rArr; &deg; a&nbsp;b a sunny day &aring; 
(Top)">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="viewport" content="width=device-width,initial-scale=1">
-
-<link href="index.html" rel="start" title="Top">
-<link href="index.html" rel="up" title="Top">
-<link href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" rel="next" 
title="&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH; &eth; &THORN; &thorn;">
-<link href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html" rel="prev" 
title="&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;">
-
-
-</head>
-
-<body lang="en">
-<div class="chapter-level-extent" id="g_t_21d2-_00b0-a-b--_00e5">
-<div class="nav-panel">
-<p>
-Next: <a href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" accesskey="n" 
rel="next">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; 
&#322; &#321; &ETH; &eth; &THORN; &thorn;</a>, Previous: <a 
href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html" accesskey="p" 
rel="prev">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
-</div>
-<hr>
-<h2 class="chapter" id="g_t_21d2-_00b0-a-b--aa">8 &rArr; &deg; a&nbsp;b a 
sunny day &aring;</h2>
-
-</div>
-
-
-
-</body>
-</html>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
index 13e3f2de76..9a0465d7cb 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
@@ -37,7 +37,7 @@ Previous: <a href="gH-3rd.html" accesskey="p" rel="prev"><sub 
class="sub">g</sub
 
 <p><a class="ref" href="-_007b-_007d.html"> { }</a>
 </p>
-<p><a class="ref" href="----_0021---_002e--_002e-_003f-_0040.html">&nbsp; 
&nbsp; ! <br> .  . ? @</a>
+<p><a class="ref" href="-_0021-_002e-_002e-_003f-_0040.html">&nbsp; &nbsp; ! 
<br> .  . ? @</a>
 </p>
 <p><a class="ref" href="_0040-_007b-_007d-_005c-_0023.html">@ { } \ #</a>
 </p>
@@ -49,7 +49,7 @@ Previous: <a href="gH-3rd.html" accesskey="p" rel="prev"><sub 
class="sub">g</sub
 </p>
 <p><a class="ref" href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html">&ordf; 
&ordm; &lowast; &pound; -| &iquest; &reg;</a>
 </p>
-<p><a class="ref" href="_21d2-_00b0-a-b--aa.html">&rArr; &deg; a&nbsp;b a 
sunny day &aring;</a>
+<p><a class="ref" href="_21d2-_00b0-a-b-aa.html">&rArr; &deg; a&nbsp;b a sunny 
day &aring;</a>
 </p>
 <p><a class="ref" href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html">&Aring; 
&aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; 
&eth; &THORN; &thorn;</a>
 </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/index.html 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/index.html
index fe0df6ebe3..a8ac5044f9 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/index.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/index.html
@@ -38,13 +38,13 @@ Next: <a href="-_007b-_007d.html" accesskey="n" rel="next"> 
{ }</a> &nbsp; </p>
 
 <ul class="mini-toc">
 <li><a href="-_007b-_007d.html" accesskey="1"> { }</a></li>
-<li><a href="----_0021---_002e--_002e-_003f-_0040.html" accesskey="2">&nbsp; 
&nbsp; ! <br> .  . ? @</a></li>
+<li><a href="-_0021-_002e-_002e-_003f-_0040.html" accesskey="2">&nbsp; &nbsp; 
! <br> .  . ? @</a></li>
 <li><a href="_0040-_007b-_007d-_005c-_0023.html" accesskey="3">@ { } \ 
#</a></li>
 <li><a href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html" 
accesskey="4">LaTeX TeX &bull; , &copy; &hellip; <small 
class="enddots">...</small></a></li>
 <li><a href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" 
accesskey="5">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a></li>
 <li><a href="_2265-_2264-_2192.html" accesskey="6">&ge; &le; &rarr;</a></li>
 <li><a href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html" 
accesskey="7">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a></li>
-<li><a href="_21d2-_00b0-a-b--aa.html" accesskey="8">&rArr; &deg; a&nbsp;b a 
sunny day &aring;</a></li>
+<li><a href="_21d2-_00b0-a-b-aa.html" accesskey="8">&rArr; &deg; a&nbsp;b a 
sunny day &aring;</a></li>
 <li><a href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" accesskey="9">&Aring; 
&aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; 
&eth; &THORN; &thorn;</a></li>
 <li><a href="a-e-i-a-a-e-c-e-e-e-e.html">&auml; &#7869; &icirc; &acirc; 
&agrave; &eacute; &ccedil; &#275; e&#778; e&#779; &#281;</a></li>
 <li><a href="e-e-e-e-e-j-ee.html">&#279; &#277; e&#818; &#7865; &#283; &#567; 
e&#865;e</a></li>
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs_utf8.pl 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8.pl
index e536d72e54..eba8a79e9c 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs_utf8.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs_utf8.pl
@@ -366,7 +366,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                     {},
                     {}
                   ],
-                  'normalized' => '----_0021---_002e--_002e-_003f-_0040'
+                  'normalized' => '-_0021-_002e-_002e-_003f-_0040'
                 }
               },
               'parent' => {},
@@ -1407,7 +1407,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                     {},
                     {}
                   ],
-                  'normalized' => '_21d2-_00b0-a-b--_00e5'
+                  'normalized' => '_21d2-_00b0-a-b-_00e5'
                 }
               },
               'parent' => {},
@@ -5080,10 +5080,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               {},
               {}
             ],
-            'normalized' => '----_0021---_002e--_002e-_003f-_0040'
+            'normalized' => '-_0021-_002e-_002e-_003f-_0040'
           }
         ],
-        'normalized' => '----_0021---_002e--_002e-_003f-_0040',
+        'normalized' => '-_0021-_002e-_002e-_003f-_0040',
         'spaces_before_argument' => ' '
       },
       'parent' => {},
@@ -6907,10 +6907,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               {},
               {}
             ],
-            'normalized' => '_21d2-_00b0-a-b--_00e5'
+            'normalized' => '_21d2-_00b0-a-b-_00e5'
           }
         ],
-        'normalized' => '_21d2-_00b0-a-b--_00e5',
+        'normalized' => '_21d2-_00b0-a-b-_00e5',
         'spaces_before_argument' => ' '
       },
       'parent' => {},
@@ -13236,7 +13236,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                     {},
                     {}
                   ],
-                  'normalized' => '----_0021---_002e--_002e-_003f-_0040'
+                  'normalized' => '-_0021-_002e-_002e-_003f-_0040'
                 }
               },
               'parent' => {},
@@ -14223,7 +14223,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                     {},
                     {}
                   ],
-                  'normalized' => '_21d2-_00b0-a-b--_00e5'
+                  'normalized' => '_21d2-_00b0-a-b-_00e5'
                 }
               },
               'parent' => {},
@@ -21104,7 +21104,7 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '----_0021---_002e--_002e-_003f-_0040'
+                    'normalized' => '-_0021-_002e-_002e-_003f-_0040'
                   },
                   'structure' => {}
                 }
@@ -21224,7 +21224,7 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_21d2-_00b0-a-b--_00e5'
+                    'normalized' => '_21d2-_00b0-a-b-_00e5'
                   },
                   'structure' => {}
                 }
@@ -21776,7 +21776,7 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                 'section_number' => 2
               }
             },
-            'normalized' => '----_0021---_002e--_002e-_003f-_0040'
+            'normalized' => '-_0021-_002e-_002e-_003f-_0040'
           },
           'structure' => {
             'node_next' => {
@@ -21854,7 +21854,7 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                         'section_number' => 8
                                       }
                                     },
-                                    'normalized' => '_21d2-_00b0-a-b--_00e5'
+                                    'normalized' => '_21d2-_00b0-a-b-_00e5'
                                   },
                                   'structure' => {
                                     'node_next' => {
@@ -22286,7 +22286,7 @@ $result_menus{'at_commands_in_refs_utf8'} = {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => '----_0021---_002e--_002e-_003f-_0040'
+            'normalized' => '-_0021-_002e-_002e-_003f-_0040'
           },
           'structure' => {
             'menu_next' => {
@@ -22322,7 +22322,7 @@ $result_menus{'at_commands_in_refs_utf8'} = {
                                 'menu_next' => {
                                   'cmdname' => 'node',
                                   'extra' => {
-                                    'normalized' => '_21d2-_00b0-a-b--_00e5'
+                                    'normalized' => '_21d2-_00b0-a-b-_00e5'
                                   },
                                   'structure' => {
                                     'menu_next' => {
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/----_0021---_002e--_002e-_003f-_0040.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/----_0021---_002e--_002e-_003f-_0040.html
deleted file mode 100644
index 37c6160892..0000000000
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/----_0021---_002e--_002e-_003f-_0040.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<html>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>&nbsp; &nbsp; ! 
- .  . ? @ (Top)</title>
-
-<meta name="description" content="&nbsp; &nbsp; ! 
- .  . ? @ (Top)">
-<meta name="keywords" content="&nbsp; &nbsp; ! 
- .  . ? @ (Top)">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="viewport" content="width=device-width,initial-scale=1">
-
-<link href="index.html" rel="start" title="Top">
-<link href="index.html" rel="up" title="Top">
-<link href="_0040-_007b-_007d-_005c-_0023.html" rel="next" title="@ { } \ #">
-<link href="-_007b-_007d.html" rel="prev" title=" { }">
-
-
-</head>
-
-<body lang="en">
-<div class="chapter-level-extent" id="----_0021---_002e--_002e-_003f-_0040">
-<div class="nav-panel">
-<p>
-Next: <a href="_0040-_007b-_007d-_005c-_0023.html" accesskey="n" rel="next">@ 
{ } \ #</a>, Previous: <a href="-_007b-_007d.html" accesskey="p" rel="prev"> { 
}</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
-</div>
-<hr>
-<h2 class="chapter" id="----_0021---_002e--_002e-_003f-_0040-1">2 &nbsp; 
&nbsp; ! <br> .  . ? @</h2>
-
-</div>
-
-
-
-</body>
-</html>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/-_007b-_007d.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/-_007b-_007d.html
index 6d9941eb2f..1661f167ee 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/-_007b-_007d.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/-_007b-_007d.html
@@ -13,7 +13,7 @@
 
 <link href="index.html" rel="start" title="Top">
 <link href="index.html" rel="up" title="Top">
-<link href="----_0021---_002e--_002e-_003f-_0040.html" rel="next" 
title="&nbsp; &nbsp; ! 
+<link href="-_0021-_002e-_002e-_003f-_0040.html" rel="next" title="&nbsp; 
&nbsp; ! 
  .  . ? @">
 <link href="index.html" rel="prev" title="Top">
 
@@ -24,7 +24,7 @@
 <div class="chapter-level-extent" id="-_007b-_007d">
 <div class="nav-panel">
 <p>
-Next: <a href="----_0021---_002e--_002e-_003f-_0040.html" accesskey="n" 
rel="next">&nbsp; &nbsp; ! <br> .  . ? @</a>, Previous: <a href="index.html" 
accesskey="p" rel="prev">Top</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
+Next: <a href="-_0021-_002e-_002e-_003f-_0040.html" accesskey="n" 
rel="next">&nbsp; &nbsp; ! <br> .  . ? @</a>, Previous: <a href="index.html" 
accesskey="p" rel="prev">Top</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
 <h2 class="chapter" id="-_007b-_007d-1">1  { }</h2>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
index e855d59b2f..5cc07c0d3f 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
@@ -14,7 +14,7 @@
 <link href="index.html" rel="start" title="Top">
 <link href="index.html" rel="up" title="Top">
 <link href="a-e-i-a-a-e-c-e-e-e-e.html" rel="next" title="&auml; &#7869; 
&icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e&#778; e&#779; &#281;">
-<link href="_21d2-_00b0-a-b--aa.html" rel="prev" title="&rArr; &deg; a&nbsp;b 
a sunny day &aring;">
+<link href="_21d2-_00b0-a-b-aa.html" rel="prev" title="&rArr; &deg; a&nbsp;b a 
sunny day &aring;">
 
 
 </head>
@@ -23,7 +23,7 @@
 <div class="chapter-level-extent" 
id="g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe">
 <div class="nav-panel">
 <p>
-Next: <a href="a-e-i-a-a-e-c-e-e-e-e.html" accesskey="n" rel="next">&auml; 
&#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e&#778; e&#779; 
&#281;</a>, Previous: <a href="_21d2-_00b0-a-b--aa.html" accesskey="p" 
rel="prev">&rArr; &deg; a&nbsp;b a sunny day &aring;</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="a-e-i-a-a-e-c-e-e-e-e.html" accesskey="n" rel="next">&auml; 
&#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e&#778; e&#779; 
&#281;</a>, Previous: <a href="_21d2-_00b0-a-b-aa.html" accesskey="p" 
rel="prev">&rArr; &deg; a&nbsp;b a sunny day &aring;</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
 <h2 class="chapter" id="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th">9 &Aring; &aelig; 
&oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; 
&THORN; &thorn;</h2>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_0040-_007b-_007d-_005c-_0023.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_0040-_007b-_007d-_005c-_0023.html
index 3b5c7807c8..e261a49dcd 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_0040-_007b-_007d-_005c-_0023.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_0040-_007b-_007d-_005c-_0023.html
@@ -14,7 +14,7 @@
 <link href="index.html" rel="start" title="Top">
 <link href="index.html" rel="up" title="Top">
 <link href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html" rel="next" 
title="LaTeX TeX &bull; , &copy; &hellip; ...">
-<link href="----_0021---_002e--_002e-_003f-_0040.html" rel="prev" 
title="&nbsp; &nbsp; ! 
+<link href="-_0021-_002e-_002e-_003f-_0040.html" rel="prev" title="&nbsp; 
&nbsp; ! 
  .  . ? @">
 
 
@@ -24,7 +24,7 @@
 <div class="chapter-level-extent" id="g_t_0040-_007b-_007d-_005c-_0023">
 <div class="nav-panel">
 <p>
-Next: <a href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html" 
accesskey="n" rel="next">LaTeX TeX &bull; , &copy; &hellip; <small 
class="enddots">...</small></a>, Previous: <a 
href="----_0021---_002e--_002e-_003f-_0040.html" accesskey="p" 
rel="prev">&nbsp; &nbsp; ! <br> .  . ? @</a>, Up: <a href="index.html" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html" 
accesskey="n" rel="next">LaTeX TeX &bull; , &copy; &hellip; <small 
class="enddots">...</small></a>, Previous: <a 
href="-_0021-_002e-_002e-_003f-_0040.html" accesskey="p" rel="prev">&nbsp; 
&nbsp; ! <br> .  . ? @</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
 <h2 class="chapter" id="g_t_0040-_007b-_007d-_005c-_0023-1">3 @ { } \ #</h2>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html
index 093d3417c6..ddecc301d5 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html
@@ -13,7 +13,7 @@
 
 <link href="index.html" rel="start" title="Top">
 <link href="index.html" rel="up" title="Top">
-<link href="_21d2-_00b0-a-b--aa.html" rel="next" title="&rArr; &deg; a&nbsp;b 
a sunny day &aring;">
+<link href="_21d2-_00b0-a-b-aa.html" rel="next" title="&rArr; &deg; a&nbsp;b a 
sunny day &aring;">
 <link href="_2265-_2264-_2192.html" rel="prev" title="&ge; &le; &rarr;">
 
 
@@ -23,7 +23,7 @@
 <div class="chapter-level-extent" 
id="g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae">
 <div class="nav-panel">
 <p>
-Next: <a href="_21d2-_00b0-a-b--aa.html" accesskey="n" rel="next">&rArr; &deg; 
a&nbsp;b a sunny day &aring;</a>, Previous: <a href="_2265-_2264-_2192.html" 
accesskey="p" rel="prev">&ge; &le; &rarr;</a>, Up: <a href="index.html" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="_21d2-_00b0-a-b-aa.html" accesskey="n" rel="next">&rArr; &deg; 
a&nbsp;b a sunny day &aring;</a>, Previous: <a href="_2265-_2264-_2192.html" 
accesskey="p" rel="prev">&ge; &le; &rarr;</a>, Up: <a href="index.html" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
 <h2 class="chapter" id="g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae-1">7 
&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</h2>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_21d2-_00b0-a-b--aa.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_21d2-_00b0-a-b--aa.html
deleted file mode 100644
index 5dd3ee0307..0000000000
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_21d2-_00b0-a-b--aa.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>&rArr; &deg; a&nbsp;b a sunny day &aring; (Top)</title>
-
-<meta name="description" content="&rArr; &deg; a&nbsp;b a sunny day &aring; 
(Top)">
-<meta name="keywords" content="&rArr; &deg; a&nbsp;b a sunny day &aring; 
(Top)">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="viewport" content="width=device-width,initial-scale=1">
-
-<link href="index.html" rel="start" title="Top">
-<link href="index.html" rel="up" title="Top">
-<link href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" rel="next" 
title="&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; 
&#321; &ETH; &eth; &THORN; &thorn;">
-<link href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html" rel="prev" 
title="&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;">
-
-
-</head>
-
-<body lang="en">
-<div class="chapter-level-extent" id="g_t_21d2-_00b0-a-b--_00e5">
-<div class="nav-panel">
-<p>
-Next: <a href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" accesskey="n" 
rel="next">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; 
&#322; &#321; &ETH; &eth; &THORN; &thorn;</a>, Previous: <a 
href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html" accesskey="p" 
rel="prev">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
-</div>
-<hr>
-<h2 class="chapter" id="g_t_21d2-_00b0-a-b--aa">8 &rArr; &deg; a&nbsp;b a 
sunny day &aring;</h2>
-
-</div>
-
-
-
-</body>
-</html>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
index 02345cb92b..7a31de294c 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
@@ -37,7 +37,7 @@ Previous: <a href="gH-3rd.html" accesskey="p" rel="prev"><sub 
class="sub">g</sub
 
 <p><a class="ref" href="-_007b-_007d.html"> { }</a>
 </p>
-<p><a class="ref" href="----_0021---_002e--_002e-_003f-_0040.html">&nbsp; 
&nbsp; ! <br> .  . ? @</a>
+<p><a class="ref" href="-_0021-_002e-_002e-_003f-_0040.html">&nbsp; &nbsp; ! 
<br> .  . ? @</a>
 </p>
 <p><a class="ref" href="_0040-_007b-_007d-_005c-_0023.html">@ { } \ #</a>
 </p>
@@ -49,7 +49,7 @@ Previous: <a href="gH-3rd.html" accesskey="p" rel="prev"><sub 
class="sub">g</sub
 </p>
 <p><a class="ref" href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html">&ordf; 
&ordm; &lowast; &pound; -| &iquest; &reg;</a>
 </p>
-<p><a class="ref" href="_21d2-_00b0-a-b--aa.html">&rArr; &deg; a&nbsp;b a 
sunny day &aring;</a>
+<p><a class="ref" href="_21d2-_00b0-a-b-aa.html">&rArr; &deg; a&nbsp;b a sunny 
day &aring;</a>
 </p>
 <p><a class="ref" href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html">&Aring; 
&aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; 
&eth; &THORN; &thorn;</a>
 </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/index.html 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/index.html
index ddcde98506..8e8d3f90b4 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/index.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/index.html
@@ -38,13 +38,13 @@ Next: <a href="-_007b-_007d.html" accesskey="n" rel="next"> 
{ }</a> &nbsp; </p>
 
 <ul class="mini-toc">
 <li><a href="-_007b-_007d.html" accesskey="1"> { }</a></li>
-<li><a href="----_0021---_002e--_002e-_003f-_0040.html" accesskey="2">&nbsp; 
&nbsp; ! <br> .  . ? @</a></li>
+<li><a href="-_0021-_002e-_002e-_003f-_0040.html" accesskey="2">&nbsp; &nbsp; 
! <br> .  . ? @</a></li>
 <li><a href="_0040-_007b-_007d-_005c-_0023.html" accesskey="3">@ { } \ 
#</a></li>
 <li><a href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html" 
accesskey="4">LaTeX TeX &bull; , &copy; &hellip; <small 
class="enddots">...</small></a></li>
 <li><a href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" 
accesskey="5">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a></li>
 <li><a href="_2265-_2264-_2192.html" accesskey="6">&ge; &le; &rarr;</a></li>
 <li><a href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html" 
accesskey="7">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a></li>
-<li><a href="_21d2-_00b0-a-b--aa.html" accesskey="8">&rArr; &deg; a&nbsp;b a 
sunny day &aring;</a></li>
+<li><a href="_21d2-_00b0-a-b-aa.html" accesskey="8">&rArr; &deg; a&nbsp;b a 
sunny day &aring;</a></li>
 <li><a href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" accesskey="9">&Aring; 
&aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; 
&eth; &THORN; &thorn;</a></li>
 <li><a href="a-e-i-a-a-e-c-e-e-e-e.html">&auml; &#7869; &icirc; &acirc; 
&agrave; &eacute; &ccedil; &#275; e&#778; e&#779; &#281;</a></li>
 <li><a href="e-e-e-e-e-j-ee.html">&#279; &#277; e&#818; &#7865; &#283; &#567; 
e&#865;e</a></li>
diff --git a/tp/t/results/info_tests/end_of_line_command_in_node_lines.pl 
b/tp/t/results/info_tests/end_of_line_command_in_node_lines.pl
index 2e2d2c963c..6688ec2b84 100644
--- a/tp/t/results/info_tests/end_of_line_command_in_node_lines.pl
+++ b/tp/t/results/info_tests/end_of_line_command_in_node_lines.pl
@@ -142,10 +142,10 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
               {},
               {}
             ],
-            'normalized' => 'chap---f-nl-Something_003f---After-punct'
+            'normalized' => 'chap-f-nl-Something_003f-After-punct'
           }
         ],
-        'normalized' => 'chap---f-nl-Something_003f---After-punct',
+        'normalized' => 'chap-f-nl-Something_003f-After-punct',
         'spaces_before_argument' => ' '
       },
       'parent' => {},
@@ -209,7 +209,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
               {},
               {}
             ],
-            'normalized' => 'ankh---p'
+            'normalized' => 'ankh-p'
           },
           'parent' => {},
           'source_info' => {
@@ -475,7 +475,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
                     {},
                     {}
                   ],
-                  'normalized' => 'chap---f-nl-Something_003f---After-punct'
+                  'normalized' => 'chap-f-nl-Something_003f-After-punct'
                 }
               },
               'parent' => {},
@@ -533,7 +533,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
                     {},
                     {}
                   ],
-                  'normalized' => 'ankh---p'
+                  'normalized' => 'ankh-p'
                 }
               },
               'parent' => {},
@@ -612,7 +612,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
                     {},
                     {}
                   ],
-                  'normalized' => 'ankh---p'
+                  'normalized' => 'ankh-p'
                 }
               },
               'parent' => {},
@@ -715,7 +715,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
                     {},
                     {}
                   ],
-                  'normalized' => 'chap---f-nl-Something_003f---After-punct'
+                  'normalized' => 'chap-f-nl-Something_003f-After-punct'
                 }
               },
               'parent' => {},
@@ -782,7 +782,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
                     {},
                     {}
                   ],
-                  'normalized' => 'ankh---p'
+                  'normalized' => 'ankh-p'
                 }
               },
               'parent' => {},
@@ -873,7 +873,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
                     {},
                     {}
                   ],
-                  'normalized' => 'ankh---p'
+                  'normalized' => 'ankh-p'
                 }
               },
               'parent' => {},
@@ -1304,7 +1304,7 @@ $result_sectioning{'end_of_line_command_in_node_lines'} = 
{
                   'cmdname' => 'node',
                   'extra' => {
                     'isindex' => 1,
-                    'normalized' => 'chap---f-nl-Something_003f---After-punct'
+                    'normalized' => 'chap-f-nl-Something_003f-After-punct'
                   },
                   'structure' => {}
                 }
@@ -1377,7 +1377,7 @@ $result_nodes{'end_of_line_command_in_node_lines'} = {
           }
         },
         'isindex' => 1,
-        'normalized' => 'chap---f-nl-Something_003f---After-punct'
+        'normalized' => 'chap-f-nl-Something_003f-After-punct'
       },
       'structure' => {
         'node_next' => {
@@ -1426,13 +1426,13 @@ $result_menus{'end_of_line_command_in_node_lines'} = {
 
 $result_errors{'end_of_line_command_in_node_lines'} = [
   {
-    'error_line' => '@menu reference to nonexistent node `ankh p\'
+    'error_line' => 'warning: @menu entry node name `ankh p\' different from 
anchor name `ankh @* p\'
 ',
     'file_name' => '',
     'line_nr' => 28,
     'macro' => '',
-    'text' => '@menu reference to nonexistent node `ankh p\'',
-    'type' => 'error'
+    'text' => '@menu entry node name `ankh p\' different from anchor name 
`ankh @* p\'',
+    'type' => 'warning'
   }
 ];
 
diff --git a/tp/t/results/menu/space_and_commands_in_menu_node.pl 
b/tp/t/results/menu/space_and_commands_in_menu_node.pl
index 768e36d3fb..20db680ef7 100644
--- a/tp/t/results/menu/space_and_commands_in_menu_node.pl
+++ b/tp/t/results/menu/space_and_commands_in_menu_node.pl
@@ -203,7 +203,7 @@ $result_trees{'space_and_commands_in_menu_node'} = {
                     {},
                     {}
                   ],
-                  'normalized' => 'chap--b'
+                  'normalized' => 'chap-b'
                 }
               },
               'parent' => {},
@@ -332,7 +332,7 @@ $result_trees{'space_and_commands_in_menu_node'} = {
                     {},
                     {}
                   ],
-                  'normalized' => 'chap--b'
+                  'normalized' => 'chap-b'
                 }
               },
               'parent' => {},
@@ -399,7 +399,7 @@ $result_trees{'space_and_commands_in_menu_node'} = {
                     {},
                     {}
                   ],
-                  'normalized' => 'chap--b'
+                  'normalized' => 'chap-b'
                 }
               },
               'parent' => {},
@@ -466,7 +466,7 @@ $result_trees{'space_and_commands_in_menu_node'} = {
                     {},
                     {}
                   ],
-                  'normalized' => 'chap--b'
+                  'normalized' => 'chap-b'
                 }
               },
               'parent' => {},
@@ -549,7 +549,7 @@ $result_trees{'space_and_commands_in_menu_node'} = {
                     {},
                     {}
                   ],
-                  'normalized' => 'chap--b'
+                  'normalized' => 'chap-b'
                 }
               },
               'parent' => {},
@@ -710,7 +710,7 @@ $result_trees{'space_and_commands_in_menu_node'} = {
                     {},
                     {}
                   ],
-                  'normalized' => 'chap---b'
+                  'normalized' => 'chap-b'
                 }
               },
               'parent' => {},
@@ -819,10 +819,10 @@ $result_trees{'space_and_commands_in_menu_node'} = {
               {},
               {}
             ],
-            'normalized' => 'chap--b'
+            'normalized' => 'chap-b'
           }
         ],
-        'normalized' => 'chap--b',
+        'normalized' => 'chap-b',
         'spaces_before_argument' => ' '
       },
       'parent' => {},
@@ -1086,7 +1086,7 @@ $result_sectioning{'space_and_commands_in_menu_node'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chap--b'
+                    'normalized' => 'chap-b'
                   },
                   'structure' => {}
                 }
@@ -1140,7 +1140,7 @@ $result_nodes{'space_and_commands_in_menu_node'} = {
             'section_number' => 1
           }
         },
-        'normalized' => 'chap--b'
+        'normalized' => 'chap-b'
       },
       'structure' => {
         'node_next' => {},
@@ -1165,7 +1165,7 @@ $result_menus{'space_and_commands_in_menu_node'} = {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chap--b'
+        'normalized' => 'chap-b'
       },
       'structure' => {
         'menu_next' => {},
@@ -1184,22 +1184,22 @@ 
$result_menus{'space_and_commands_in_menu_node'}{'structure'}{'menu_child'}{'str
 
 $result_errors{'space_and_commands_in_menu_node'} = [
   {
-    'error_line' => '@menu reference to nonexistent node `chap  b\'
+    'error_line' => 'warning: @menu entry node name `chap  b\' different from 
node name `chap @: b\'
 ',
     'file_name' => '',
     'line_nr' => 5,
     'macro' => '',
-    'text' => '@menu reference to nonexistent node `chap  b\'',
-    'type' => 'error'
+    'text' => '@menu entry node name `chap  b\' different from node name `chap 
@: b\'',
+    'type' => 'warning'
   },
   {
-    'error_line' => '@menu reference to nonexistent node `chap b\'
+    'error_line' => 'warning: @menu entry node name `chap b\' different from 
node name `chap @: b\'
 ',
     'file_name' => '',
     'line_nr' => 7,
     'macro' => '',
-    'text' => '@menu reference to nonexistent node `chap b\'',
-    'type' => 'error'
+    'text' => '@menu entry node name `chap b\' different from node name `chap 
@: b\'',
+    'type' => 'warning'
   },
   {
     'error_line' => 'warning: @menu entry node name `chap@ @ b\' different 
from node name `chap @: b\'
@@ -1229,22 +1229,22 @@ $result_errors{'space_and_commands_in_menu_node'} = [
     'type' => 'warning'
   },
   {
-    'error_line' => '@menu reference to nonexistent node `chap b\'
+    'error_line' => 'warning: @menu entry node name `chap b\' different from 
node name `chap @: b\'
 ',
     'file_name' => '',
     'line_nr' => 12,
     'macro' => '',
-    'text' => '@menu reference to nonexistent node `chap b\'',
-    'type' => 'error'
+    'text' => '@menu entry node name `chap b\' different from node name `chap 
@: b\'',
+    'type' => 'warning'
   },
   {
-    'error_line' => '@menu reference to nonexistent node `chap @ @ b\'
+    'error_line' => 'warning: @menu entry node name `chap @ @ b\' different 
from node name `chap @: b\'
 ',
     'file_name' => '',
     'line_nr' => 13,
     'macro' => '',
-    'text' => '@menu reference to nonexistent node `chap @ @ b\'',
-    'type' => 'error'
+    'text' => '@menu entry node name `chap @ @ b\' different from node name 
`chap @: b\'',
+    'type' => 'warning'
   }
 ];
 
@@ -1302,36 +1302,36 @@ td.menu-entry-destination {vertical-align: top}
 <div class="top-level-extent" id="Top">
 <div class="nav-panel">
 <p>
-Next: <a href="#chap--b" accesskey="n" rel="next">Chap</a> &nbsp; </p>
+Next: <a href="#chap-b" accesskey="n" rel="next">Chap</a> &nbsp; </p>
 </div>
 <h1 class="top" id="top">top</h1>
 
 <table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination">&bull; chap  
b:</td><td>&nbsp;&nbsp;</td><td class="menu-entry-description">
+<tr><td class="menu-entry-destination">&bull; <a href="#chap-b" 
accesskey="1">chap  b</a>:</td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
 </td></tr>
-<tr><td class="menu-entry-destination">&bull; <a href="#chap--b" 
accesskey="2">chap  b</a>:</td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
+<tr><td class="menu-entry-destination">&bull; <a href="#chap-b" 
accesskey="2">chap  b</a>:</td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
 </td></tr>
-<tr><td class="menu-entry-destination">&bull; chap 
b:</td><td>&nbsp;&nbsp;</td><td class="menu-entry-description">
+<tr><td class="menu-entry-destination">&bull; <a href="#chap-b" 
accesskey="3">chap b</a>:</td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
 </td></tr>
-<tr><td class="menu-entry-destination">&bull; <a href="#chap--b" 
accesskey="4">chap&nbsp;&nbsp;b</a>:</td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
+<tr><td class="menu-entry-destination">&bull; <a href="#chap-b" 
accesskey="4">chap&nbsp;&nbsp;b</a>:</td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
 </td></tr>
-<tr><td class="menu-entry-destination">&bull; <a href="#chap--b" 
accesskey="5">chap&nbsp; b</a>:</td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
+<tr><td class="menu-entry-destination">&bull; <a href="#chap-b" 
accesskey="5">chap&nbsp; b</a>:</td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
 </td></tr>
-<tr><td class="menu-entry-destination">&bull; <a href="#chap--b" 
accesskey="6">chap &nbsp;b</a>:</td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
+<tr><td class="menu-entry-destination">&bull; <a href="#chap-b" 
accesskey="6">chap &nbsp;b</a>:</td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
 </td></tr>
-<tr><td class="menu-entry-destination">&bull; <a href="#chap--b" 
accesskey="7">label</a>:</td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
+<tr><td class="menu-entry-destination">&bull; <a href="#chap-b" 
accesskey="7">label</a>:</td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
 </td></tr>
-<tr><td class="menu-entry-destination">&bull; 
label:</td><td>&nbsp;&nbsp;</td><td class="menu-entry-description">
+<tr><td class="menu-entry-destination">&bull; <a href="#chap-b" 
accesskey="8">label</a>:</td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
 </td></tr>
-<tr><td class="menu-entry-destination">&bull; 
label:</td><td>&nbsp;&nbsp;</td><td class="menu-entry-description">
+<tr><td class="menu-entry-destination">&bull; <a href="#chap-b" 
accesskey="9">label</a>:</td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">
 </td></tr>
 </table>
 
 <hr>
-<div class="chapter-level-extent" id="chap--b">
+<div class="chapter-level-extent" id="chap-b">
 <div class="nav-panel">
 <p>
-Next: <a href="#chap--b" accesskey="n" rel="next">Chap</a>, Previous: <a 
href="#Top" accesskey="p" rel="prev">top</a>, Up: <a href="#Top" accesskey="u" 
rel="up">top</a> &nbsp; </p>
+Next: <a href="#chap-b" accesskey="n" rel="next">Chap</a>, Previous: <a 
href="#Top" accesskey="p" rel="prev">top</a>, Up: <a href="#Top" accesskey="u" 
rel="up">top</a> &nbsp; </p>
 </div>
 <h2 class="chapter" id="Chap">1 Chap</h2>
 </div>
@@ -1360,7 +1360,7 @@ 
$result_converted{'xml'}->{'space_and_commands_in_menu_node'} = '<node name="Top
 </pre></menudescription></menuentry></menu>
 
 </top>
-<node name="chap--b" spaces=" "><nodename>chap &noeos; b</nodename><nodenext 
automatic="on">chap &noeos; b</nodenext><nodeprev 
automatic="on">Top</nodeprev><nodeup automatic="on">Top</nodeup></node>
+<node name="chap-b" spaces=" "><nodename>chap &noeos; b</nodename><nodenext 
automatic="on">chap &noeos; b</nodenext><nodeprev 
automatic="on">Top</nodeprev><nodeup automatic="on">Top</nodeup></node>
 <chapter spaces=" "><sectiontitle>Chap</sectiontitle>
 </chapter>
 ';
diff --git a/tp/t/results/misc_commands/comment_space_command_on_line.pl 
b/tp/t/results/misc_commands/comment_space_command_on_line.pl
index 8c439a9637..7e924e5324 100644
--- a/tp/t/results/misc_commands/comment_space_command_on_line.pl
+++ b/tp/t/results/misc_commands/comment_space_command_on_line.pl
@@ -1035,16 +1035,16 @@ 
$result_converted{'html_text'}->{'comment_space_command_on_line'} = '
 <h2 class="chapter" id="Chapter-">1 Chapter&nbsp;</h2>
 
 
-<a class="index-entry-id" id="index-index-entry--"></a>
+<a class="index-entry-id" id="index-index-entry-"></a>
 
-<h3 class="heading" id="Heading--">Heading &nbsp;</h3>
+<h3 class="heading" id="Heading-">Heading &nbsp;</h3>
 
 <div class="printindex cp-printindex">
 <table class="cp-entries-printindex" border="0">
 <tr><td></td><th class="entries-header-printindex">Index 
Entry</th><td>&nbsp;</td><th class="sections-header-printindex"> 
Section</th></tr>
 <tr><td colspan="4"> <hr></td></tr>
 <tr><th id="t_i_cp_letter-I">I</th><td></td><td></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="#index-index-entry--">index entry &nbsp;</a>:</td><td>&nbsp;</td><td 
class="printindex-index-section"><a href="#chap">chap</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-index-entry-">index entry &nbsp;</a>:</td><td>&nbsp;</td><td 
class="printindex-index-section"><a href="#chap">chap</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
 </table>
 </div>



reply via email to

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