texinfo-commits
[Top][All Lists]
Advanced

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

[no subject]


From: Patrice Dumas
Date: Sun, 29 Sep 2024 14:03:25 -0400 (EDT)

branch: master
commit 002e419dbb23d1af656d6c8716f27aefc12ef431
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Jul 6 14:02:13 2024 +0200

    * tp/Texinfo/Convert/Plaintext.pm (format_ref): do not prepend :: at
    the end of a reference.  Move code auround.
---
 ChangeLog                                          |   5 +
 tp/Texinfo/Convert/Plaintext.pm                    |  21 +-
 tp/t/no_structure_test.t                           |   2 +-
 .../results/converters_tests/at_commands_in_raw.pl |   4 +-
 tp/t/results/converters_tests/commands_in_sc.pl    |   4 +-
 tp/t/results/converters_tests/commands_in_var.pl   |   4 +-
 .../footnote_no_number_separate.pl                 |   4 +-
 tp/t/results/converters_tests/form_feeds.pl        |   2 +-
 .../converters_tests/ref_error_formatting.pl       |  52 +-
 tp/t/results/converters_tests/ref_in_sectioning.pl |  72 +-
 tp/t/results/converters_tests/refs_formatting.pl   |  28 +-
 .../some_at_commands_in_ref_nodes.pl               |   4 +-
 .../converters_tests/spaces_in_empty_node_names.pl |   6 +-
 .../converters_tests/spaces_in_node_names.pl       |   6 +-
 .../converters_tests/things_before_setfilename.pl  |   4 +-
 .../things_before_setfilename_no_element.pl        |   4 +-
 tp/t/results/converters_tests/top_in_ref.pl        |  26 +-
 .../coverage_braces/ref_in_style_command.pl        |   2 +-
 .../two_footnotes_in_nodes_separate.pl             |   8 +-
 .../two_footnotes_in_nodes_separate_no_header.pl   |   8 +-
 tp/t/results/def/ref_in_def.pl                     |   4 +-
 tp/t/results/float/float_copying.pl                |   6 +-
 .../formats_encodings/at_commands_in_refs.pl       |  54 +-
 .../index_entry_in_footnote_sections_separate.pl   |   2 +-
 .../indices/index_entry_in_footnote_separate.pl    |   2 +-
 .../res_plaintext/Copying-and-indices.txt          |   8 +-
 .../res_plaintext/Copying-and-indices.txt          |   8 +-
 .../res_plaintext/Copying-and-indices.txt          |   8 +-
 .../res_plaintext/Copying-and-indices.txt          |   8 +-
 .../res_plaintext/Copying-and-indices.txt          |   8 +-
 .../res_plaintext/Chapter.txt                      |   2 +-
 .../res_plaintext/Copying-and-indices.txt          |  10 +-
 .../res_plaintext/Chapter.txt                      |   2 +-
 .../res_plaintext/Copying-and-indices.txt          |  10 +-
 .../res_plaintext/Copying-and-indices.txt          |   8 +-
 tp/t/results/languages/unknown_language.pl         |   4 +-
 .../menu/commands_in_nodedescriptionblock.pl       |   8 +-
 tp/t/results/misc_commands/ref_in_center.pl        |   2 +-
 tp/t/results/multitable/ref_in_multitable.pl       |  12 +-
 .../at_commands_glued_in_example.pl                |   2 +-
 .../at_commands_glued_in_paragraph.pl              |   2 +-
 .../plaintext_tests/del_quote_linebreaking.pl      |  12 +-
 .../res_plaintext/quote_node_names.txt             |  10 +-
 ...double_recursive_self_section_node_reference.pl |   4 +-
 .../double_recursive_self_section_reference.pl     |   8 +-
 .../sectioning/recursive_self_section_reference.pl |   4 +-
 .../res_parser/formatting_plaintext/formatting.txt | 986 ++++++++++-----------
 .../formatting.txt                                 | 986 ++++++++++-----------
 48 files changed, 1220 insertions(+), 1226 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c06e78dada..540f4efe9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-07-06  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/Plaintext.pm (format_ref): do not prepend :: at
+       the end of a reference.  Move code auround.
+
 2024-07-06  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/Plaintext.pm (format_ref): no see for @ref.
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 67233caee5..b89f492e84 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -2016,13 +2016,6 @@ sub format_ref($$$$)
     $args[2] = undef;
   }
 
-  if ($cmdname eq 'xref' or $cmdname eq 'inforef') {
-    _convert($self, {'type' => '_stop_upper_case',
-                     'contents' => [{'text' => 'See '}]});
-  } elsif ($cmdname eq 'pxref') {
-    _convert($self, {'type' => '_stop_upper_case',
-                     'contents' => [{'text' => 'see '}]});
-  }
   my $name;
   if (defined($args[1])) {
     $name = $args[1];
@@ -2044,6 +2037,14 @@ sub format_ref($$$$)
     $file = {'text' => '()'};
   }
 
+  if ($cmdname eq 'xref' or $cmdname eq 'inforef') {
+    _convert($self, {'type' => '_stop_upper_case',
+                     'contents' => [{'text' => 'See '}]});
+  } elsif ($cmdname eq 'pxref') {
+    _convert($self, {'type' => '_stop_upper_case',
+                     'contents' => [{'text' => 'see '}]});
+  }
+
   if ($name) {
     _convert($self, $name);
     _stream_output($self,
@@ -2062,12 +2063,6 @@ sub format_ref($$$$)
                      {'type' => '_code',
                       'contents' => [$label_element]}]});
   delete $self->{'formatters'}->[-1]->{'suppress_styles'};
-
-  if (!$name) {
-    _stream_output($self,
-      add_next($self->{'formatters'}->[-1]->{'container'}, '::'),
-      $self->{'formatters'}[-1]{'container'});
-  }
 }
 
 sub format_node($$)
diff --git a/tp/t/no_structure_test.t b/tp/t/no_structure_test.t
index 91dd9636c1..824638f176 100644
--- a/tp/t/no_structure_test.t
+++ b/tp/t/no_structure_test.t
@@ -162,7 +162,7 @@ Chap
 Results
 *******
 
-See point::.
+See point.
 
 subsec
 ------
diff --git a/tp/t/results/converters_tests/at_commands_in_raw.pl 
b/tp/t/results/converters_tests/at_commands_in_raw.pl
index 378e72cdec..e34c925e6c 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -1418,9 +1418,9 @@ $result_converted{'plaintext'}->{'at_commands_in_raw'} = 
'top
 
    ‘in kbd after tex’.
 
-   See anchor in html::.
+   See anchor in html.
 
-   anchor in tex::.
+   anchor in tex.
 
    newidx entry
 
diff --git a/tp/t/results/converters_tests/commands_in_sc.pl 
b/tp/t/results/converters_tests/commands_in_sc.pl
index 5ddfd9021a..f5a45fb33f 100644
--- a/tp/t/results/converters_tests/commands_in_sc.pl
+++ b/tp/t/results/converters_tests/commands_in_sc.pl
@@ -818,8 +818,8 @@ $result_converted{'plaintext'}->{'commands_in_sc'} = 
'commands in sc
 1 chap
 ******
 
-A Ñ Å TeX [myimage] chap:: See (f)node:: NAME: (argf)ext inverb ÿ MA+TH (1) 
<la>
-B (a) LB c E <a@c> AB (D)
+A Ñ Å TeX [myimage] chap See (f)node NAME: (argf)ext inverb ÿ MA+TH (1) <la> B
+(a) LB c E <a@c> AB (D)
 
    ---------- Footnotes ----------
 
diff --git a/tp/t/results/converters_tests/commands_in_var.pl 
b/tp/t/results/converters_tests/commands_in_var.pl
index 1d5595902b..4b4417924a 100644
--- a/tp/t/results/converters_tests/commands_in_var.pl
+++ b/tp/t/results/converters_tests/commands_in_var.pl
@@ -818,8 +818,8 @@ $result_converted{'plaintext'}->{'commands_in_var'} = 
'commands in var
 1 chap
 ******
 
-A Ñ Å TeX [myimage] chap:: See (f)node:: NAME: (argf)ext inverb ÿ MA+TH (1) 
<la>
-B (a) LB c E <a@c> AB (D)
+A Ñ Å TeX [myimage] chap See (f)node NAME: (argf)ext inverb ÿ MA+TH (1) <la> B
+(a) LB c E <a@c> AB (D)
 
    ---------- Footnotes ----------
 
diff --git a/tp/t/results/converters_tests/footnote_no_number_separate.pl 
b/tp/t/results/converters_tests/footnote_no_number_separate.pl
index b6a70a2e75..b615ba1f12 100644
--- a/tp/t/results/converters_tests/footnote_no_number_separate.pl
+++ b/tp/t/results/converters_tests/footnote_no_number_separate.pl
@@ -353,9 +353,9 @@ 
$result_converted{'plaintext'}->{'footnote_no_number_separate'} = 'top
 1 Chapter
 *********
 
-Para(*) (see chap-Footnote-1::).
+Para(*) (see chap-Footnote-1).
 
-   Para2(*) (see chap-Footnote-2::).
+   Para2(*) (see chap-Footnote-2).
 
    (*) Footnote 1.
 
diff --git a/tp/t/results/converters_tests/form_feeds.pl 
b/tp/t/results/converters_tests/form_feeds.pl
index 97000ae6a0..fbcb7dcbf1 100644
--- a/tp/t/results/converters_tests/form_feeds.pl
+++ b/tp/t/results/converters_tests/form_feeds.pl
@@ -1385,7 +1385,7 @@ aa
 
    ‘middle in code’
 
-   See chap node::
+   See chap node
 
      in example
 
diff --git a/tp/t/results/converters_tests/ref_error_formatting.pl 
b/tp/t/results/converters_tests/ref_error_formatting.pl
index 0513c1937a..cfd6f451b8 100644
--- a/tp/t/results/converters_tests/ref_error_formatting.pl
+++ b/tp/t/results/converters_tests/ref_error_formatting.pl
@@ -2937,39 +2937,37 @@ $result_floats{'ref_error_formatting'} = {};
 
 
 
-$result_converted{'plaintext'}->{'ref_error_formatting'} = '‘@ref{node}’ node::
+$result_converted{'plaintext'}->{'ref_error_formatting'} = '‘@ref{node}’ node
 
    ‘@ref{,cross ref name}’ cross ref name: ‘@ref{,,title}’ title:
-‘@ref{,,,file name}’ (file name):: ‘@ref{,,,,manual}’ ()::
-‘@ref{node,cross ref name}’ cross ref name: node ‘@ref{node,,title}’
-title: node ‘@ref{node,,,file name}’ (file name)node::
-‘@ref{node,,,,manual}’ ()node:: ‘@ref{node,cross ref name,title,}’ cross
-ref name: node ‘@ref{node,cross ref name,,file name}’ cross ref name:
-(file name)node ‘@ref{node,cross ref name,,,manual}’ cross ref name:
-()node ‘@ref{node,cross ref name,title,file name}’ cross ref name: (file
-name)node ‘@ref{node,cross ref name,title,,manual}’ cross ref name:
-()node ‘@ref{node,cross ref name,title, file name, manual}’ cross ref
-name: (file name)node ‘@ref{node,,title,file name}’ title: (file
-name)node ‘@ref{node,,title,,manual}’ title: ()node ‘@ref{node,,title,
-file name, manual}’ title: (file name)node ‘@ref{node,,,file
-name,manual}’ (file name)node:: ‘@ref{,cross ref name,title,}’ cross ref
-name: ‘@ref{,cross ref name,,file name}’ cross ref name: (file name)
-‘@ref{,cross ref name,,,manual}’ cross ref name: () ‘@ref{,cross ref
-name,title,file name}’ cross ref name: (file name) ‘@ref{,cross ref
-name,title,,manual}’ cross ref name: () ‘@ref{,cross ref name,title,
-file name, manual}’ cross ref name: (file name) ‘@ref{,,title,file
-name}’ title: (file name) ‘@ref{,,title,,manual}’ title: ()
-‘@ref{,,title, file name, manual}’ title: (file name) ‘@ref{,,,file
-name,manual}’ (file name)::
+‘@ref{,,,file name}’ (file name) ‘@ref{,,,,manual}’ () ‘@ref{node,cross
+ref name}’ cross ref name: node ‘@ref{node,,title}’ title: node
+‘@ref{node,,,file name}’ (file name)node ‘@ref{node,,,,manual}’ ()node
+‘@ref{node,cross ref name,title,}’ cross ref name: node ‘@ref{node,cross
+ref name,,file name}’ cross ref name: (file name)node ‘@ref{node,cross
+ref name,,,manual}’ cross ref name: ()node ‘@ref{node,cross ref
+name,title,file name}’ cross ref name: (file name)node ‘@ref{node,cross
+ref name,title,,manual}’ cross ref name: ()node ‘@ref{node,cross ref
+name,title, file name, manual}’ cross ref name: (file name)node
+‘@ref{node,,title,file name}’ title: (file name)node
+‘@ref{node,,title,,manual}’ title: ()node ‘@ref{node,,title, file name,
+manual}’ title: (file name)node ‘@ref{node,,,file name,manual}’ (file
+name)node ‘@ref{,cross ref name,title,}’ cross ref name: ‘@ref{,cross
+ref name,,file name}’ cross ref name: (file name) ‘@ref{,cross ref
+name,,,manual}’ cross ref name: () ‘@ref{,cross ref name,title,file
+name}’ cross ref name: (file name) ‘@ref{,cross ref name,title,,manual}’
+cross ref name: () ‘@ref{,cross ref name,title, file name, manual}’
+cross ref name: (file name) ‘@ref{,,title,file name}’ title: (file name)
+‘@ref{,,title,,manual}’ title: () ‘@ref{,,title, file name, manual}’
+title: (file name) ‘@ref{,,,file name,manual}’ (file name)
 
    ‘@inforef{,cross ref name }’ See cross ref name: ‘@inforef{,,file
-name}’ See (file name):: ‘@inforef{,cross ref name, file name}’ See
-cross ref name: (file name) ‘@inforef{}’ See ::
+name}’ See (file name) ‘@inforef{,cross ref name, file name}’ See cross
+ref name: (file name) ‘@inforef{}’ See
 
    ‘@inforef{node, cross ref name, file name}’ See cross ref name: (file
-name)node ‘@inforef{node}’ See node:: ‘@inforef{node, cross ref name}’
-See cross ref name: node ‘@inforef{node,,file name}’ See (file
-name)node::
+name)node ‘@inforef{node}’ See node ‘@inforef{node, cross ref name}’ See
+cross ref name: node ‘@inforef{node,,file name}’ See (file name)node
 ';
 
 
diff --git a/tp/t/results/converters_tests/ref_in_sectioning.pl 
b/tp/t/results/converters_tests/ref_in_sectioning.pl
index 541d9b5186..641d79c4da 100644
--- a/tp/t/results/converters_tests/ref_in_sectioning.pl
+++ b/tp/t/results/converters_tests/ref_in_sectioning.pl
@@ -2164,34 +2164,34 @@ $result_floats{'ref_in_sectioning'} = {};
 
 
 
-$result_converted{'plaintext'}->{'ref_in_sectioning'} = 'for example node:: 
(see node::) (see (file)Top::)
+$result_converted{'plaintext'}->{'ref_in_sectioning'} = 'for example node (see 
node) (see (file)Top)
 1 See title: (file name)node.
-2 node:: just node
-  2.1 for example node:: (see node::) (see (file)Top::)
+2 node just node
+  2.1 for example node (see node) (see (file)Top)
   2.2 cross ref name: node node, crossref arg2
   2.3 ‘title’: node code node, samptitle arg3
-  2.4 (file name)node:: code node, file name
-  2.5 ()node:: node and manual
-  2.6 ()Top:: Top and manual
-  2.7 ():: no node just manual
-  2.8 (file name):: no node just file name
+  2.4 (file name)node code node, file name
+  2.5 ()node node and manual
+  2.6 ()Top Top and manual
+  2.7 () no node just manual
+  2.8 (file name) no node just file name
   2.9 See b: (c)a inforef a b c
-  2.10 (see (file name)Top::) pxref Top file name, spaces
-  2.11 (see (file name)::) pxref file name only, spaces
-  2.12 See (filename)Top::, xref Top filename only, no spaces
-  2.13 See (filename)::. xref filename only, no spaces
+  2.10 (see (file name)Top) pxref Top file name, spaces
+  2.11 (see (file name)) pxref file name only, spaces
+  2.12 See (filename)Top, xref Top filename only, no spaces
+  2.13 See (filename). xref filename only, no spaces
 
-for example node:: (see node::) (see (file)Top::)
-*************************************************
+for example node (see node) (see (file)Top)
+*******************************************
 
 1 See title: (file name)node.
 *****************************
 
-2 node:: just node
-******************
+2 node just node
+****************
 
-2.1 for example node:: (see node::) (see (file)Top::)
-=====================================================
+2.1 for example node (see node) (see (file)Top)
+===============================================
 
 2.2 cross ref name: node node, crossref arg2
 ============================================
@@ -2199,35 +2199,35 @@ for example node:: (see node::) (see (file)Top::)
 2.3 ‘title’: node code node, samptitle arg3
 ===========================================
 
-2.4 (file name)node:: code node, file name
-==========================================
-
-2.5 ()node:: node and manual
-============================
+2.4 (file name)node code node, file name
+========================================
 
-2.6 ()Top:: Top and manual
+2.5 ()node node and manual
 ==========================
 
-2.7 ():: no node just manual
-============================
+2.6 ()Top Top and manual
+========================
 
-2.8 (file name):: no node just file name
-========================================
+2.7 () no node just manual
+==========================
+
+2.8 (file name) no node just file name
+======================================
 
 2.9 See b: (c)a inforef a b c
 =============================
 
-2.10 (see (file name)Top::) pxref Top file name, spaces
-=======================================================
-
-2.11 (see (file name)::) pxref file name only, spaces
+2.10 (see (file name)Top) pxref Top file name, spaces
 =====================================================
 
-2.12 See (filename)Top::, xref Top filename only, no spaces
-===========================================================
+2.11 (see (file name)) pxref file name only, spaces
+===================================================
+
+2.12 See (filename)Top, xref Top filename only, no spaces
+=========================================================
 
-2.13 See (filename)::. xref filename only, no spaces
-====================================================
+2.13 See (filename). xref filename only, no spaces
+==================================================
 
 ';
 
diff --git a/tp/t/results/converters_tests/refs_formatting.pl 
b/tp/t/results/converters_tests/refs_formatting.pl
index ebe9295c6c..e2ee798646 100644
--- a/tp/t/results/converters_tests/refs_formatting.pl
+++ b/tp/t/results/converters_tests/refs_formatting.pl
@@ -3032,26 +3032,26 @@ $result_converted{'plaintext'}->{'refs_formatting'} = 
'1 chapter
 
 ‘@ref{chapter,cross ref name}’ cross ref name: chapter
 ‘@ref{chapter,,title}’ title: chapter ‘@ref{chapter,,,file name}’ (file
-name)chapter:: ‘@ref{chapter,,,,manual}’ ()chapter:: ‘@ref{chapter,cross
-ref name,title,}’ cross ref name: chapter ‘@ref{chapter,cross ref
-name,,file name}’ cross ref name: (file name)chapter ‘@ref{chapter,cross
-ref name,,,manual}’ cross ref name: ()chapter ‘@ref{chapter,cross ref
+name)chapter ‘@ref{chapter,,,,manual}’ ()chapter ‘@ref{chapter,cross ref
+name,title,}’ cross ref name: chapter ‘@ref{chapter,cross ref name,,file
+name}’ cross ref name: (file name)chapter ‘@ref{chapter,cross ref
+name,,,manual}’ cross ref name: ()chapter ‘@ref{chapter,cross ref
 name,title,file name}’ cross ref name: (file name)chapter
 ‘@ref{chapter,cross ref name,title,,manual}’ cross ref name: ()chapter
 ‘@ref{chapter,cross ref name,title, file name, manual}’ cross ref name:
 (file name)chapter ‘@ref{chapter,,title,file name}’ title: (file
 name)chapter ‘@ref{chapter,,title,,manual}’ title: ()chapter
 ‘@ref{chapter,,title, file name, manual}’ title: (file name)chapter
-‘@ref{chapter,,,file name,manual}’ (file name)chapter::
+‘@ref{chapter,,,file name,manual}’ (file name)chapter
 
    ‘@ref{(pman)anode,cross ref name}’ cross ref name: (pman)anode
 ‘@ref{(pman)anode,,title}’ title: (pman)anode ‘@ref{(pman)anode,,,file
-name}’ (file name)(pman)anode:: ‘@ref{(pman)anode,,,,manual}’
-()(pman)anode:: ‘@ref{(pman)anode,cross ref name,title,}’ cross ref
-name: (pman)anode ‘@ref{(pman)anode,cross ref name,,file name}’ cross
-ref name: (file name)(pman)anode ‘@ref{(pman)anode,cross ref
-name,,,manual}’ cross ref name: ()(pman)anode ‘@ref{(pman)anode,cross
-ref name,title,file name}’ cross ref name: (file name)(pman)anode
+name}’ (file name)(pman)anode ‘@ref{(pman)anode,,,,manual}’
+()(pman)anode ‘@ref{(pman)anode,cross ref name,title,}’ cross ref name:
+(pman)anode ‘@ref{(pman)anode,cross ref name,,file name}’ cross ref
+name: (file name)(pman)anode ‘@ref{(pman)anode,cross ref name,,,manual}’
+cross ref name: ()(pman)anode ‘@ref{(pman)anode,cross ref
+name,title,file name}’ cross ref name: (file name)(pman)anode
 ‘@ref{(pman)anode,cross ref name,title,,manual}’ cross ref name:
 ()(pman)anode ‘@ref{(pman)anode,cross ref name,title, file name,
 manual}’ cross ref name: (file name)(pman)anode
@@ -3059,12 +3059,12 @@ manual}’ cross ref name: (file name)(pman)anode
 ‘@ref{(pman)anode,,title,,manual}’ title: ()(pman)anode
 ‘@ref{(pman)anode,,title, file name, manual}’ title: (file
 name)(pman)anode ‘@ref{(pman)anode,,,file name,manual}’ (file
-name)(pman)anode::
+name)(pman)anode
 
    ‘@inforef{chapter, cross ref name, file name}’ See cross ref name:
-(file name)chapter ‘@inforef{chapter}’ See chapter:: ‘@inforef{chapter,
+(file name)chapter ‘@inforef{chapter}’ See chapter ‘@inforef{chapter,
 cross ref name}’ See cross ref name: chapter ‘@inforef{chapter,,file
-name}’ See (file name)chapter::
+name}’ See (file name)chapter
 ';
 
 
diff --git a/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl 
b/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
index 264503c494..7e302faf8c 100644
--- a/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
+++ b/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
@@ -1493,9 +1493,9 @@ 
$result_converted{'plaintext'}->{'some_at_commands_in_ref_nodes'} = 'Top
 ***********************
 
 see (manual)a *strong* ref with SC, a i trema ï, a dotless i trema ï Ḕ
-and exclamdown ¡::.
+and exclamdown ¡.
 
-   See A SC Ñ Å TeX node ï ï Ḕ ł Ḉ ¡::.
+   See A SC Ñ Å TeX node ï ï Ḕ ł Ḉ ¡.
 ';
 
 
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 2efeb8ed43..462a13d48a 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
@@ -693,11 +693,11 @@ $result_floats{'spaces_in_empty_node_names'} = {};
 
 
 
-$result_converted{'plaintext'}->{'spaces_in_empty_node_names'} = '  ::
+$result_converted{'plaintext'}->{'spaces_in_empty_node_names'} = '  
 
-     ::
+     
 
-    ::
+    
 ';
 
 
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 734cd248b2..211aedb3cd 100644
--- a/tp/t/results/converters_tests/spaces_in_node_names.pl
+++ b/tp/t/results/converters_tests/spaces_in_node_names.pl
@@ -767,11 +767,11 @@ $result_floats{'spaces_in_node_names'} = {};
 
 
 
-$result_converted{'plaintext'}->{'spaces_in_node_names'} = 'chap  ::
+$result_converted{'plaintext'}->{'spaces_in_node_names'} = 'chap  
 
-   b  ::
+   b  
 
-   c ::
+   c 
 ';
 
 
diff --git a/tp/t/results/converters_tests/things_before_setfilename.pl 
b/tp/t/results/converters_tests/things_before_setfilename.pl
index 70a637870a..3522854e73 100644
--- a/tp/t/results/converters_tests/things_before_setfilename.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename.pl
@@ -1294,9 +1294,9 @@ 
$result_converted{'plaintext'}->{'things_before_setfilename'} = 'top section
 1 Chapter
 *********
 
-Ref to anchor An anchor::
+Ref to anchor An anchor
 
-   Ref to footnote anchor Anchor in footnote::
+   Ref to footnote anchor Anchor in footnote
 
 ';
 
diff --git 
a/tp/t/results/converters_tests/things_before_setfilename_no_element.pl 
b/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
index c43ac27afd..6ab090bf1e 100644
--- a/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
@@ -1042,9 +1042,9 @@ 
$result_indices_sort_strings{'things_before_setfilename_no_element'} = {
 
 
 
-$result_converted{'plaintext'}->{'things_before_setfilename_no_element'} = 
'Ref to anchor An anchor::
+$result_converted{'plaintext'}->{'things_before_setfilename_no_element'} = 
'Ref to anchor An anchor
 
-   Ref to footnote anchor Anchor in footnote::
+   Ref to footnote anchor Anchor in footnote
 
 ';
 
diff --git a/tp/t/results/converters_tests/top_in_ref.pl 
b/tp/t/results/converters_tests/top_in_ref.pl
index d5811ba5da..a0f56e524f 100644
--- a/tp/t/results/converters_tests/top_in_ref.pl
+++ b/tp/t/results/converters_tests/top_in_ref.pl
@@ -3026,21 +3026,21 @@ $result_floats{'top_in_ref'} = {};
 
 
 $result_converted{'plaintext'}->{'top_in_ref'} = '‘@ref{Top,cross ref name}’ 
cross ref name: Top ‘@ref{Top,,title}’ title:
-Top ‘@ref{Top,,,file name}’ (file name)Top:: ‘@ref{Top,,,,manual}’
-()Top:: ‘@ref{Top,cross ref name,title,}’ cross ref name: Top
-‘@ref{Top,cross ref name,,file name}’ cross ref name: (file name)Top
-‘@ref{Top,cross ref name,,,manual}’ cross ref name: ()Top
-‘@ref{Top,cross ref name,title,file name}’ cross ref name: (file
-name)Top ‘@ref{Top,cross ref name,title,,manual}’ cross ref name: ()Top
-‘@ref{Top,cross ref name,title, file name, manual}’ cross ref name:
-(file name)Top ‘@ref{Top,,title,file name}’ title: (file name)Top
+Top ‘@ref{Top,,,file name}’ (file name)Top ‘@ref{Top,,,,manual}’ ()Top
+‘@ref{Top,cross ref name,title,}’ cross ref name: Top ‘@ref{Top,cross
+ref name,,file name}’ cross ref name: (file name)Top ‘@ref{Top,cross ref
+name,,,manual}’ cross ref name: ()Top ‘@ref{Top,cross ref
+name,title,file name}’ cross ref name: (file name)Top ‘@ref{Top,cross
+ref name,title,,manual}’ cross ref name: ()Top ‘@ref{Top,cross ref
+name,title, file name, manual}’ cross ref name: (file name)Top
+‘@ref{Top,,title,file name}’ title: (file name)Top
 ‘@ref{Top,,title,,manual}’ title: ()Top ‘@ref{Top,,title, file name,
 manual}’ title: (file name)Top ‘@ref{Top,,,file name,manual}’ (file
-name)Top::
+name)Top
 
    ‘@ref{(pman)Top,cross ref name}’ cross ref name: (pman)Top
 ‘@ref{(pman)Top,,title}’ title: (pman)Top ‘@ref{(pman)Top,,,file name}’
-(file name)(pman)Top:: ‘@ref{(pman)Top,,,,manual}’ ()(pman)Top::
+(file name)(pman)Top ‘@ref{(pman)Top,,,,manual}’ ()(pman)Top
 ‘@ref{(pman)Top,cross ref name,title,}’ cross ref name: (pman)Top
 ‘@ref{(pman)Top,cross ref name,,file name}’ cross ref name: (file
 name)(pman)Top ‘@ref{(pman)Top,cross ref name,,,manual}’ cross ref name:
@@ -3051,11 +3051,11 @@ ref name,title, file name, manual}’ cross ref name: 
(file name)(pman)Top
 ‘@ref{(pman)Top,,title,file name}’ title: (file name)(pman)Top
 ‘@ref{(pman)Top,,title,,manual}’ title: ()(pman)Top
 ‘@ref{(pman)Top,,title, file name, manual}’ title: (file name)(pman)Top
-‘@ref{(pman)Top,,,file name,manual}’ (file name)(pman)Top::
+‘@ref{(pman)Top,,,file name,manual}’ (file name)(pman)Top
 
    ‘@inforef{Top, cross ref name, file name}’ See cross ref name: (file
-name)Top ‘@inforef{Top}’ See Top:: ‘@inforef{Top, cross ref name}’ See
-cross ref name: Top ‘@inforef{Top,,file name}’ See (file name)Top::
+name)Top ‘@inforef{Top}’ See Top ‘@inforef{Top, cross ref name}’ See
+cross ref name: Top ‘@inforef{Top,,file name}’ See (file name)Top
 ';
 
 
diff --git a/tp/t/results/coverage_braces/ref_in_style_command.pl 
b/tp/t/results/coverage_braces/ref_in_style_command.pl
index ff3e00175f..1e657efa3a 100644
--- a/tp/t/results/coverage_braces/ref_in_style_command.pl
+++ b/tp/t/results/coverage_braces/ref_in_style_command.pl
@@ -88,7 +88,7 @@ $result_floats{'ref_in_style_command'} = {};
 
 
 
-$result_converted{'plaintext'}->{'ref_in_style_command'} = '‘(manula)other 
node::’.
+$result_converted{'plaintext'}->{'ref_in_style_command'} = '‘(manula)other 
node’.
 ';
 
 
diff --git a/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl 
b/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
index 7ae482ed1c..e52e024d9e 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
@@ -815,9 +815,9 @@ End:
 $result_converted{'plaintext'}->{'two_footnotes_in_nodes_separate'} = '2 
footnotes in 2 nodes
 **********************
 
-A(1) (see Top-Footnote-1::)
+A(1) (see Top-Footnote-1)
 
-   B(2) (see Top-Footnote-2::)
+   B(2) (see Top-Footnote-2)
 
    (1) Footnote Top/1
 
@@ -830,9 +830,9 @@ A(1) (see Top-Footnote-1::)
 1 chapter
 *********
 
-C(1) (see chapter-Footnote-1::)
+C(1) (see chapter-Footnote-1)
 
-   D(2) (see chapter-Footnote-2::)
+   D(2) (see chapter-Footnote-2)
 
    (1) Footnote chapter/1
 
diff --git 
a/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate_no_header.pl 
b/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate_no_header.pl
index e4da92efce..97ec9dc73a 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate_no_header.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate_no_header.pl
@@ -803,9 +803,9 @@ End:
 $result_converted{'plaintext'}->{'two_footnotes_in_nodes_separate_no_header'} 
= '2 footnotes in 2 nodes
 **********************
 
-A(1) (see Top-Footnote-1::)
+A(1) (see Top-Footnote-1)
 
-   B(2) (see Top-Footnote-2::)
+   B(2) (see Top-Footnote-2)
 
    (1) Footnote Top/1
 
@@ -818,9 +818,9 @@ A(1) (see Top-Footnote-1::)
 1 chapter
 *********
 
-C(1) (see chapter-Footnote-1::)
+C(1) (see chapter-Footnote-1)
 
-   D(2) (see chapter-Footnote-2::)
+   D(2) (see chapter-Footnote-2)
 
    (1) Footnote chapter/1
 
diff --git a/tp/t/results/def/ref_in_def.pl b/tp/t/results/def/ref_in_def.pl
index f002744c91..9d2f23b572 100644
--- a/tp/t/results/def/ref_in_def.pl
+++ b/tp/t/results/def/ref_in_def.pl
@@ -711,8 +711,8 @@ $result_indices_sort_strings{'ref_in_def'} = {
 
 
 
-$result_converted{'plaintext'}->{'ref_in_def'} = ' - myanchor::: myanchor:: 
see myanchor:: see myanchor:: see myanchor::
- - myanchor::: myanchor:: see myanchor:: see myanchor:: see myanchor::
+$result_converted{'plaintext'}->{'ref_in_def'} = ' - myanchor: myanchor see 
myanchor see myanchor see myanchor
+ - myanchor: myanchor see myanchor see myanchor see myanchor
      T
 
 ';
diff --git a/tp/t/results/float/float_copying.pl 
b/tp/t/results/float/float_copying.pl
index 21d8acc27a..ce4d7137d9 100644
--- a/tp/t/results/float/float_copying.pl
+++ b/tp/t/results/float/float_copying.pl
@@ -1102,7 +1102,7 @@ Copyright notice 1: The Public Domain notice(1)
 
    (1) The caption copying footnote
 
-   see Copying and floats::.
+   see Copying and floats.
 
 Appendix A Copying and floats
 *****************************
@@ -1135,11 +1135,11 @@ Copyright notice 1: The Public Domain notice(2)
 
    (1) The caption copying footnote
 
-   see Copying and floats::.
+   see Copying and floats.
 
    (2) The caption copying footnote
 
-   see Copying and floats::.
+   see Copying and floats.
 
 ';
 
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 0328208d79..1f988ab3bf 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs.pl
@@ -15680,60 +15680,60 @@ 
$result_converted{'plaintext'}->{'at_commands_in_refs'} = 'Top
 27 <http://somewhere_aaa> text (url) ls
 ***************************************
 
-{ }::
+{ }
 
        !
-. . ? @::
+. . ? @
 
-   @ { } \\ #::
+   @ { } \\ #
 
-   LaTeX TeX • , © ... ...::
+   LaTeX TeX • , © ... ...
 
-   ≡ error→ € ¡ ↦ −::
+   ≡ error→ € ¡ ↦ −
 
-   ≥ ≤ →::
+   ≥ ≤ →
 
-   ª º ⋆ £ ⊣ ¿ ®::
+   ª º ⋆ £ ⊣ ¿ ®
 
-   ⇒ ° a b a sunny day å::
+   ⇒ ° a b a sunny day å
 
-   Å æ œ Æ Œ ø Ø ß ł Ł Ð ð Þ þ::
+   Å æ œ Æ Œ ø Ø ß ł Ł Ð ð Þ þ
 
-   ä ẽ î â à é ç ē e̊ e̋ ę::
+   ä ẽ î â à é ç ē e̊ e̋ ę
 
-   ė ĕ e̲ ẹ ě ȷ e͡e::
+   ė ĕ e̲ ẹ ě ȷ e͡e
 
-   ı Ḕ Ḉ::
+   ı Ḕ Ḉ
 
-   “ ” ‘ ’ „ ‚::
+   “ ” ‘ ’ „ ‚
 
-   « » « » ‹ ›::
+   « » « » ‹ ›
 
-   `` \'\' --- -- ` \'::
+   `` \'\' --- -- ` \'
 
-   AAA (fff) AAA BBB::
+   AAA (fff) AAA BBB
 
-   CCC (rrr) CCC DDD::
+   CCC (rrr) CCC DDD
 
-   the someone <someone@somewher> <no_explain@there>::
+   the someone <someone@somewher> <no_explain@there>
 
-   [f--ile1] Image description""\\.::
+   [f--ile1] Image description""\\.
 
-    @ {} . ::
+    @ {} . 
 
-   cite asis in @w b in r SC *str* t VAR dfn i::
+   cite asis in @w b in r SC *str* t VAR dfn i
 
-   env code option samp command file C-x <ESC>::
+   env code option samp command file C-x <ESC>
 
-   8.27in::
+   8.27in
 
-   sansserif slanted::
+   sansserif slanted
 
-   indicateurl::
+   indicateurl
 
-   _{g}H 3^{rd}::
+   _{g}H 3^{rd}
 
-   <http://somewhere_aaa> text (url) ls::
+   <http://somewhere_aaa> text (url) ls
 
 ';
 
diff --git a/tp/t/results/indices/index_entry_in_footnote_sections_separate.pl 
b/tp/t/results/indices/index_entry_in_footnote_sections_separate.pl
index 7b3b6b718f..5fdd0f0f8c 100644
--- a/tp/t/results/indices/index_entry_in_footnote_sections_separate.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_sections_separate.pl
@@ -468,7 +468,7 @@ End:
 $result_converted{'plaintext'}->{'index_entry_in_footnote_sections_separate'} 
= 'index_entry_in_footnote
 ***********************
 
-Top node(1) (see Top-Footnote-1::)
+Top node(1) (see Top-Footnote-1)
 
    (1) in footnote
 
diff --git a/tp/t/results/indices/index_entry_in_footnote_separate.pl 
b/tp/t/results/indices/index_entry_in_footnote_separate.pl
index 058db20426..fc361e2a65 100644
--- a/tp/t/results/indices/index_entry_in_footnote_separate.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_separate.pl
@@ -669,7 +669,7 @@ End:
 ';
 
 
-$result_converted{'plaintext'}->{'index_entry_in_footnote_separate'} = 'chap 
node(1) (see chap-Footnote-1::)
+$result_converted{'plaintext'}->{'index_entry_in_footnote_separate'} = 'chap 
node(1) (see chap-Footnote-1)
 
    (1) in footnote
 
diff --git 
a/tp/t/results/indices/index_special_region/res_plaintext/Copying-and-indices.txt
 
b/tp/t/results/indices/index_special_region/res_plaintext/Copying-and-indices.txt
index 07d43142e8..fcd690652e 100644
--- 
a/tp/t/results/indices/index_special_region/res_plaintext/Copying-and-indices.txt
+++ 
b/tp/t/results/indices/index_special_region/res_plaintext/Copying-and-indices.txt
@@ -3,11 +3,11 @@ Appendix A Copying and indices
 
 In the appendix, we print the indices and references.
 
-   Copying information:: for the copying information.  Public domain
-reference:: for reference on the licence.
+   Copying information for the copying information.  Public domain
+reference for reference on the licence.
 
-   Titlepage anchor:: for the titlepage.  Titlepage footnote anchor::
-for reference on the titlepage.
+   Titlepage anchor for the titlepage.  Titlepage footnote anchor for
+reference on the titlepage.
 
    This is a test manual, trivially and explicitly in the public
 domain(1).
diff --git 
a/tp/t/results/indices/index_special_region_no_insertcopying/res_plaintext/Copying-and-indices.txt
 
b/tp/t/results/indices/index_special_region_no_insertcopying/res_plaintext/Copying-and-indices.txt
index 16ff846a69..625e16d3a0 100644
--- 
a/tp/t/results/indices/index_special_region_no_insertcopying/res_plaintext/Copying-and-indices.txt
+++ 
b/tp/t/results/indices/index_special_region_no_insertcopying/res_plaintext/Copying-and-indices.txt
@@ -3,11 +3,11 @@ Appendix A Copying and indices
 
 In the appendix, we print the indices and references.
 
-   Copying information:: for the copying information.  Public domain
-reference:: for reference on the licence.
+   Copying information for the copying information.  Public domain
+reference for reference on the licence.
 
-   Titlepage anchor:: for the titlepage.  Titlepage footnote anchor::
-for reference on the titlepage.
+   Titlepage anchor for the titlepage.  Titlepage footnote anchor for
+reference on the titlepage.
 
 * Menu:
 
diff --git 
a/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes/res_plaintext/Copying-and-indices.txt
 
b/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes/res_plaintext/Copying-and-indices.txt
index 16ff846a69..625e16d3a0 100644
--- 
a/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes/res_plaintext/Copying-and-indices.txt
+++ 
b/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes/res_plaintext/Copying-and-indices.txt
@@ -3,11 +3,11 @@ Appendix A Copying and indices
 
 In the appendix, we print the indices and references.
 
-   Copying information:: for the copying information.  Public domain
-reference:: for reference on the licence.
+   Copying information for the copying information.  Public domain
+reference for reference on the licence.
 
-   Titlepage anchor:: for the titlepage.  Titlepage footnote anchor::
-for reference on the titlepage.
+   Titlepage anchor for the titlepage.  Titlepage footnote anchor for
+reference on the titlepage.
 
 * Menu:
 
diff --git 
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes/res_plaintext/Copying-and-indices.txt
 
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes/res_plaintext/Copying-and-indices.txt
index 16ff846a69..625e16d3a0 100644
--- 
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes/res_plaintext/Copying-and-indices.txt
+++ 
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes/res_plaintext/Copying-and-indices.txt
@@ -3,11 +3,11 @@ Appendix A Copying and indices
 
 In the appendix, we print the indices and references.
 
-   Copying information:: for the copying information.  Public domain
-reference:: for reference on the licence.
+   Copying information for the copying information.  Public domain
+reference for reference on the licence.
 
-   Titlepage anchor:: for the titlepage.  Titlepage footnote anchor::
-for reference on the titlepage.
+   Titlepage anchor for the titlepage.  Titlepage footnote anchor for
+reference on the titlepage.
 
 * Menu:
 
diff --git 
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default/res_plaintext/Copying-and-indices.txt
 
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default/res_plaintext/Copying-and-indices.txt
index 16ff846a69..625e16d3a0 100644
--- 
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default/res_plaintext/Copying-and-indices.txt
+++ 
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default/res_plaintext/Copying-and-indices.txt
@@ -3,11 +3,11 @@ Appendix A Copying and indices
 
 In the appendix, we print the indices and references.
 
-   Copying information:: for the copying information.  Public domain
-reference:: for reference on the licence.
+   Copying information for the copying information.  Public domain
+reference for reference on the licence.
 
-   Titlepage anchor:: for the titlepage.  Titlepage footnote anchor::
-for reference on the titlepage.
+   Titlepage anchor for the titlepage.  Titlepage footnote anchor for
+reference on the titlepage.
 
 * Menu:
 
diff --git 
a/tp/t/results/indices/index_special_region_no_titlepage_no_nodes/res_plaintext/Chapter.txt
 
b/tp/t/results/indices/index_special_region_no_titlepage_no_nodes/res_plaintext/Chapter.txt
index baf3a88c67..80a88e50c3 100644
--- 
a/tp/t/results/indices/index_special_region_no_titlepage_no_nodes/res_plaintext/Chapter.txt
+++ 
b/tp/t/results/indices/index_special_region_no_titlepage_no_nodes/res_plaintext/Chapter.txt
@@ -2,7 +2,7 @@
 *********
 
 This is a test manual, trivially and explicitly in the public domain(1)
-(see Top-Footnote-1::).
+(see Top-Footnote-1).
 
 * Menu:
 
diff --git 
a/tp/t/results/indices/index_special_region_no_titlepage_no_nodes/res_plaintext/Copying-and-indices.txt
 
b/tp/t/results/indices/index_special_region_no_titlepage_no_nodes/res_plaintext/Copying-and-indices.txt
index 86b44128b5..91c6884fb1 100644
--- 
a/tp/t/results/indices/index_special_region_no_titlepage_no_nodes/res_plaintext/Copying-and-indices.txt
+++ 
b/tp/t/results/indices/index_special_region_no_titlepage_no_nodes/res_plaintext/Copying-and-indices.txt
@@ -3,14 +3,14 @@ Appendix A Copying and indices
 
 In the appendix, we print the indices and references.
 
-   Copying information:: for the copying information.  Public domain
-reference:: for reference on the licence.
+   Copying information for the copying information.  Public domain
+reference for reference on the licence.
 
-   Titlepage anchor:: for the titlepage.  Titlepage footnote anchor::
-for reference on the titlepage.
+   Titlepage anchor for the titlepage.  Titlepage footnote anchor for
+reference on the titlepage.
 
    This is a test manual, trivially and explicitly in the public
-domain(1) (see Copying and indices-Footnote-1::).
+domain(1) (see Copying and indices-Footnote-1).
 
 * Menu:
 
diff --git 
a/tp/t/results/indices/index_special_region_titlepage_no_nodes/res_plaintext/Chapter.txt
 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes/res_plaintext/Chapter.txt
index baf3a88c67..80a88e50c3 100644
--- 
a/tp/t/results/indices/index_special_region_titlepage_no_nodes/res_plaintext/Chapter.txt
+++ 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes/res_plaintext/Chapter.txt
@@ -2,7 +2,7 @@
 *********
 
 This is a test manual, trivially and explicitly in the public domain(1)
-(see Top-Footnote-1::).
+(see Top-Footnote-1).
 
 * Menu:
 
diff --git 
a/tp/t/results/indices/index_special_region_titlepage_no_nodes/res_plaintext/Copying-and-indices.txt
 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes/res_plaintext/Copying-and-indices.txt
index 86b44128b5..91c6884fb1 100644
--- 
a/tp/t/results/indices/index_special_region_titlepage_no_nodes/res_plaintext/Copying-and-indices.txt
+++ 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes/res_plaintext/Copying-and-indices.txt
@@ -3,14 +3,14 @@ Appendix A Copying and indices
 
 In the appendix, we print the indices and references.
 
-   Copying information:: for the copying information.  Public domain
-reference:: for reference on the licence.
+   Copying information for the copying information.  Public domain
+reference for reference on the licence.
 
-   Titlepage anchor:: for the titlepage.  Titlepage footnote anchor::
-for reference on the titlepage.
+   Titlepage anchor for the titlepage.  Titlepage footnote anchor for
+reference on the titlepage.
 
    This is a test manual, trivially and explicitly in the public
-domain(1) (see Copying and indices-Footnote-1::).
+domain(1) (see Copying and indices-Footnote-1).
 
 * Menu:
 
diff --git 
a/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default/res_plaintext/Copying-and-indices.txt
 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default/res_plaintext/Copying-and-indices.txt
index 07d43142e8..fcd690652e 100644
--- 
a/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default/res_plaintext/Copying-and-indices.txt
+++ 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default/res_plaintext/Copying-and-indices.txt
@@ -3,11 +3,11 @@ Appendix A Copying and indices
 
 In the appendix, we print the indices and references.
 
-   Copying information:: for the copying information.  Public domain
-reference:: for reference on the licence.
+   Copying information for the copying information.  Public domain
+reference for reference on the licence.
 
-   Titlepage anchor:: for the titlepage.  Titlepage footnote anchor::
-for reference on the titlepage.
+   Titlepage anchor for the titlepage.  Titlepage footnote anchor for
+reference on the titlepage.
 
    This is a test manual, trivially and explicitly in the public
 domain(1).
diff --git a/tp/t/results/languages/unknown_language.pl 
b/tp/t/results/languages/unknown_language.pl
index 0a85fb906a..7e4b9cee48 100644
--- a/tp/t/results/languages/unknown_language.pl
+++ b/tp/t/results/languages/unknown_language.pl
@@ -464,9 +464,9 @@ $result_converted{'plaintext'}->{'unknown_language'} = 
'unknkown language
 1 Chapter
 *********
 
-Unknown language.  See Top::.
+Unknown language.  See Top.
 
-   Another unknown language.  See Top::.
+   Another unknown language.  See Top.
 ';
 
 
diff --git a/tp/t/results/menu/commands_in_nodedescriptionblock.pl 
b/tp/t/results/menu/commands_in_nodedescriptionblock.pl
index ee10c06630..252491a600 100644
--- a/tp/t/results/menu/commands_in_nodedescriptionblock.pl
+++ b/tp/t/results/menu/commands_in_nodedescriptionblock.pl
@@ -1318,7 +1318,7 @@ 
$result_converted{'plaintext'}->{'commands_in_nodedescriptionblock'} = 'test com
 * Menu:
 
 * node1::
-               node2::.  Footnote(1).  Some text to see where the max column 
could be.
+               node2.  Footnote(1).  Some text to see where the max column 
could be.
                in w.
 
 [float_image]
@@ -1328,7 +1328,7 @@ 
$result_converted{'plaintext'}->{'commands_in_nodedescriptionblock'} = 'test com
 
 * node2::
 
-in nodescription::, tfloat 1.1: f1.
+in nodescription, tfloat 1.1: f1.
 
    ---------- Footnotes ----------
 
@@ -1340,12 +1340,12 @@ in nodescription::, tfloat 1.1: f1.
 2 chap2
 *******
 
-in nodescription::, tfloat 1.1: f1.
+in nodescription, tfloat 1.1: f1.
 
 * Menu:
 
 * node1::
-               node2::.  Footnote(1).  Some text to see where the max column 
could be.
+               node2.  Footnote(1).  Some text to see where the max column 
could be.
                in w.
 
 [float_image]
diff --git a/tp/t/results/misc_commands/ref_in_center.pl 
b/tp/t/results/misc_commands/ref_in_center.pl
index fef79353fa..4404bd135a 100644
--- a/tp/t/results/misc_commands/ref_in_center.pl
+++ b/tp/t/results/misc_commands/ref_in_center.pl
@@ -416,7 +416,7 @@ $result_converted{'plaintext'}->{'ref_in_center'} = 'top
 1 Chapter
 *********
 
-                                 Top::
+                                  Top
 
                                  title
                                  : Top
diff --git a/tp/t/results/multitable/ref_in_multitable.pl 
b/tp/t/results/multitable/ref_in_multitable.pl
index a97866425e..8b41d74350 100644
--- a/tp/t/results/multitable/ref_in_multitable.pl
+++ b/tp/t/results/multitable/ref_in_multitable.pl
@@ -536,23 +536,23 @@ $result_floats{'ref_in_multitable'} = {};
 
 
 $result_converted{'plaintext'}->{'ref_in_multitable'} = 'XXX XXX XXX XXX XXX 
XXX XXX XXX XXX XXX XXX XXX XX XXX XXX XXX XXX XXX
-XXX XXX XXX XXX XXX XXX XXX XX::.
+XXX XXX XXX XXX XXX XXX XXX XX.
 
-XXX XXX XXX XXX XXX XXX   See RRR RRR RRR RRR RRR RRR RRR RRR RRR
-XXX XXX XXX XXX XXX XXX   RRRR::.
+XXX XXX XXX XXX XXX XXX   See RRR RRR RRR RRR RRR RRR RRR RRR RRR RRRR.
+XXX XXX XXX XXX XXX XXX
 XX
 XXX XXX XXX XXX XXX XXX   See SSS SSS SSS SSS SSS SSS SSS SSS SSS SSS
-XXX XXX XXX XXX XXX XXX   SSS SSS SSSSS::.
+XXX XXX XXX XXX XXX XXX   SSS SSS SSSSS.
 XX
 adsf(1)                   second column
 
    XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XX XXX XXX XXX XXX
-XXX XXX XXX XXX XXX XXX XXX XXX XX::.
+XXX XXX XXX XXX XXX XXX XXX XXX XX.
 
    ---------- Footnotes ----------
 
    (1) XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XX XXX XXX XXX
-XXX XXX XXX XXX XXX XXX XXX XXX XXX XX::
+XXX XXX XXX XXX XXX XXX XXX XXX XXX XX
 
 ';
 
diff --git a/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl 
b/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
index e2c71d5a8e..46999849c5 100644
--- a/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
+++ b/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
@@ -527,7 +527,7 @@ 
$result_converted{'plaintext'}->{'at_commands_glued_in_example'} = '     at@.
      acronymABC (aaa bb cc)acronym.
      acronym2ABCacronym.
      emailmali <somebody>email.
-     refTop::ref.
+     refTopref.
      Foornote(1)after footnote.
      accentîaccent.
      and star
diff --git a/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl 
b/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
index c9a5f651db..81d1664df1 100644
--- a/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
+++ b/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
@@ -483,7 +483,7 @@ 
$result_indices_sort_strings{'at_commands_glued_in_paragraph'} = {
 
 
 $result_converted{'plaintext'}->{'at_commands_glued_in_paragraph'} = 'at@.  
TeXTeXTeX. code‘in code’code.  acronymABC (aaa bb cc)acronym.
-acronym2ABCacronym.  emailmali <somebody>email.  refTop::ref.
+acronym2ABCacronym.  emailmali <somebody>email.  refTopref.
 Foornote(1)after footnote.  accentîaccent.  and star
 star.  noindentafter noindent sp
 
diff --git a/tp/t/results/plaintext_tests/del_quote_linebreaking.pl 
b/tp/t/results/plaintext_tests/del_quote_linebreaking.pl
index b3e8df00f4..8dbbe21e0a 100644
--- a/tp/t/results/plaintext_tests/del_quote_linebreaking.pl
+++ b/tp/t/results/plaintext_tests/del_quote_linebreaking.pl
@@ -498,19 +498,19 @@ $result_floats{'del_quote_linebreaking'} = {};
 
 $result_converted{'plaintext'}->{'del_quote_linebreaking'} = 'first para
 
-   xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx See (manual)noxde::
+   xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx See (manual)noxde
 
-   xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx See (manual)noxde::
+   xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx See (manual)noxde
 
-   xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx See (manual)noxde::
+   xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx See (manual)noxde
 
    %
 
-   xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx See (manual)no:de::
+   xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx See (manual)no:de
 
-   xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx See (manual)no:de::
+   xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx See (manual)no:de
 
-   xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx See (manual)no:de::
+   xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx See (manual)no:de
 
 ';
 
diff --git 
a/tp/t/results/plaintext_tests/quote_node_names/res_plaintext/quote_node_names.txt
 
b/tp/t/results/plaintext_tests/quote_node_names/res_plaintext/quote_node_names.txt
index 2c113e1e1a..fde48dd19b 100644
--- 
a/tp/t/results/plaintext_tests/quote_node_names/res_plaintext/quote_node_names.txt
+++ 
b/tp/t/results/plaintext_tests/quote_node_names/res_plaintext/quote_node_names.txt
@@ -5,15 +5,15 @@ See the::caption and a word: normal node See the::caption: 
normal node
    See the::caption and a word: blumpty.fump See the::caption:
 blumpty.fump.mrmrmrmmrmrmr
 
-   See blah:blah::.
+   See blah:blah.
 
-   See secret,node::.
+   See secret,node.
 
-   AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA See blah:blah::.)
+   AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA See blah:blah.)
 
-   See (man_ual)x:y::z::.
+   See (man_ual)x:y::z.
 
-   See (man_ual)x.y.z::.
+   See (man_ual)x.y.z.
 
    See label: (man_ual)pp:qq::rr.
 
diff --git 
a/tp/t/results/sectioning/double_recursive_self_section_node_reference.pl 
b/tp/t/results/sectioning/double_recursive_self_section_node_reference.pl
index 32d5eac1c7..ee7e414712 100644
--- a/tp/t/results/sectioning/double_recursive_self_section_node_reference.pl
+++ b/tp/t/results/sectioning/double_recursive_self_section_node_reference.pl
@@ -381,8 +381,8 @@ 
$result_floats{'double_recursive_self_section_node_reference'} = {};
 
$result_converted{'plaintext'}->{'double_recursive_self_section_node_reference'}
 = 'top
 ***
 
-1 to node1::::
-**************
+1 to node1
+**********
 
 ';
 
diff --git a/tp/t/results/sectioning/double_recursive_self_section_reference.pl 
b/tp/t/results/sectioning/double_recursive_self_section_reference.pl
index 234b03f5eb..f2597363a0 100644
--- a/tp/t/results/sectioning/double_recursive_self_section_reference.pl
+++ b/tp/t/results/sectioning/double_recursive_self_section_reference.pl
@@ -308,11 +308,11 @@ $result_floats{'double_recursive_self_section_reference'} 
= {};
 
 
 
-$result_converted{'plaintext'}->{'double_recursive_self_section_reference'} = 
'1 n2::
-******
+$result_converted{'plaintext'}->{'double_recursive_self_section_reference'} = 
'1 n2
+****
 
-2 n1::
-******
+2 n1
+****
 
 ';
 
diff --git a/tp/t/results/sectioning/recursive_self_section_reference.pl 
b/tp/t/results/sectioning/recursive_self_section_reference.pl
index dfabcd67ac..1d3b3e6d44 100644
--- a/tp/t/results/sectioning/recursive_self_section_reference.pl
+++ b/tp/t/results/sectioning/recursive_self_section_reference.pl
@@ -167,8 +167,8 @@ $result_floats{'recursive_self_section_reference'} = {};
 
 
 
-$result_converted{'plaintext'}->{'recursive_self_section_reference'} = '1 
sharp:: tuple
-***************
+$result_converted{'plaintext'}->{'recursive_self_section_reference'} = '1 
sharp tuple
+*************
 
 ';
 
diff --git a/tp/tests/coverage/res_parser/formatting_plaintext/formatting.txt 
b/tp/tests/coverage/res_parser/formatting_plaintext/formatting.txt
index 78a0b9dd36..7b15bed8e6 100644
--- a/tp/tests/coverage/res_parser/formatting_plaintext/formatting.txt
+++ b/tp/tests/coverage/res_parser/formatting_plaintext/formatting.txt
@@ -457,8 +457,8 @@ name: (file name)chapter ‘@pxref{chapter, cross ref name, 
title, file
 name, manual}’ see cross ref name: (file name)chapter ‘@inforef{chapter,
 cross ref name, file name}’ See cross ref name: (file name)chapter
 
-   ‘@ref{chapter}’ chapter:: ‘@xref{chapter}’ See chapter::.
-‘@pxref{chapter}’ see chapter:: ‘@ref{s--ect@comma{}ion}’ s--ect,ion::
+   ‘@ref{chapter}’ chapter ‘@xref{chapter}’ See chapter.
+‘@pxref{chapter}’ see chapter ‘@ref{s--ect@comma{}ion}’ s--ect,ion
 
    ‘@ref{s--ect@comma{}ion, a @comma{} in cross ref, a comma@comma{} in
 title, a comma@comma{} in file, a @comma{} in manual name }’ a , in
@@ -466,26 +466,26 @@ cross ref: (a comma, in file)s--ect,ion
 
    ‘@ref{chapter,cross ref name}’ cross ref name: chapter
 ‘@ref{chapter,,title}’ title: chapter ‘@ref{chapter,,,file name}’ (file
-name)chapter:: ‘@ref{chapter,,,,manual}’ ()chapter:: ‘@ref{chapter,cross
-ref name,title,}’ cross ref name: chapter ‘@ref{chapter,cross ref
-name,,file name}’ cross ref name: (file name)chapter ‘@ref{chapter,cross
-ref name,,,manual}’ cross ref name: ()chapter ‘@ref{chapter,cross ref
+name)chapter ‘@ref{chapter,,,,manual}’ ()chapter ‘@ref{chapter,cross ref
+name,title,}’ cross ref name: chapter ‘@ref{chapter,cross ref name,,file
+name}’ cross ref name: (file name)chapter ‘@ref{chapter,cross ref
+name,,,manual}’ cross ref name: ()chapter ‘@ref{chapter,cross ref
 name,title,file name}’ cross ref name: (file name)chapter
 ‘@ref{chapter,cross ref name,title,,manual}’ cross ref name: ()chapter
 ‘@ref{chapter,cross ref name,title, file name, manual}’ cross ref name:
 (file name)chapter ‘@ref{chapter,,title,file name}’ title: (file
 name)chapter ‘@ref{chapter,,title,,manual}’ title: ()chapter
 ‘@ref{chapter,,title, file name, manual}’ title: (file name)chapter
-‘@ref{chapter,,,file name,manual}’ (file name)chapter::
+‘@ref{chapter,,,file name,manual}’ (file name)chapter
 
    ‘@ref{(pman)anode,cross ref name}’ cross ref name: (pman)anode
 ‘@ref{(pman)anode,,title}’ title: (pman)anode ‘@ref{(pman)anode,,,file
-name}’ (file name)(pman)anode:: ‘@ref{(pman)anode,,,,manual}’
-()(pman)anode:: ‘@ref{(pman)anode,cross ref name,title,}’ cross ref
-name: (pman)anode ‘@ref{(pman)anode,cross ref name,,file name}’ cross
-ref name: (file name)(pman)anode ‘@ref{(pman)anode,cross ref
-name,,,manual}’ cross ref name: ()(pman)anode ‘@ref{(pman)anode,cross
-ref name,title,file name}’ cross ref name: (file name)(pman)anode
+name}’ (file name)(pman)anode ‘@ref{(pman)anode,,,,manual}’
+()(pman)anode ‘@ref{(pman)anode,cross ref name,title,}’ cross ref name:
+(pman)anode ‘@ref{(pman)anode,cross ref name,,file name}’ cross ref
+name: (file name)(pman)anode ‘@ref{(pman)anode,cross ref name,,,manual}’
+cross ref name: ()(pman)anode ‘@ref{(pman)anode,cross ref
+name,title,file name}’ cross ref name: (file name)(pman)anode
 ‘@ref{(pman)anode,cross ref name,title,,manual}’ cross ref name:
 ()(pman)anode ‘@ref{(pman)anode,cross ref name,title, file name,
 manual}’ cross ref name: (file name)(pman)anode
@@ -493,22 +493,22 @@ manual}’ cross ref name: (file name)(pman)anode
 ‘@ref{(pman)anode,,title,,manual}’ title: ()(pman)anode
 ‘@ref{(pman)anode,,title, file name, manual}’ title: (file
 name)(pman)anode ‘@ref{(pman)anode,,,file name,manual}’ (file
-name)(pman)anode::
+name)(pman)anode
 
    ‘@inforef{chapter, cross ref name, file name}’ See cross ref name:
-(file name)chapter ‘@inforef{chapter}’ See chapter:: ‘@inforef{chapter,
+(file name)chapter ‘@inforef{chapter}’ See chapter ‘@inforef{chapter,
 cross ref name}’ See cross ref name: chapter ‘@inforef{chapter,,file
-name}’ See (file name)chapter:: ‘@inforef{node, cross ref name, file
-name}’ See cross ref name: (file name)node ‘@inforef{node}’ See node::
+name}’ See (file name)chapter ‘@inforef{node, cross ref name, file
+name}’ See cross ref name: (file name)node ‘@inforef{node}’ See node
 ‘@inforef{node, cross ref name}’ See cross ref name: node
-‘@inforef{node,,file name}’ See (file name)node:: ‘@inforef{chapter,
-cross ref name, file name, spurious arg}’ See cross ref name: (file
-name, spurious arg)chapter
+‘@inforef{node,,file name}’ See (file name)node ‘@inforef{chapter, cross
+ref name, file name, spurious arg}’ See cross ref name: (file name,
+spurious arg)chapter
 
    ‘@inforef{s--ect@comma{}ion, a @comma{} in cross ref, a comma@comma{}
 in file}’ See a , in cross ref: (a comma, in file)s--ect,ion
 
-   ‘chapter::’.
+   ‘chapter’.
 
    cross ref with uref uref1 (href://http/myhost.com/index.html): (info
 file with uref3 uref3 (href://http/myhost.com/index3.html))ext cross ref
@@ -672,35 +672,34 @@ b
 
    g-roupe
 
-   ‘@ref{node}’ node::
+   ‘@ref{node}’ node
 
    ‘@ref{,cross ref name}’ cross ref name: ‘@ref{,,title}’ title:
-‘@ref{,,,file name}’ (file name):: ‘@ref{,,,,manual}’ ()::
-‘@ref{node,cross ref name}’ cross ref name: node ‘@ref{node,,title}’
-title: node ‘@ref{node,,,file name}’ (file name)node::
-‘@ref{node,,,,manual}’ ()node:: ‘@ref{node,cross ref name,title,}’ cross
-ref name: node ‘@ref{node,cross ref name,,file name}’ cross ref name:
-(file name)node ‘@ref{node,cross ref name,,,manual}’ cross ref name:
-()node ‘@ref{node,cross ref name,title,file name}’ cross ref name: (file
-name)node ‘@ref{node,cross ref name,title,,manual}’ cross ref name:
-()node ‘@ref{node,cross ref name,title, file name, manual}’ cross ref
-name: (file name)node ‘@ref{node,,title,file name}’ title: (file
-name)node ‘@ref{node,,title,,manual}’ title: ()node
-‘@ref{chapter,,title, file name, manual}’ title: (file name)chapter
-‘@ref{node,,title, file name, manual}’ title: (file name)node
-‘@ref{node,,,file name,manual}’ (file name)node:: ‘@ref{,cross ref
-name,title,}’ cross ref name: ‘@ref{,cross ref name,,file name}’ cross
-ref name: (file name) ‘@ref{,cross ref name,,,manual}’ cross ref name:
-() ‘@ref{,cross ref name,title,file name}’ cross ref name: (file name)
-‘@ref{,cross ref name,title,,manual}’ cross ref name: () ‘@ref{,cross
-ref name,title, file name, manual}’ cross ref name: (file name)
-‘@ref{,,title,file name}’ title: (file name) ‘@ref{,,title,,manual}’
-title: () ‘@ref{,,title, file name, manual}’ title: (file name)
-‘@ref{,,,file name,manual}’ (file name)::
+‘@ref{,,,file name}’ (file name) ‘@ref{,,,,manual}’ () ‘@ref{node,cross
+ref name}’ cross ref name: node ‘@ref{node,,title}’ title: node
+‘@ref{node,,,file name}’ (file name)node ‘@ref{node,,,,manual}’ ()node
+‘@ref{node,cross ref name,title,}’ cross ref name: node ‘@ref{node,cross
+ref name,,file name}’ cross ref name: (file name)node ‘@ref{node,cross
+ref name,,,manual}’ cross ref name: ()node ‘@ref{node,cross ref
+name,title,file name}’ cross ref name: (file name)node ‘@ref{node,cross
+ref name,title,,manual}’ cross ref name: ()node ‘@ref{node,cross ref
+name,title, file name, manual}’ cross ref name: (file name)node
+‘@ref{node,,title,file name}’ title: (file name)node
+‘@ref{node,,title,,manual}’ title: ()node ‘@ref{chapter,,title, file
+name, manual}’ title: (file name)chapter ‘@ref{node,,title, file name,
+manual}’ title: (file name)node ‘@ref{node,,,file name,manual}’ (file
+name)node ‘@ref{,cross ref name,title,}’ cross ref name: ‘@ref{,cross
+ref name,,file name}’ cross ref name: (file name) ‘@ref{,cross ref
+name,,,manual}’ cross ref name: () ‘@ref{,cross ref name,title,file
+name}’ cross ref name: (file name) ‘@ref{,cross ref name,title,,manual}’
+cross ref name: () ‘@ref{,cross ref name,title, file name, manual}’
+cross ref name: (file name) ‘@ref{,,title,file name}’ title: (file name)
+‘@ref{,,title,,manual}’ title: () ‘@ref{,,title, file name, manual}’
+title: (file name) ‘@ref{,,,file name,manual}’ (file name)
 
    ‘@inforef{,cross ref name }’ See cross ref name: ‘@inforef{,,file
-name}’ See (file name):: ‘@inforef{,cross ref name, file name}’ See
-cross ref name: (file name) ‘@inforef{}’ See ::
+name}’ See (file name) ‘@inforef{,cross ref name, file name}’ See cross
+ref name: (file name) ‘@inforef{}’ See
 
    Normal text
 
@@ -1145,8 +1144,8 @@ name: (file name)chapter ‘@pxref{chapter, cross ref name, 
title, file
 name, manual}’ see cross ref name: (file name)chapter ‘@inforef{chapter,
 cross ref name, file name}’ See cross ref name: (file name)chapter
 
-   ‘@ref{chapter}’ chapter:: ‘@xref{chapter}’ See chapter::.
-‘@pxref{chapter}’ see chapter:: ‘@ref{s--ect@comma{}ion}’ s--ect,ion::
+   ‘@ref{chapter}’ chapter ‘@xref{chapter}’ See chapter.
+‘@pxref{chapter}’ see chapter ‘@ref{s--ect@comma{}ion}’ s--ect,ion
 
    ‘@ref{s--ect@comma{}ion, a @comma{} in cross ref, a comma@comma{} in
 title, a comma@comma{} in file, a @comma{} in manual name }’ a , in
@@ -1154,26 +1153,26 @@ cross ref: (a comma, in file)s--ect,ion
 
    ‘@ref{chapter,cross ref name}’ cross ref name: chapter
 ‘@ref{chapter,,title}’ title: chapter ‘@ref{chapter,,,file name}’ (file
-name)chapter:: ‘@ref{chapter,,,,manual}’ ()chapter:: ‘@ref{chapter,cross
-ref name,title,}’ cross ref name: chapter ‘@ref{chapter,cross ref
-name,,file name}’ cross ref name: (file name)chapter ‘@ref{chapter,cross
-ref name,,,manual}’ cross ref name: ()chapter ‘@ref{chapter,cross ref
+name)chapter ‘@ref{chapter,,,,manual}’ ()chapter ‘@ref{chapter,cross ref
+name,title,}’ cross ref name: chapter ‘@ref{chapter,cross ref name,,file
+name}’ cross ref name: (file name)chapter ‘@ref{chapter,cross ref
+name,,,manual}’ cross ref name: ()chapter ‘@ref{chapter,cross ref
 name,title,file name}’ cross ref name: (file name)chapter
 ‘@ref{chapter,cross ref name,title,,manual}’ cross ref name: ()chapter
 ‘@ref{chapter,cross ref name,title, file name, manual}’ cross ref name:
 (file name)chapter ‘@ref{chapter,,title,file name}’ title: (file
 name)chapter ‘@ref{chapter,,title,,manual}’ title: ()chapter
 ‘@ref{chapter,,title, file name, manual}’ title: (file name)chapter
-‘@ref{chapter,,,file name,manual}’ (file name)chapter::
+‘@ref{chapter,,,file name,manual}’ (file name)chapter
 
    ‘@ref{(pman)anode,cross ref name}’ cross ref name: (pman)anode
 ‘@ref{(pman)anode,,title}’ title: (pman)anode ‘@ref{(pman)anode,,,file
-name}’ (file name)(pman)anode:: ‘@ref{(pman)anode,,,,manual}’
-()(pman)anode:: ‘@ref{(pman)anode,cross ref name,title,}’ cross ref
-name: (pman)anode ‘@ref{(pman)anode,cross ref name,,file name}’ cross
-ref name: (file name)(pman)anode ‘@ref{(pman)anode,cross ref
-name,,,manual}’ cross ref name: ()(pman)anode ‘@ref{(pman)anode,cross
-ref name,title,file name}’ cross ref name: (file name)(pman)anode
+name}’ (file name)(pman)anode ‘@ref{(pman)anode,,,,manual}’
+()(pman)anode ‘@ref{(pman)anode,cross ref name,title,}’ cross ref name:
+(pman)anode ‘@ref{(pman)anode,cross ref name,,file name}’ cross ref
+name: (file name)(pman)anode ‘@ref{(pman)anode,cross ref name,,,manual}’
+cross ref name: ()(pman)anode ‘@ref{(pman)anode,cross ref
+name,title,file name}’ cross ref name: (file name)(pman)anode
 ‘@ref{(pman)anode,cross ref name,title,,manual}’ cross ref name:
 ()(pman)anode ‘@ref{(pman)anode,cross ref name,title, file name,
 manual}’ cross ref name: (file name)(pman)anode
@@ -1181,22 +1180,22 @@ manual}’ cross ref name: (file name)(pman)anode
 ‘@ref{(pman)anode,,title,,manual}’ title: ()(pman)anode
 ‘@ref{(pman)anode,,title, file name, manual}’ title: (file
 name)(pman)anode ‘@ref{(pman)anode,,,file name,manual}’ (file
-name)(pman)anode::
+name)(pman)anode
 
    ‘@inforef{chapter, cross ref name, file name}’ See cross ref name:
-(file name)chapter ‘@inforef{chapter}’ See chapter:: ‘@inforef{chapter,
+(file name)chapter ‘@inforef{chapter}’ See chapter ‘@inforef{chapter,
 cross ref name}’ See cross ref name: chapter ‘@inforef{chapter,,file
-name}’ See (file name)chapter:: ‘@inforef{node, cross ref name, file
-name}’ See cross ref name: (file name)node ‘@inforef{node}’ See node::
+name}’ See (file name)chapter ‘@inforef{node, cross ref name, file
+name}’ See cross ref name: (file name)node ‘@inforef{node}’ See node
 ‘@inforef{node, cross ref name}’ See cross ref name: node
-‘@inforef{node,,file name}’ See (file name)node:: ‘@inforef{chapter,
-cross ref name, file name, spurious arg}’ See cross ref name: (file
-name, spurious arg)chapter
+‘@inforef{node,,file name}’ See (file name)node ‘@inforef{chapter, cross
+ref name, file name, spurious arg}’ See cross ref name: (file name,
+spurious arg)chapter
 
    ‘@inforef{s--ect@comma{}ion, a @comma{} in cross ref, a comma@comma{}
 in file}’ See a , in cross ref: (a comma, in file)s--ect,ion
 
-   ‘chapter::’.
+   ‘chapter’.
 
    cross ref with uref uref1 (href://http/myhost.com/index.html): (info
 file with uref3 uref3 (href://http/myhost.com/index3.html))ext cross ref
@@ -1360,35 +1359,34 @@ b
 
    g-roupe
 
-   ‘@ref{node}’ node::
+   ‘@ref{node}’ node
 
    ‘@ref{,cross ref name}’ cross ref name: ‘@ref{,,title}’ title:
-‘@ref{,,,file name}’ (file name):: ‘@ref{,,,,manual}’ ()::
-‘@ref{node,cross ref name}’ cross ref name: node ‘@ref{node,,title}’
-title: node ‘@ref{node,,,file name}’ (file name)node::
-‘@ref{node,,,,manual}’ ()node:: ‘@ref{node,cross ref name,title,}’ cross
-ref name: node ‘@ref{node,cross ref name,,file name}’ cross ref name:
-(file name)node ‘@ref{node,cross ref name,,,manual}’ cross ref name:
-()node ‘@ref{node,cross ref name,title,file name}’ cross ref name: (file
-name)node ‘@ref{node,cross ref name,title,,manual}’ cross ref name:
-()node ‘@ref{node,cross ref name,title, file name, manual}’ cross ref
-name: (file name)node ‘@ref{node,,title,file name}’ title: (file
-name)node ‘@ref{node,,title,,manual}’ title: ()node
-‘@ref{chapter,,title, file name, manual}’ title: (file name)chapter
-‘@ref{node,,title, file name, manual}’ title: (file name)node
-‘@ref{node,,,file name,manual}’ (file name)node:: ‘@ref{,cross ref
-name,title,}’ cross ref name: ‘@ref{,cross ref name,,file name}’ cross
-ref name: (file name) ‘@ref{,cross ref name,,,manual}’ cross ref name:
-() ‘@ref{,cross ref name,title,file name}’ cross ref name: (file name)
-‘@ref{,cross ref name,title,,manual}’ cross ref name: () ‘@ref{,cross
-ref name,title, file name, manual}’ cross ref name: (file name)
-‘@ref{,,title,file name}’ title: (file name) ‘@ref{,,title,,manual}’
-title: () ‘@ref{,,title, file name, manual}’ title: (file name)
-‘@ref{,,,file name,manual}’ (file name)::
+‘@ref{,,,file name}’ (file name) ‘@ref{,,,,manual}’ () ‘@ref{node,cross
+ref name}’ cross ref name: node ‘@ref{node,,title}’ title: node
+‘@ref{node,,,file name}’ (file name)node ‘@ref{node,,,,manual}’ ()node
+‘@ref{node,cross ref name,title,}’ cross ref name: node ‘@ref{node,cross
+ref name,,file name}’ cross ref name: (file name)node ‘@ref{node,cross
+ref name,,,manual}’ cross ref name: ()node ‘@ref{node,cross ref
+name,title,file name}’ cross ref name: (file name)node ‘@ref{node,cross
+ref name,title,,manual}’ cross ref name: ()node ‘@ref{node,cross ref
+name,title, file name, manual}’ cross ref name: (file name)node
+‘@ref{node,,title,file name}’ title: (file name)node
+‘@ref{node,,title,,manual}’ title: ()node ‘@ref{chapter,,title, file
+name, manual}’ title: (file name)chapter ‘@ref{node,,title, file name,
+manual}’ title: (file name)node ‘@ref{node,,,file name,manual}’ (file
+name)node ‘@ref{,cross ref name,title,}’ cross ref name: ‘@ref{,cross
+ref name,,file name}’ cross ref name: (file name) ‘@ref{,cross ref
+name,,,manual}’ cross ref name: () ‘@ref{,cross ref name,title,file
+name}’ cross ref name: (file name) ‘@ref{,cross ref name,title,,manual}’
+cross ref name: () ‘@ref{,cross ref name,title, file name, manual}’
+cross ref name: (file name) ‘@ref{,,title,file name}’ title: (file name)
+‘@ref{,,title,,manual}’ title: () ‘@ref{,,title, file name, manual}’
+title: (file name) ‘@ref{,,,file name,manual}’ (file name)
 
    ‘@inforef{,cross ref name }’ See cross ref name: ‘@inforef{,,file
-name}’ See (file name):: ‘@inforef{,cross ref name, file name}’ See
-cross ref name: (file name) ‘@inforef{}’ See ::
+name}’ See (file name) ‘@inforef{,cross ref name, file name}’ See cross
+ref name: (file name) ‘@inforef{}’ See
 
    In example.
 
@@ -1970,10 +1968,10 @@ cross ref name: (file name) ‘@inforef{}’ See ::
      @pxref{chapter, cross ref name, title, file name, manual} see cross ref 
name: (file name)chapter
      @inforef{chapter, cross ref name, file name} See cross ref name: (file 
name)chapter
 
-     @ref{chapter} chapter::
-     @xref{chapter} See chapter::.
-     @pxref{chapter} see chapter::
-     @ref{s--ect@comma{}ion} s--ect,ion::
+     @ref{chapter} chapter
+     @xref{chapter} See chapter.
+     @pxref{chapter} see chapter
+     @ref{s--ect@comma{}ion} s--ect,ion
 
      @ref{s--ect@comma{}ion, a @comma{} in cross
      ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in 
manual name }
@@ -1982,8 +1980,8 @@ cross ref name: (file name) ‘@inforef{}’ See ::
 
      @ref{chapter,cross ref name} cross ref name: chapter
      @ref{chapter,,title} title: chapter
-     @ref{chapter,,,file name} (file name)chapter::
-     @ref{chapter,,,,manual} ()chapter::
+     @ref{chapter,,,file name} (file name)chapter
+     @ref{chapter,,,,manual} ()chapter
      @ref{chapter,cross ref name,title,} cross ref name: chapter
      @ref{chapter,cross ref name,,file name} cross ref name: (file name)chapter
      @ref{chapter,cross ref name,,,manual} cross ref name: ()chapter
@@ -1993,13 +1991,13 @@ cross ref name: (file name) ‘@inforef{}’ See ::
      @ref{chapter,,title,file name} title: (file name)chapter
      @ref{chapter,,title,,manual} title: ()chapter
      @ref{chapter,,title, file name, manual} title: (file name)chapter
-     @ref{chapter,,,file name,manual} (file name)chapter::
+     @ref{chapter,,,file name,manual} (file name)chapter
 
 
      @ref{(pman)anode,cross ref name} cross ref name: (pman)anode
      @ref{(pman)anode,,title} title: (pman)anode
-     @ref{(pman)anode,,,file name} (file name)(pman)anode::
-     @ref{(pman)anode,,,,manual} ()(pman)anode::
+     @ref{(pman)anode,,,file name} (file name)(pman)anode
+     @ref{(pman)anode,,,,manual} ()(pman)anode
      @ref{(pman)anode,cross ref name,title,} cross ref name: (pman)anode
      @ref{(pman)anode,cross ref name,,file name} cross ref name: (file 
name)(pman)anode
      @ref{(pman)anode,cross ref name,,,manual} cross ref name: ()(pman)anode
@@ -2009,17 +2007,17 @@ cross ref name: (file name) ‘@inforef{}’ See ::
      @ref{(pman)anode,,title,file name} title: (file name)(pman)anode
      @ref{(pman)anode,,title,,manual} title: ()(pman)anode
      @ref{(pman)anode,,title, file name, manual} title: (file name)(pman)anode
-     @ref{(pman)anode,,,file name,manual} (file name)(pman)anode::
+     @ref{(pman)anode,,,file name,manual} (file name)(pman)anode
 
 
      @inforef{chapter, cross ref name, file name} See cross ref name: (file 
name)chapter
-     @inforef{chapter} See chapter::
+     @inforef{chapter} See chapter
      @inforef{chapter, cross ref name} See cross ref name: chapter
-     @inforef{chapter,,file name} See (file name)chapter::
+     @inforef{chapter,,file name} See (file name)chapter
      @inforef{node, cross ref name, file name} See cross ref name: (file 
name)node
-     @inforef{node} See node::
+     @inforef{node} See node
      @inforef{node, cross ref name} See cross ref name: node
-     @inforef{node,,file name} See (file name)node::
+     @inforef{node,,file name} See (file name)node
      @inforef{chapter, cross ref name, file name, spurious arg} See cross ref 
name: (file name, spurious arg)chapter
 
      @inforef{s--ect@comma{}ion, a @comma{} in cross
@@ -2027,7 +2025,7 @@ cross ref name: (file name) ‘@inforef{}’ See ::
      See a , in cross
      ref: (a comma, in file)s--ect,ion
 
-     ‘chapter::’.
+     ‘chapter’.
 
      cross ref with uref uref1 (href://http/myhost.com/index.html): (info file 
with uref3 uref3 (href://http/myhost.com/index3.html))ext
      cross ref with uref uref1 (href://http/myhost.com/index.html): chapter
@@ -2223,16 +2221,16 @@ aaa
 
      g--roupe
 
-     @ref{node} node::
+     @ref{node} node
 
      @ref{,cross ref name} cross ref name:
      @ref{,,title} title:
-     @ref{,,,file name} (file name)::
-     @ref{,,,,manual} ()::
+     @ref{,,,file name} (file name)
+     @ref{,,,,manual} ()
      @ref{node,cross ref name} cross ref name: node
      @ref{node,,title} title: node
-     @ref{node,,,file name} (file name)node::
-     @ref{node,,,,manual} ()node::
+     @ref{node,,,file name} (file name)node
+     @ref{node,,,,manual} ()node
      @ref{node,cross ref name,title,} cross ref name: node
      @ref{node,cross ref name,,file name} cross ref name: (file name)node
      @ref{node,cross ref name,,,manual} cross ref name: ()node
@@ -2243,7 +2241,7 @@ aaa
      @ref{node,,title,,manual} title: ()node
      @ref{chapter,,title, file name, manual} title: (file name)chapter
      @ref{node,,title, file name, manual} title: (file name)node
-     @ref{node,,,file name,manual} (file name)node::
+     @ref{node,,,file name,manual} (file name)node
      @ref{,cross ref name,title,} cross ref name:
      @ref{,cross ref name,,file name} cross ref name: (file name)
      @ref{,cross ref name,,,manual} cross ref name: ()
@@ -2253,12 +2251,12 @@ aaa
      @ref{,,title,file name} title: (file name)
      @ref{,,title,,manual} title: ()
      @ref{,,title, file name, manual} title: (file name)
-     @ref{,,,file name,manual} (file name)::
+     @ref{,,,file name,manual} (file name)
 
      @inforef{,cross ref name } See cross ref name:
-     @inforef{,,file name} See (file name)::
+     @inforef{,,file name} See (file name)
      @inforef{,cross ref name, file name} See cross ref name: (file name)
-     @inforef{} See ::
+     @inforef{} See
 
 
    Text(7)
@@ -2267,306 +2265,306 @@ aaa
 
 * Menu:
 
-* truc:                                  chapter.            (line 2263)
+* truc:                                  chapter.            (line 2261)
 
    codeidx
 
 * Menu:
 
-* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2263)
+* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2261)
 
    cp
 
 * Menu:
 
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  716)
-* -option <2>:                           chapter.            (line 1415)
-* ?:                                     chapter.            (line 2263)
-* .:                                     chapter.            (line 2263)
+* -option <1>:                           chapter.            (line  715)
+* -option <2>:                           chapter.            (line 1413)
+* ?:                                     chapter.            (line 2261)
+* .:                                     chapter.            (line 2261)
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  716)
-* " <2>:                                 chapter.            (line 1415)
-* a:                                     chapter.            (line 2263)
-* aaa, bbb:                              chapter.            (line 2263)
-* a--a:                                  chapter.            (line 2263)
+* " <1>:                                 chapter.            (line  715)
+* " <2>:                                 chapter.            (line 1413)
+* a:                                     chapter.            (line 2261)
+* aaa, bbb:                              chapter.            (line 2261)
+* a--a:                                  chapter.            (line 2261)
 * a--asis:                               chapter.            (line  519)
-* a--asis <1>:                           chapter.            (line 1207)
-* a--asis <2>:                           chapter.            (line 2037)
+* a--asis <1>:                           chapter.            (line 1206)
+* a--asis <2>:                           chapter.            (line 2035)
   aaa, See bbb.
 * b:                                     chapter.            (line  520)
-* b <1>:                                 chapter.            (line 1208)
-* b <2>:                                 chapter.            (line 2038)
-* b--b, c--c:                            chapter.            (line 2263)
+* b <1>:                                 chapter.            (line 1207)
+* b <2>:                                 chapter.            (line 2036)
+* b--b, c--c:                            chapter.            (line 2261)
 * counting entry:                        chapter.            (line    0)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2263)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2261)
 * d--efcv_name:                          chapter.            (line  366)
 * d--efcv_name <1>:                      chapter.            (line  369)
-* d--efcv_name <2>:                      chapter.            (line 1054)
-* d--efcv_name <3>:                      chapter.            (line 1057)
-* d--efcv_name <4>:                      chapter.            (line 1878)
-* d--efcv_name <5>:                      chapter.            (line 1881)
+* d--efcv_name <2>:                      chapter.            (line 1053)
+* d--efcv_name <3>:                      chapter.            (line 1056)
+* d--efcv_name <4>:                      chapter.            (line 1876)
+* d--efcv_name <5>:                      chapter.            (line 1879)
 * d--efivar_name of c--lass:             chapter.            (line  411)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1099)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1923)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1098)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1921)
 * d--efopt_name:                         chapter.            (line  402)
-* d--efopt_name <1>:                     chapter.            (line 1090)
-* d--efopt_name <2>:                     chapter.            (line 1914)
+* d--efopt_name <1>:                     chapter.            (line 1089)
+* d--efopt_name <2>:                     chapter.            (line 1912)
 * d--eftypecv_name of c--lass:           chapter.            (line  372)
 * d--eftypecv_name of c--lass <1>:       chapter.            (line  375)
-* d--eftypecv_name of c--lass <2>:       chapter.            (line 1060)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1063)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1884)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1887)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1059)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1062)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1882)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1885)
 * d--eftypecv_name2 of c--lass2:         chapter.            (line  443)
 * d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  446)
-* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1131)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1134)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1956)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1959)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1130)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1133)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1954)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1957)
 * d--eftypeivar_name of c--lass:         chapter.            (line  414)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1102)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1926)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1101)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1924)
 * d--eftypevar_name:                     chapter.            (line  408)
-* d--eftypevar_name <1>:                 chapter.            (line 1096)
-* d--eftypevar_name <2>:                 chapter.            (line 1920)
+* d--eftypevar_name <1>:                 chapter.            (line 1095)
+* d--eftypevar_name <2>:                 chapter.            (line 1918)
 * d--eftypevr_name:                      chapter.            (line  363)
-* d--eftypevr_name <1>:                  chapter.            (line 1051)
-* d--eftypevr_name <2>:                  chapter.            (line 1875)
+* d--eftypevr_name <1>:                  chapter.            (line 1050)
+* d--eftypevr_name <2>:                  chapter.            (line 1873)
 * d--efvar_name:                         chapter.            (line  396)
 * d--efvar_name <1>:                     chapter.            (line  399)
-* d--efvar_name <2>:                     chapter.            (line 1084)
-* d--efvar_name <3>:                     chapter.            (line 1087)
-* d--efvar_name <4>:                     chapter.            (line 1908)
-* d--efvar_name <5>:                     chapter.            (line 1911)
+* d--efvar_name <2>:                     chapter.            (line 1083)
+* d--efvar_name <3>:                     chapter.            (line 1086)
+* d--efvar_name <4>:                     chapter.            (line 1906)
+* d--efvar_name <5>:                     chapter.            (line 1909)
 * d--efvr_name:                          chapter.            (line  342)
-* d--efvr_name <1>:                      chapter.            (line 1030)
-* d--efvr_name <2>:                      chapter.            (line 1854)
+* d--efvr_name <1>:                      chapter.            (line 1029)
+* d--efvr_name <2>:                      chapter.            (line 1852)
   ddd:                                   See also ccc.
   ddd:                                   See also ccc.
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2263)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2261)
 * index entry between item and itemx:    chapter.            (line  524)
 * index entry between item and itemx <1>: chapter.           (line  654)
-* index entry between item and itemx <2>: chapter.           (line 1212)
-* index entry between item and itemx <3>: chapter.           (line 1342)
-* index entry between item and itemx <4>: chapter.           (line 2042)
-* index entry between item and itemx <5>: chapter.           (line 2205)
+* index entry between item and itemx <2>: chapter.           (line 1211)
+* index entry between item and itemx <3>: chapter.           (line 1341)
+* index entry between item and itemx <4>: chapter.           (line 2040)
+* index entry between item and itemx <5>: chapter.           (line 2203)
 * index entry in footnote:               chapter.            (line    0)
 * index entry within deffn:              chapter.            (line  317)
-* index entry within deffn <1>:          chapter.            (line 1005)
-* index entry within deffn <2>:          chapter.            (line 1827)
+* index entry within deffn <1>:          chapter.            (line 1004)
+* index entry within deffn <2>:          chapter.            (line 1825)
 * index entry within itemize:            chapter.            (line  228)
-* index entry within itemize <1>:        chapter.            (line  916)
-* index entry within itemize <2>:        chapter.            (line 1738)
+* index entry within itemize <1>:        chapter.            (line  915)
+* index entry within itemize <2>:        chapter.            (line 1736)
 * index entry within multitable:         chapter.            (line  250)
-* index entry within multitable <1>:     chapter.            (line  938)
-* index entry within multitable <2>:     chapter.            (line 1761)
-* t-ruc:                                 chapter.            (line 2263)
-* T-ruc:                                 chapter.            (line 2263)
+* index entry within multitable <1>:     chapter.            (line  937)
+* index entry within multitable <2>:     chapter.            (line 1759)
+* t-ruc:                                 chapter.            (line 2261)
+* T-ruc:                                 chapter.            (line 2261)
 * vtable i--tem code kbdinputstyle:      chapter.            (line  152)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  840)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1661)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  839)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1659)
 * vtable i--tem default kbdinputstyle:   chapter.            (line  147)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  835)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1656)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  834)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1654)
 * vtable i--tem distinct kbdinputstyle:  chapter.            (line  162)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  850)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1671)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  849)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1669)
 * vtable i--tem example kbdinputstyle:   chapter.            (line  157)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  845)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1666)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  844)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1664)
 * vtable i--tem in example code kbdinputstyle: chapter.      (line  154)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  842)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1663)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  841)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1661)
 * vtable i--tem in example default kbdinputstyle: chapter.   (line  149)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  837)
+                                                             (line  836)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1658)
+                                                             (line 1656)
 * vtable i--tem in example distinct kbdinputstyle: chapter.  (line  164)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  852)
+                                                             (line  851)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1673)
+                                                             (line 1671)
 * vtable i--tem in example example kbdinputstyle: chapter.   (line  159)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  847)
+                                                             (line  846)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1668)
+                                                             (line 1666)
 
    fn
 
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  716)
-* --foption <2>:                         chapter.            (line 1415)
-* ?:                                     chapter.            (line 2263)
-* .:                                     chapter.            (line 2263)
+* --foption <1>:                         chapter.            (line  715)
+* --foption <2>:                         chapter.            (line 1413)
+* ?:                                     chapter.            (line 2261)
+* .:                                     chapter.            (line 2261)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  716)
-* `` <2>:                                chapter.            (line 1415)
+* `` <1>:                                chapter.            (line  715)
+* `` <2>:                                chapter.            (line 1413)
 * a:                                     chapter.            (line  330)
 * a <1>:                                 chapter.            (line  523)
 * a <2>:                                 chapter.            (line  653)
-* a <3>:                                 chapter.            (line 1018)
-* a <4>:                                 chapter.            (line 1211)
-* a <5>:                                 chapter.            (line 1341)
-* a <6>:                                 chapter.            (line 1840)
-* a <7>:                                 chapter.            (line 2041)
-* a <8>:                                 chapter.            (line 2204)
-* a <9>:                                 chapter.            (line 2263)
+* a <3>:                                 chapter.            (line 1017)
+* a <4>:                                 chapter.            (line 1210)
+* a <5>:                                 chapter.            (line 1340)
+* a <6>:                                 chapter.            (line 1838)
+* a <7>:                                 chapter.            (line 2039)
+* a <8>:                                 chapter.            (line 2202)
+* a <9>:                                 chapter.            (line 2261)
 * after:                                 chapter.            (line  664)
-* after <1>:                             chapter.            (line 1352)
-* after <2>:                             chapter.            (line 2215)
+* after <1>:                             chapter.            (line 1351)
+* after <2>:                             chapter.            (line 2213)
 * arg2:                                  chapter.            (line  449)
-* arg2 <1>:                              chapter.            (line 1137)
-* arg2 <2>:                              chapter.            (line 1963)
+* arg2 <1>:                              chapter.            (line 1136)
+* arg2 <2>:                              chapter.            (line 1961)
 * b:                                     chapter.            (line  524)
 * b <1>:                                 chapter.            (line  654)
-* b <2>:                                 chapter.            (line 1212)
-* b <3>:                                 chapter.            (line 1342)
-* b <4>:                                 chapter.            (line 2042)
-* b <5>:                                 chapter.            (line 2205)
+* b <2>:                                 chapter.            (line 1211)
+* b <3>:                                 chapter.            (line 1341)
+* b <4>:                                 chapter.            (line 2040)
+* b <5>:                                 chapter.            (line 2203)
 * bidule machin:                         chapter.            (line  325)
-* bidule machin <1>:                     chapter.            (line 1013)
-* bidule machin <2>:                     chapter.            (line 1835)
+* bidule machin <1>:                     chapter.            (line 1012)
+* bidule machin <2>:                     chapter.            (line 1833)
 * d--effn_name:                          chapter.            (line  309)
-* d--effn_name <1>:                      chapter.            (line  997)
-* d--effn_name <2>:                      chapter.            (line 1819)
+* d--effn_name <1>:                      chapter.            (line  996)
+* d--effn_name <2>:                      chapter.            (line 1817)
 * d--efmac_name:                         chapter.            (line  390)
-* d--efmac_name <1>:                     chapter.            (line 1078)
-* d--efmac_name <2>:                     chapter.            (line 1902)
+* d--efmac_name <1>:                     chapter.            (line 1077)
+* d--efmac_name <2>:                     chapter.            (line 1900)
 * d--efmethod_name on c--lass:           chapter.            (line  417)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1105)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1929)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1104)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1927)
 * d--efop_name on c--lass:               chapter.            (line  378)
 * d--efop_name on c--lass <1>:           chapter.            (line  381)
-* d--efop_name on c--lass <2>:           chapter.            (line 1066)
-* d--efop_name on c--lass <3>:           chapter.            (line 1069)
-* d--efop_name on c--lass <4>:           chapter.            (line 1890)
-* d--efop_name on c--lass <5>:           chapter.            (line 1893)
+* d--efop_name on c--lass <2>:           chapter.            (line 1065)
+* d--efop_name on c--lass <3>:           chapter.            (line 1068)
+* d--efop_name on c--lass <4>:           chapter.            (line 1888)
+* d--efop_name on c--lass <5>:           chapter.            (line 1891)
 * d--efspec_name:                        chapter.            (line  393)
-* d--efspec_name <1>:                    chapter.            (line 1081)
-* d--efspec_name <2>:                    chapter.            (line 1905)
+* d--efspec_name <1>:                    chapter.            (line 1080)
+* d--efspec_name <2>:                    chapter.            (line 1903)
 * d--eftypefn_name:                      chapter.            (line  351)
 * d--eftypefn_name <1>:                  chapter.            (line  354)
-* d--eftypefn_name <2>:                  chapter.            (line 1039)
-* d--eftypefn_name <3>:                  chapter.            (line 1042)
-* d--eftypefn_name <4>:                  chapter.            (line 1863)
-* d--eftypefn_name <5>:                  chapter.            (line 1866)
+* d--eftypefn_name <2>:                  chapter.            (line 1038)
+* d--eftypefn_name <3>:                  chapter.            (line 1041)
+* d--eftypefn_name <4>:                  chapter.            (line 1861)
+* d--eftypefn_name <5>:                  chapter.            (line 1864)
 * d--eftypefn_name2:                     chapter.            (line  428)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1116)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1941)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1115)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1939)
 * d--eftypefun_name:                     chapter.            (line  405)
-* d--eftypefun_name <1>:                 chapter.            (line 1093)
-* d--eftypefun_name <2>:                 chapter.            (line 1917)
+* d--eftypefun_name <1>:                 chapter.            (line 1092)
+* d--eftypefun_name <2>:                 chapter.            (line 1915)
 * d--eftypemethod_name on c--lass:       chapter.            (line  420)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1108)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1932)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1107)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1930)
 * d--eftypeop_name on c--lass:           chapter.            (line  357)
 * d--eftypeop_name on c--lass <1>:       chapter.            (line  360)
-* d--eftypeop_name on c--lass <2>:       chapter.            (line 1045)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1048)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1869)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1872)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1044)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1047)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1867)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1870)
 * d--eftypeop_name2 on c--lass2:         chapter.            (line  433)
 * d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  438)
-* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1121)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1126)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1946)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1951)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1120)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1125)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1944)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1949)
 * d--efun_name:                          chapter.            (line  387)
-* d--efun_name <1>:                      chapter.            (line 1075)
-* d--efun_name <2>:                      chapter.            (line 1899)
+* d--efun_name <1>:                      chapter.            (line 1074)
+* d--efun_name <2>:                      chapter.            (line 1897)
 * de--ffn_name:                          chapter.            (line  312)
-* de--ffn_name <1>:                      chapter.            (line 1000)
-* de--ffn_name <2>:                      chapter.            (line 1822)
+* de--ffn_name <1>:                      chapter.            (line  999)
+* de--ffn_name <2>:                      chapter.            (line 1820)
 * deffn:                                 chapter.            (line  333)
 * deffn <1>:                             chapter.            (line  335)
-* deffn <2>:                             chapter.            (line 1021)
-* deffn <3>:                             chapter.            (line 1023)
-* deffn <4>:                             chapter.            (line 1844)
-* deffn <5>:                             chapter.            (line 1846)
+* deffn <2>:                             chapter.            (line 1020)
+* deffn <3>:                             chapter.            (line 1022)
+* deffn <4>:                             chapter.            (line 1842)
+* deffn <5>:                             chapter.            (line 1844)
 * deffnx:                                chapter.            (line  331)
 * deffnx <1>:                            chapter.            (line  336)
-* deffnx <2>:                            chapter.            (line 1019)
-* deffnx <3>:                            chapter.            (line 1024)
-* deffnx <4>:                            chapter.            (line 1841)
-* deffnx <5>:                            chapter.            (line 1847)
-* f---aa:                                chapter.            (line 2263)
+* deffnx <2>:                            chapter.            (line 1018)
+* deffnx <3>:                            chapter.            (line 1023)
+* deffnx <4>:                            chapter.            (line 1839)
+* deffnx <5>:                            chapter.            (line 1845)
+* f---aa:                                chapter.            (line 2261)
   f---aaa, See f---bbb.
-* f---bb, f---cc:                        chapter.            (line 2263)
+* f---bb, f---cc:                        chapter.            (line 2261)
   f---ddd:                               See also f---ccc.
   f---ddd:                               See also f---ccc.
-* f---ddd, f---eee, ffff:                chapter.            (line 2263)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2263)
+* f---ddd, f---eee, ffff:                chapter.            (line 2261)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2261)
 * followed:                              chapter.            (line  328)
 * followed <1>:                          chapter.            (line  662)
-* followed <2>:                          chapter.            (line 1016)
-* followed <3>:                          chapter.            (line 1350)
-* followed <4>:                          chapter.            (line 1838)
-* followed <5>:                          chapter.            (line 2213)
+* followed <2>:                          chapter.            (line 1015)
+* followed <3>:                          chapter.            (line 1349)
+* followed <4>:                          chapter.            (line 1836)
+* followed <5>:                          chapter.            (line 2211)
 * I:                                     chapter.            (line  316)
 * I <1>:                                 chapter.            (line  338)
-* I <2>:                                 chapter.            (line 1004)
-* I <3>:                                 chapter.            (line 1026)
-* I <4>:                                 chapter.            (line 1826)
-* I <5>:                                 chapter.            (line 1849)
+* I <2>:                                 chapter.            (line 1003)
+* I <3>:                                 chapter.            (line 1025)
+* I <4>:                                 chapter.            (line 1824)
+* I <5>:                                 chapter.            (line 1847)
 * id i ule:                              chapter.            (line  322)
-* id i ule <1>:                          chapter.            (line 1010)
-* id i ule <2>:                          chapter.            (line 1832)
+* id i ule <1>:                          chapter.            (line 1009)
+* id i ule <2>:                          chapter.            (line 1830)
 * id ule:                                chapter.            (line  321)
-* id ule <1>:                            chapter.            (line 1009)
-* id ule <2>:                            chapter.            (line 1831)
+* id ule <1>:                            chapter.            (line 1008)
+* id ule <2>:                            chapter.            (line 1829)
 * INVALID:                               chapter.            (line  666)
-* INVALID <1>:                           chapter.            (line 1354)
-* INVALID <2>:                           chapter.            (line 2217)
+* INVALID <1>:                           chapter.            (line 1353)
+* INVALID <2>:                           chapter.            (line 2215)
 * log trap:                              chapter.            (line  318)
-* log trap <1>:                          chapter.            (line 1006)
-* log trap <2>:                          chapter.            (line 1828)
+* log trap <1>:                          chapter.            (line 1005)
+* log trap <2>:                          chapter.            (line 1826)
 * log trap1:                             chapter.            (line  319)
-* log trap1 <1>:                         chapter.            (line 1007)
-* log trap1 <2>:                         chapter.            (line 1829)
+* log trap1 <1>:                         chapter.            (line 1006)
+* log trap1 <2>:                         chapter.            (line 1827)
 * log trap2:                             chapter.            (line  320)
-* log trap2 <1>:                         chapter.            (line 1008)
-* log trap2 <2>:                         chapter.            (line 1830)
+* log trap2 <1>:                         chapter.            (line 1007)
+* log trap2 <2>:                         chapter.            (line 1828)
 * machin:                                chapter.            (line  324)
 * machin <1>:                            chapter.            (line  326)
 * machin <2>:                            chapter.            (line  658)
 * machin <3>:                            chapter.            (line  659)
 * machin <4>:                            chapter.            (line  660)
 * machin <5>:                            chapter.            (line  661)
-* machin <6>:                            chapter.            (line 1012)
-* machin <7>:                            chapter.            (line 1014)
-* machin <8>:                            chapter.            (line 1346)
-* machin <9>:                            chapter.            (line 1347)
-* machin <10>:                           chapter.            (line 1348)
-* machin <11>:                           chapter.            (line 1349)
-* machin <12>:                           chapter.            (line 1834)
-* machin <13>:                           chapter.            (line 1836)
-* machin <14>:                           chapter.            (line 2209)
-* machin <15>:                           chapter.            (line 2210)
-* machin <16>:                           chapter.            (line 2211)
-* machin <17>:                           chapter.            (line 2212)
+* machin <6>:                            chapter.            (line 1011)
+* machin <7>:                            chapter.            (line 1013)
+* machin <8>:                            chapter.            (line 1345)
+* machin <9>:                            chapter.            (line 1346)
+* machin <10>:                           chapter.            (line 1347)
+* machin <11>:                           chapter.            (line 1348)
+* machin <12>:                           chapter.            (line 1832)
+* machin <13>:                           chapter.            (line 1834)
+* machin <14>:                           chapter.            (line 2207)
+* machin <15>:                           chapter.            (line 2208)
+* machin <16>:                           chapter.            (line 2209)
+* machin <17>:                           chapter.            (line 2210)
 * n--ame:                                chapter.            (line  345)
 * n--ame <1>:                            chapter.            (line  348)
-* n--ame <2>:                            chapter.            (line 1033)
-* n--ame <3>:                            chapter.            (line 1036)
-* n--ame <4>:                            chapter.            (line 1857)
-* n--ame <5>:                            chapter.            (line 1860)
+* n--ame <2>:                            chapter.            (line 1032)
+* n--ame <3>:                            chapter.            (line 1035)
+* n--ame <4>:                            chapter.            (line 1855)
+* n--ame <5>:                            chapter.            (line 1858)
 * name2:                                 chapter.            (line  423)
-* name2 <1>:                             chapter.            (line 1111)
-* name2 <2>:                             chapter.            (line 1936)
-* t--ruc:                                chapter.            (line 2263)
-* T--ruc:                                chapter.            (line 2263)
+* name2 <1>:                             chapter.            (line 1110)
+* name2 <2>:                             chapter.            (line 1934)
+* t--ruc:                                chapter.            (line 2261)
+* T--ruc:                                chapter.            (line 2261)
 * truc:                                  chapter.            (line  317)
 * truc <1>:                              chapter.            (line  339)
-* truc <2>:                              chapter.            (line 1005)
-* truc <3>:                              chapter.            (line 1027)
-* truc <4>:                              chapter.            (line 1827)
-* truc <5>:                              chapter.            (line 1850)
-* xxx, zzz:                              chapter.            (line 2263)
+* truc <2>:                              chapter.            (line 1004)
+* truc <3>:                              chapter.            (line 1026)
+* truc <4>:                              chapter.            (line 1825)
+* truc <5>:                              chapter.            (line 1848)
+* xxx, zzz:                              chapter.            (line 2261)
 
    vr
 
@@ -2579,8 +2577,8 @@ aaa
 * Menu:
 
 * d--eftp_name:                          chapter.            (line  384)
-* d--eftp_name <1>:                      chapter.            (line 1072)
-* d--eftp_name <2>:                      chapter.            (line 1896)
+* d--eftp_name <1>:                      chapter.            (line 1071)
+* d--eftp_name <2>:                      chapter.            (line 1894)
 
    (8)
 
@@ -2624,291 +2622,291 @@ chapter 2
 * Menu:
 
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  716)
-* -option <2>:                           chapter.            (line 1415)
-* ?:                                     chapter.            (line 2263)
-* .:                                     chapter.            (line 2263)
+* -option <1>:                           chapter.            (line  715)
+* -option <2>:                           chapter.            (line 1413)
+* ?:                                     chapter.            (line 2261)
+* .:                                     chapter.            (line 2261)
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  716)
-* " <2>:                                 chapter.            (line 1415)
-* a:                                     chapter.            (line 2263)
-* aaa, bbb:                              chapter.            (line 2263)
-* a--a:                                  chapter.            (line 2263)
+* " <1>:                                 chapter.            (line  715)
+* " <2>:                                 chapter.            (line 1413)
+* a:                                     chapter.            (line 2261)
+* aaa, bbb:                              chapter.            (line 2261)
+* a--a:                                  chapter.            (line 2261)
 * a--asis:                               chapter.            (line  519)
-* a--asis <1>:                           chapter.            (line 1207)
-* a--asis <2>:                           chapter.            (line 2037)
+* a--asis <1>:                           chapter.            (line 1206)
+* a--asis <2>:                           chapter.            (line 2035)
   aaa, See bbb.
 * b:                                     chapter.            (line  520)
-* b <1>:                                 chapter.            (line 1208)
-* b <2>:                                 chapter.            (line 2038)
-* b--b, c--c:                            chapter.            (line 2263)
-* counting entry:                        chapter.            (line 2605)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2263)
+* b <1>:                                 chapter.            (line 1207)
+* b <2>:                                 chapter.            (line 2036)
+* b--b, c--c:                            chapter.            (line 2261)
+* counting entry:                        chapter.            (line 2603)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2261)
 * d--efcv_name:                          chapter.            (line  366)
 * d--efcv_name <1>:                      chapter.            (line  369)
-* d--efcv_name <2>:                      chapter.            (line 1054)
-* d--efcv_name <3>:                      chapter.            (line 1057)
-* d--efcv_name <4>:                      chapter.            (line 1878)
-* d--efcv_name <5>:                      chapter.            (line 1881)
+* d--efcv_name <2>:                      chapter.            (line 1053)
+* d--efcv_name <3>:                      chapter.            (line 1056)
+* d--efcv_name <4>:                      chapter.            (line 1876)
+* d--efcv_name <5>:                      chapter.            (line 1879)
 * d--efivar_name of c--lass:             chapter.            (line  411)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1099)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1923)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1098)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1921)
 * d--efopt_name:                         chapter.            (line  402)
-* d--efopt_name <1>:                     chapter.            (line 1090)
-* d--efopt_name <2>:                     chapter.            (line 1914)
+* d--efopt_name <1>:                     chapter.            (line 1089)
+* d--efopt_name <2>:                     chapter.            (line 1912)
 * d--eftypecv_name of c--lass:           chapter.            (line  372)
 * d--eftypecv_name of c--lass <1>:       chapter.            (line  375)
-* d--eftypecv_name of c--lass <2>:       chapter.            (line 1060)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1063)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1884)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1887)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1059)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1062)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1882)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1885)
 * d--eftypecv_name2 of c--lass2:         chapter.            (line  443)
 * d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  446)
-* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1131)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1134)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1956)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1959)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1130)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1133)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1954)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1957)
 * d--eftypeivar_name of c--lass:         chapter.            (line  414)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1102)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1926)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1101)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1924)
 * d--eftypevar_name:                     chapter.            (line  408)
-* d--eftypevar_name <1>:                 chapter.            (line 1096)
-* d--eftypevar_name <2>:                 chapter.            (line 1920)
+* d--eftypevar_name <1>:                 chapter.            (line 1095)
+* d--eftypevar_name <2>:                 chapter.            (line 1918)
 * d--eftypevr_name:                      chapter.            (line  363)
-* d--eftypevr_name <1>:                  chapter.            (line 1051)
-* d--eftypevr_name <2>:                  chapter.            (line 1875)
+* d--eftypevr_name <1>:                  chapter.            (line 1050)
+* d--eftypevr_name <2>:                  chapter.            (line 1873)
 * d--efvar_name:                         chapter.            (line  396)
 * d--efvar_name <1>:                     chapter.            (line  399)
-* d--efvar_name <2>:                     chapter.            (line 1084)
-* d--efvar_name <3>:                     chapter.            (line 1087)
-* d--efvar_name <4>:                     chapter.            (line 1908)
-* d--efvar_name <5>:                     chapter.            (line 1911)
+* d--efvar_name <2>:                     chapter.            (line 1083)
+* d--efvar_name <3>:                     chapter.            (line 1086)
+* d--efvar_name <4>:                     chapter.            (line 1906)
+* d--efvar_name <5>:                     chapter.            (line 1909)
 * d--efvr_name:                          chapter.            (line  342)
-* d--efvr_name <1>:                      chapter.            (line 1030)
-* d--efvr_name <2>:                      chapter.            (line 1854)
+* d--efvr_name <1>:                      chapter.            (line 1029)
+* d--efvr_name <2>:                      chapter.            (line 1852)
   ddd:                                   See also ccc.
   ddd:                                   See also ccc.
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2263)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2261)
 * index entry between item and itemx:    chapter.            (line  524)
 * index entry between item and itemx <1>: chapter.           (line  654)
-* index entry between item and itemx <2>: chapter.           (line 1212)
-* index entry between item and itemx <3>: chapter.           (line 1342)
-* index entry between item and itemx <4>: chapter.           (line 2042)
-* index entry between item and itemx <5>: chapter.           (line 2205)
-* index entry in footnote:               chapter.            (line 2600)
+* index entry between item and itemx <2>: chapter.           (line 1211)
+* index entry between item and itemx <3>: chapter.           (line 1341)
+* index entry between item and itemx <4>: chapter.           (line 2040)
+* index entry between item and itemx <5>: chapter.           (line 2203)
+* index entry in footnote:               chapter.            (line 2598)
 * index entry within deffn:              chapter.            (line  317)
-* index entry within deffn <1>:          chapter.            (line 1005)
-* index entry within deffn <2>:          chapter.            (line 1827)
+* index entry within deffn <1>:          chapter.            (line 1004)
+* index entry within deffn <2>:          chapter.            (line 1825)
 * index entry within itemize:            chapter.            (line  228)
-* index entry within itemize <1>:        chapter.            (line  916)
-* index entry within itemize <2>:        chapter.            (line 1738)
+* index entry within itemize <1>:        chapter.            (line  915)
+* index entry within itemize <2>:        chapter.            (line 1736)
 * index entry within multitable:         chapter.            (line  250)
-* index entry within multitable <1>:     chapter.            (line  938)
-* index entry within multitable <2>:     chapter.            (line 1761)
-* t-ruc:                                 chapter.            (line 2263)
-* T-ruc:                                 chapter.            (line 2263)
+* index entry within multitable <1>:     chapter.            (line  937)
+* index entry within multitable <2>:     chapter.            (line 1759)
+* t-ruc:                                 chapter.            (line 2261)
+* T-ruc:                                 chapter.            (line 2261)
 * vtable i--tem code kbdinputstyle:      chapter.            (line  152)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  840)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1661)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  839)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1659)
 * vtable i--tem default kbdinputstyle:   chapter.            (line  147)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  835)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1656)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  834)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1654)
 * vtable i--tem distinct kbdinputstyle:  chapter.            (line  162)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  850)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1671)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  849)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1669)
 * vtable i--tem example kbdinputstyle:   chapter.            (line  157)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  845)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1666)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  844)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1664)
 * vtable i--tem in example code kbdinputstyle: chapter.      (line  154)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  842)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1663)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  841)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1661)
 * vtable i--tem in example default kbdinputstyle: chapter.   (line  149)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  837)
+                                                             (line  836)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1658)
+                                                             (line 1656)
 * vtable i--tem in example distinct kbdinputstyle: chapter.  (line  164)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  852)
+                                                             (line  851)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1673)
+                                                             (line 1671)
 * vtable i--tem in example example kbdinputstyle: chapter.   (line  159)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  847)
+                                                             (line  846)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1668)
+                                                             (line 1666)
 
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  716)
-* --foption <2>:                         chapter.            (line 1415)
-* ?:                                     chapter.            (line 2263)
-* .:                                     chapter.            (line 2263)
+* --foption <1>:                         chapter.            (line  715)
+* --foption <2>:                         chapter.            (line 1413)
+* ?:                                     chapter.            (line 2261)
+* .:                                     chapter.            (line 2261)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  716)
-* `` <2>:                                chapter.            (line 1415)
+* `` <1>:                                chapter.            (line  715)
+* `` <2>:                                chapter.            (line 1413)
 * a:                                     chapter.            (line  330)
 * a <1>:                                 chapter.            (line  523)
 * a <2>:                                 chapter.            (line  653)
-* a <3>:                                 chapter.            (line 1018)
-* a <4>:                                 chapter.            (line 1211)
-* a <5>:                                 chapter.            (line 1341)
-* a <6>:                                 chapter.            (line 1840)
-* a <7>:                                 chapter.            (line 2041)
-* a <8>:                                 chapter.            (line 2204)
-* a <9>:                                 chapter.            (line 2263)
+* a <3>:                                 chapter.            (line 1017)
+* a <4>:                                 chapter.            (line 1210)
+* a <5>:                                 chapter.            (line 1340)
+* a <6>:                                 chapter.            (line 1838)
+* a <7>:                                 chapter.            (line 2039)
+* a <8>:                                 chapter.            (line 2202)
+* a <9>:                                 chapter.            (line 2261)
 * after:                                 chapter.            (line  664)
-* after <1>:                             chapter.            (line 1352)
-* after <2>:                             chapter.            (line 2215)
+* after <1>:                             chapter.            (line 1351)
+* after <2>:                             chapter.            (line 2213)
 * arg2:                                  chapter.            (line  449)
-* arg2 <1>:                              chapter.            (line 1137)
-* arg2 <2>:                              chapter.            (line 1963)
+* arg2 <1>:                              chapter.            (line 1136)
+* arg2 <2>:                              chapter.            (line 1961)
 * b:                                     chapter.            (line  524)
 * b <1>:                                 chapter.            (line  654)
-* b <2>:                                 chapter.            (line 1212)
-* b <3>:                                 chapter.            (line 1342)
-* b <4>:                                 chapter.            (line 2042)
-* b <5>:                                 chapter.            (line 2205)
+* b <2>:                                 chapter.            (line 1211)
+* b <3>:                                 chapter.            (line 1341)
+* b <4>:                                 chapter.            (line 2040)
+* b <5>:                                 chapter.            (line 2203)
 * bidule machin:                         chapter.            (line  325)
-* bidule machin <1>:                     chapter.            (line 1013)
-* bidule machin <2>:                     chapter.            (line 1835)
+* bidule machin <1>:                     chapter.            (line 1012)
+* bidule machin <2>:                     chapter.            (line 1833)
 * d--effn_name:                          chapter.            (line  309)
-* d--effn_name <1>:                      chapter.            (line  997)
-* d--effn_name <2>:                      chapter.            (line 1819)
+* d--effn_name <1>:                      chapter.            (line  996)
+* d--effn_name <2>:                      chapter.            (line 1817)
 * d--efmac_name:                         chapter.            (line  390)
-* d--efmac_name <1>:                     chapter.            (line 1078)
-* d--efmac_name <2>:                     chapter.            (line 1902)
+* d--efmac_name <1>:                     chapter.            (line 1077)
+* d--efmac_name <2>:                     chapter.            (line 1900)
 * d--efmethod_name on c--lass:           chapter.            (line  417)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1105)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1929)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1104)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1927)
 * d--efop_name on c--lass:               chapter.            (line  378)
 * d--efop_name on c--lass <1>:           chapter.            (line  381)
-* d--efop_name on c--lass <2>:           chapter.            (line 1066)
-* d--efop_name on c--lass <3>:           chapter.            (line 1069)
-* d--efop_name on c--lass <4>:           chapter.            (line 1890)
-* d--efop_name on c--lass <5>:           chapter.            (line 1893)
+* d--efop_name on c--lass <2>:           chapter.            (line 1065)
+* d--efop_name on c--lass <3>:           chapter.            (line 1068)
+* d--efop_name on c--lass <4>:           chapter.            (line 1888)
+* d--efop_name on c--lass <5>:           chapter.            (line 1891)
 * d--efspec_name:                        chapter.            (line  393)
-* d--efspec_name <1>:                    chapter.            (line 1081)
-* d--efspec_name <2>:                    chapter.            (line 1905)
+* d--efspec_name <1>:                    chapter.            (line 1080)
+* d--efspec_name <2>:                    chapter.            (line 1903)
 * d--eftypefn_name:                      chapter.            (line  351)
 * d--eftypefn_name <1>:                  chapter.            (line  354)
-* d--eftypefn_name <2>:                  chapter.            (line 1039)
-* d--eftypefn_name <3>:                  chapter.            (line 1042)
-* d--eftypefn_name <4>:                  chapter.            (line 1863)
-* d--eftypefn_name <5>:                  chapter.            (line 1866)
+* d--eftypefn_name <2>:                  chapter.            (line 1038)
+* d--eftypefn_name <3>:                  chapter.            (line 1041)
+* d--eftypefn_name <4>:                  chapter.            (line 1861)
+* d--eftypefn_name <5>:                  chapter.            (line 1864)
 * d--eftypefn_name2:                     chapter.            (line  428)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1116)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1941)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1115)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1939)
 * d--eftypefun_name:                     chapter.            (line  405)
-* d--eftypefun_name <1>:                 chapter.            (line 1093)
-* d--eftypefun_name <2>:                 chapter.            (line 1917)
+* d--eftypefun_name <1>:                 chapter.            (line 1092)
+* d--eftypefun_name <2>:                 chapter.            (line 1915)
 * d--eftypemethod_name on c--lass:       chapter.            (line  420)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1108)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1932)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1107)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1930)
 * d--eftypeop_name on c--lass:           chapter.            (line  357)
 * d--eftypeop_name on c--lass <1>:       chapter.            (line  360)
-* d--eftypeop_name on c--lass <2>:       chapter.            (line 1045)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1048)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1869)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1872)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1044)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1047)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1867)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1870)
 * d--eftypeop_name2 on c--lass2:         chapter.            (line  433)
 * d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  438)
-* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1121)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1126)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1946)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1951)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1120)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1125)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1944)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1949)
 * d--efun_name:                          chapter.            (line  387)
-* d--efun_name <1>:                      chapter.            (line 1075)
-* d--efun_name <2>:                      chapter.            (line 1899)
+* d--efun_name <1>:                      chapter.            (line 1074)
+* d--efun_name <2>:                      chapter.            (line 1897)
 * de--ffn_name:                          chapter.            (line  312)
-* de--ffn_name <1>:                      chapter.            (line 1000)
-* de--ffn_name <2>:                      chapter.            (line 1822)
+* de--ffn_name <1>:                      chapter.            (line  999)
+* de--ffn_name <2>:                      chapter.            (line 1820)
 * deffn:                                 chapter.            (line  333)
 * deffn <1>:                             chapter.            (line  335)
-* deffn <2>:                             chapter.            (line 1021)
-* deffn <3>:                             chapter.            (line 1023)
-* deffn <4>:                             chapter.            (line 1844)
-* deffn <5>:                             chapter.            (line 1846)
+* deffn <2>:                             chapter.            (line 1020)
+* deffn <3>:                             chapter.            (line 1022)
+* deffn <4>:                             chapter.            (line 1842)
+* deffn <5>:                             chapter.            (line 1844)
 * deffnx:                                chapter.            (line  331)
 * deffnx <1>:                            chapter.            (line  336)
-* deffnx <2>:                            chapter.            (line 1019)
-* deffnx <3>:                            chapter.            (line 1024)
-* deffnx <4>:                            chapter.            (line 1841)
-* deffnx <5>:                            chapter.            (line 1847)
-* f---aa:                                chapter.            (line 2263)
+* deffnx <2>:                            chapter.            (line 1018)
+* deffnx <3>:                            chapter.            (line 1023)
+* deffnx <4>:                            chapter.            (line 1839)
+* deffnx <5>:                            chapter.            (line 1845)
+* f---aa:                                chapter.            (line 2261)
   f---aaa, See f---bbb.
-* f---bb, f---cc:                        chapter.            (line 2263)
+* f---bb, f---cc:                        chapter.            (line 2261)
   f---ddd:                               See also f---ccc.
   f---ddd:                               See also f---ccc.
-* f---ddd, f---eee, ffff:                chapter.            (line 2263)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2263)
+* f---ddd, f---eee, ffff:                chapter.            (line 2261)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2261)
 * followed:                              chapter.            (line  328)
 * followed <1>:                          chapter.            (line  662)
-* followed <2>:                          chapter.            (line 1016)
-* followed <3>:                          chapter.            (line 1350)
-* followed <4>:                          chapter.            (line 1838)
-* followed <5>:                          chapter.            (line 2213)
+* followed <2>:                          chapter.            (line 1015)
+* followed <3>:                          chapter.            (line 1349)
+* followed <4>:                          chapter.            (line 1836)
+* followed <5>:                          chapter.            (line 2211)
 * I:                                     chapter.            (line  316)
 * I <1>:                                 chapter.            (line  338)
-* I <2>:                                 chapter.            (line 1004)
-* I <3>:                                 chapter.            (line 1026)
-* I <4>:                                 chapter.            (line 1826)
-* I <5>:                                 chapter.            (line 1849)
+* I <2>:                                 chapter.            (line 1003)
+* I <3>:                                 chapter.            (line 1025)
+* I <4>:                                 chapter.            (line 1824)
+* I <5>:                                 chapter.            (line 1847)
 * id i ule:                              chapter.            (line  322)
-* id i ule <1>:                          chapter.            (line 1010)
-* id i ule <2>:                          chapter.            (line 1832)
+* id i ule <1>:                          chapter.            (line 1009)
+* id i ule <2>:                          chapter.            (line 1830)
 * id ule:                                chapter.            (line  321)
-* id ule <1>:                            chapter.            (line 1009)
-* id ule <2>:                            chapter.            (line 1831)
+* id ule <1>:                            chapter.            (line 1008)
+* id ule <2>:                            chapter.            (line 1829)
 * INVALID:                               chapter.            (line  666)
-* INVALID <1>:                           chapter.            (line 1354)
-* INVALID <2>:                           chapter.            (line 2217)
+* INVALID <1>:                           chapter.            (line 1353)
+* INVALID <2>:                           chapter.            (line 2215)
 * log trap:                              chapter.            (line  318)
-* log trap <1>:                          chapter.            (line 1006)
-* log trap <2>:                          chapter.            (line 1828)
+* log trap <1>:                          chapter.            (line 1005)
+* log trap <2>:                          chapter.            (line 1826)
 * log trap1:                             chapter.            (line  319)
-* log trap1 <1>:                         chapter.            (line 1007)
-* log trap1 <2>:                         chapter.            (line 1829)
+* log trap1 <1>:                         chapter.            (line 1006)
+* log trap1 <2>:                         chapter.            (line 1827)
 * log trap2:                             chapter.            (line  320)
-* log trap2 <1>:                         chapter.            (line 1008)
-* log trap2 <2>:                         chapter.            (line 1830)
+* log trap2 <1>:                         chapter.            (line 1007)
+* log trap2 <2>:                         chapter.            (line 1828)
 * machin:                                chapter.            (line  324)
 * machin <1>:                            chapter.            (line  326)
 * machin <2>:                            chapter.            (line  658)
 * machin <3>:                            chapter.            (line  659)
 * machin <4>:                            chapter.            (line  660)
 * machin <5>:                            chapter.            (line  661)
-* machin <6>:                            chapter.            (line 1012)
-* machin <7>:                            chapter.            (line 1014)
-* machin <8>:                            chapter.            (line 1346)
-* machin <9>:                            chapter.            (line 1347)
-* machin <10>:                           chapter.            (line 1348)
-* machin <11>:                           chapter.            (line 1349)
-* machin <12>:                           chapter.            (line 1834)
-* machin <13>:                           chapter.            (line 1836)
-* machin <14>:                           chapter.            (line 2209)
-* machin <15>:                           chapter.            (line 2210)
-* machin <16>:                           chapter.            (line 2211)
-* machin <17>:                           chapter.            (line 2212)
+* machin <6>:                            chapter.            (line 1011)
+* machin <7>:                            chapter.            (line 1013)
+* machin <8>:                            chapter.            (line 1345)
+* machin <9>:                            chapter.            (line 1346)
+* machin <10>:                           chapter.            (line 1347)
+* machin <11>:                           chapter.            (line 1348)
+* machin <12>:                           chapter.            (line 1832)
+* machin <13>:                           chapter.            (line 1834)
+* machin <14>:                           chapter.            (line 2207)
+* machin <15>:                           chapter.            (line 2208)
+* machin <16>:                           chapter.            (line 2209)
+* machin <17>:                           chapter.            (line 2210)
 * n--ame:                                chapter.            (line  345)
 * n--ame <1>:                            chapter.            (line  348)
-* n--ame <2>:                            chapter.            (line 1033)
-* n--ame <3>:                            chapter.            (line 1036)
-* n--ame <4>:                            chapter.            (line 1857)
-* n--ame <5>:                            chapter.            (line 1860)
+* n--ame <2>:                            chapter.            (line 1032)
+* n--ame <3>:                            chapter.            (line 1035)
+* n--ame <4>:                            chapter.            (line 1855)
+* n--ame <5>:                            chapter.            (line 1858)
 * name2:                                 chapter.            (line  423)
-* name2 <1>:                             chapter.            (line 1111)
-* name2 <2>:                             chapter.            (line 1936)
-* t--ruc:                                chapter.            (line 2263)
-* T--ruc:                                chapter.            (line 2263)
+* name2 <1>:                             chapter.            (line 1110)
+* name2 <2>:                             chapter.            (line 1934)
+* t--ruc:                                chapter.            (line 2261)
+* T--ruc:                                chapter.            (line 2261)
 * truc:                                  chapter.            (line  317)
 * truc <1>:                              chapter.            (line  339)
-* truc <2>:                              chapter.            (line 1005)
-* truc <3>:                              chapter.            (line 1027)
-* truc <4>:                              chapter.            (line 1827)
-* truc <5>:                              chapter.            (line 1850)
-* xxx, zzz:                              chapter.            (line 2263)
+* truc <2>:                              chapter.            (line 1004)
+* truc <3>:                              chapter.            (line 1026)
+* truc <4>:                              chapter.            (line 1825)
+* truc <5>:                              chapter.            (line 1848)
+* xxx, zzz:                              chapter.            (line 2261)
 
 Top section
 1 chapter
diff --git 
a/tp/tests/layout/res_parser/formatting_plaintext_ascii_punctuation/formatting.txt
 
b/tp/tests/layout/res_parser/formatting_plaintext_ascii_punctuation/formatting.txt
index 35b50516b6..9089f16c86 100644
--- 
a/tp/tests/layout/res_parser/formatting_plaintext_ascii_punctuation/formatting.txt
+++ 
b/tp/tests/layout/res_parser/formatting_plaintext_ascii_punctuation/formatting.txt
@@ -457,8 +457,8 @@ name: (file name)chapter '@pxref{chapter, cross ref name, 
title, file
 name, manual}' see cross ref name: (file name)chapter '@inforef{chapter,
 cross ref name, file name}' See cross ref name: (file name)chapter
 
-   '@ref{chapter}' chapter:: '@xref{chapter}' See chapter::.
-'@pxref{chapter}' see chapter:: '@ref{s--ect@comma{}ion}' s--ect,ion::
+   '@ref{chapter}' chapter '@xref{chapter}' See chapter.
+'@pxref{chapter}' see chapter '@ref{s--ect@comma{}ion}' s--ect,ion
 
    '@ref{s--ect@comma{}ion, a @comma{} in cross ref, a comma@comma{} in
 title, a comma@comma{} in file, a @comma{} in manual name }' a , in
@@ -466,26 +466,26 @@ cross ref: (a comma, in file)s--ect,ion
 
    '@ref{chapter,cross ref name}' cross ref name: chapter
 '@ref{chapter,,title}' title: chapter '@ref{chapter,,,file name}' (file
-name)chapter:: '@ref{chapter,,,,manual}' ()chapter:: '@ref{chapter,cross
-ref name,title,}' cross ref name: chapter '@ref{chapter,cross ref
-name,,file name}' cross ref name: (file name)chapter '@ref{chapter,cross
-ref name,,,manual}' cross ref name: ()chapter '@ref{chapter,cross ref
+name)chapter '@ref{chapter,,,,manual}' ()chapter '@ref{chapter,cross ref
+name,title,}' cross ref name: chapter '@ref{chapter,cross ref name,,file
+name}' cross ref name: (file name)chapter '@ref{chapter,cross ref
+name,,,manual}' cross ref name: ()chapter '@ref{chapter,cross ref
 name,title,file name}' cross ref name: (file name)chapter
 '@ref{chapter,cross ref name,title,,manual}' cross ref name: ()chapter
 '@ref{chapter,cross ref name,title, file name, manual}' cross ref name:
 (file name)chapter '@ref{chapter,,title,file name}' title: (file
 name)chapter '@ref{chapter,,title,,manual}' title: ()chapter
 '@ref{chapter,,title, file name, manual}' title: (file name)chapter
-'@ref{chapter,,,file name,manual}' (file name)chapter::
+'@ref{chapter,,,file name,manual}' (file name)chapter
 
    '@ref{(pman)anode,cross ref name}' cross ref name: (pman)anode
 '@ref{(pman)anode,,title}' title: (pman)anode '@ref{(pman)anode,,,file
-name}' (file name)(pman)anode:: '@ref{(pman)anode,,,,manual}'
-()(pman)anode:: '@ref{(pman)anode,cross ref name,title,}' cross ref
-name: (pman)anode '@ref{(pman)anode,cross ref name,,file name}' cross
-ref name: (file name)(pman)anode '@ref{(pman)anode,cross ref
-name,,,manual}' cross ref name: ()(pman)anode '@ref{(pman)anode,cross
-ref name,title,file name}' cross ref name: (file name)(pman)anode
+name}' (file name)(pman)anode '@ref{(pman)anode,,,,manual}'
+()(pman)anode '@ref{(pman)anode,cross ref name,title,}' cross ref name:
+(pman)anode '@ref{(pman)anode,cross ref name,,file name}' cross ref
+name: (file name)(pman)anode '@ref{(pman)anode,cross ref name,,,manual}'
+cross ref name: ()(pman)anode '@ref{(pman)anode,cross ref
+name,title,file name}' cross ref name: (file name)(pman)anode
 '@ref{(pman)anode,cross ref name,title,,manual}' cross ref name:
 ()(pman)anode '@ref{(pman)anode,cross ref name,title, file name,
 manual}' cross ref name: (file name)(pman)anode
@@ -493,22 +493,22 @@ manual}' cross ref name: (file name)(pman)anode
 '@ref{(pman)anode,,title,,manual}' title: ()(pman)anode
 '@ref{(pman)anode,,title, file name, manual}' title: (file
 name)(pman)anode '@ref{(pman)anode,,,file name,manual}' (file
-name)(pman)anode::
+name)(pman)anode
 
    '@inforef{chapter, cross ref name, file name}' See cross ref name:
-(file name)chapter '@inforef{chapter}' See chapter:: '@inforef{chapter,
+(file name)chapter '@inforef{chapter}' See chapter '@inforef{chapter,
 cross ref name}' See cross ref name: chapter '@inforef{chapter,,file
-name}' See (file name)chapter:: '@inforef{node, cross ref name, file
-name}' See cross ref name: (file name)node '@inforef{node}' See node::
+name}' See (file name)chapter '@inforef{node, cross ref name, file
+name}' See cross ref name: (file name)node '@inforef{node}' See node
 '@inforef{node, cross ref name}' See cross ref name: node
-'@inforef{node,,file name}' See (file name)node:: '@inforef{chapter,
-cross ref name, file name, spurious arg}' See cross ref name: (file
-name, spurious arg)chapter
+'@inforef{node,,file name}' See (file name)node '@inforef{chapter, cross
+ref name, file name, spurious arg}' See cross ref name: (file name,
+spurious arg)chapter
 
    '@inforef{s--ect@comma{}ion, a @comma{} in cross ref, a comma@comma{}
 in file}' See a , in cross ref: (a comma, in file)s--ect,ion
 
-   'chapter::'.
+   'chapter'.
 
    cross ref with uref uref1 (href://http/myhost.com/index.html): (info
 file with uref3 uref3 (href://http/myhost.com/index3.html))ext cross ref
@@ -672,35 +672,34 @@ b
 
    g-roupe
 
-   '@ref{node}' node::
+   '@ref{node}' node
 
    '@ref{,cross ref name}' cross ref name: '@ref{,,title}' title:
-'@ref{,,,file name}' (file name):: '@ref{,,,,manual}' ()::
-'@ref{node,cross ref name}' cross ref name: node '@ref{node,,title}'
-title: node '@ref{node,,,file name}' (file name)node::
-'@ref{node,,,,manual}' ()node:: '@ref{node,cross ref name,title,}' cross
-ref name: node '@ref{node,cross ref name,,file name}' cross ref name:
-(file name)node '@ref{node,cross ref name,,,manual}' cross ref name:
-()node '@ref{node,cross ref name,title,file name}' cross ref name: (file
-name)node '@ref{node,cross ref name,title,,manual}' cross ref name:
-()node '@ref{node,cross ref name,title, file name, manual}' cross ref
-name: (file name)node '@ref{node,,title,file name}' title: (file
-name)node '@ref{node,,title,,manual}' title: ()node
-'@ref{chapter,,title, file name, manual}' title: (file name)chapter
-'@ref{node,,title, file name, manual}' title: (file name)node
-'@ref{node,,,file name,manual}' (file name)node:: '@ref{,cross ref
-name,title,}' cross ref name: '@ref{,cross ref name,,file name}' cross
-ref name: (file name) '@ref{,cross ref name,,,manual}' cross ref name:
-() '@ref{,cross ref name,title,file name}' cross ref name: (file name)
-'@ref{,cross ref name,title,,manual}' cross ref name: () '@ref{,cross
-ref name,title, file name, manual}' cross ref name: (file name)
-'@ref{,,title,file name}' title: (file name) '@ref{,,title,,manual}'
-title: () '@ref{,,title, file name, manual}' title: (file name)
-'@ref{,,,file name,manual}' (file name)::
+'@ref{,,,file name}' (file name) '@ref{,,,,manual}' () '@ref{node,cross
+ref name}' cross ref name: node '@ref{node,,title}' title: node
+'@ref{node,,,file name}' (file name)node '@ref{node,,,,manual}' ()node
+'@ref{node,cross ref name,title,}' cross ref name: node '@ref{node,cross
+ref name,,file name}' cross ref name: (file name)node '@ref{node,cross
+ref name,,,manual}' cross ref name: ()node '@ref{node,cross ref
+name,title,file name}' cross ref name: (file name)node '@ref{node,cross
+ref name,title,,manual}' cross ref name: ()node '@ref{node,cross ref
+name,title, file name, manual}' cross ref name: (file name)node
+'@ref{node,,title,file name}' title: (file name)node
+'@ref{node,,title,,manual}' title: ()node '@ref{chapter,,title, file
+name, manual}' title: (file name)chapter '@ref{node,,title, file name,
+manual}' title: (file name)node '@ref{node,,,file name,manual}' (file
+name)node '@ref{,cross ref name,title,}' cross ref name: '@ref{,cross
+ref name,,file name}' cross ref name: (file name) '@ref{,cross ref
+name,,,manual}' cross ref name: () '@ref{,cross ref name,title,file
+name}' cross ref name: (file name) '@ref{,cross ref name,title,,manual}'
+cross ref name: () '@ref{,cross ref name,title, file name, manual}'
+cross ref name: (file name) '@ref{,,title,file name}' title: (file name)
+'@ref{,,title,,manual}' title: () '@ref{,,title, file name, manual}'
+title: (file name) '@ref{,,,file name,manual}' (file name)
 
    '@inforef{,cross ref name }' See cross ref name: '@inforef{,,file
-name}' See (file name):: '@inforef{,cross ref name, file name}' See
-cross ref name: (file name) '@inforef{}' See ::
+name}' See (file name) '@inforef{,cross ref name, file name}' See cross
+ref name: (file name) '@inforef{}' See
 
    Normal text
 
@@ -1145,8 +1144,8 @@ name: (file name)chapter '@pxref{chapter, cross ref name, 
title, file
 name, manual}' see cross ref name: (file name)chapter '@inforef{chapter,
 cross ref name, file name}' See cross ref name: (file name)chapter
 
-   '@ref{chapter}' chapter:: '@xref{chapter}' See chapter::.
-'@pxref{chapter}' see chapter:: '@ref{s--ect@comma{}ion}' s--ect,ion::
+   '@ref{chapter}' chapter '@xref{chapter}' See chapter.
+'@pxref{chapter}' see chapter '@ref{s--ect@comma{}ion}' s--ect,ion
 
    '@ref{s--ect@comma{}ion, a @comma{} in cross ref, a comma@comma{} in
 title, a comma@comma{} in file, a @comma{} in manual name }' a , in
@@ -1154,26 +1153,26 @@ cross ref: (a comma, in file)s--ect,ion
 
    '@ref{chapter,cross ref name}' cross ref name: chapter
 '@ref{chapter,,title}' title: chapter '@ref{chapter,,,file name}' (file
-name)chapter:: '@ref{chapter,,,,manual}' ()chapter:: '@ref{chapter,cross
-ref name,title,}' cross ref name: chapter '@ref{chapter,cross ref
-name,,file name}' cross ref name: (file name)chapter '@ref{chapter,cross
-ref name,,,manual}' cross ref name: ()chapter '@ref{chapter,cross ref
+name)chapter '@ref{chapter,,,,manual}' ()chapter '@ref{chapter,cross ref
+name,title,}' cross ref name: chapter '@ref{chapter,cross ref name,,file
+name}' cross ref name: (file name)chapter '@ref{chapter,cross ref
+name,,,manual}' cross ref name: ()chapter '@ref{chapter,cross ref
 name,title,file name}' cross ref name: (file name)chapter
 '@ref{chapter,cross ref name,title,,manual}' cross ref name: ()chapter
 '@ref{chapter,cross ref name,title, file name, manual}' cross ref name:
 (file name)chapter '@ref{chapter,,title,file name}' title: (file
 name)chapter '@ref{chapter,,title,,manual}' title: ()chapter
 '@ref{chapter,,title, file name, manual}' title: (file name)chapter
-'@ref{chapter,,,file name,manual}' (file name)chapter::
+'@ref{chapter,,,file name,manual}' (file name)chapter
 
    '@ref{(pman)anode,cross ref name}' cross ref name: (pman)anode
 '@ref{(pman)anode,,title}' title: (pman)anode '@ref{(pman)anode,,,file
-name}' (file name)(pman)anode:: '@ref{(pman)anode,,,,manual}'
-()(pman)anode:: '@ref{(pman)anode,cross ref name,title,}' cross ref
-name: (pman)anode '@ref{(pman)anode,cross ref name,,file name}' cross
-ref name: (file name)(pman)anode '@ref{(pman)anode,cross ref
-name,,,manual}' cross ref name: ()(pman)anode '@ref{(pman)anode,cross
-ref name,title,file name}' cross ref name: (file name)(pman)anode
+name}' (file name)(pman)anode '@ref{(pman)anode,,,,manual}'
+()(pman)anode '@ref{(pman)anode,cross ref name,title,}' cross ref name:
+(pman)anode '@ref{(pman)anode,cross ref name,,file name}' cross ref
+name: (file name)(pman)anode '@ref{(pman)anode,cross ref name,,,manual}'
+cross ref name: ()(pman)anode '@ref{(pman)anode,cross ref
+name,title,file name}' cross ref name: (file name)(pman)anode
 '@ref{(pman)anode,cross ref name,title,,manual}' cross ref name:
 ()(pman)anode '@ref{(pman)anode,cross ref name,title, file name,
 manual}' cross ref name: (file name)(pman)anode
@@ -1181,22 +1180,22 @@ manual}' cross ref name: (file name)(pman)anode
 '@ref{(pman)anode,,title,,manual}' title: ()(pman)anode
 '@ref{(pman)anode,,title, file name, manual}' title: (file
 name)(pman)anode '@ref{(pman)anode,,,file name,manual}' (file
-name)(pman)anode::
+name)(pman)anode
 
    '@inforef{chapter, cross ref name, file name}' See cross ref name:
-(file name)chapter '@inforef{chapter}' See chapter:: '@inforef{chapter,
+(file name)chapter '@inforef{chapter}' See chapter '@inforef{chapter,
 cross ref name}' See cross ref name: chapter '@inforef{chapter,,file
-name}' See (file name)chapter:: '@inforef{node, cross ref name, file
-name}' See cross ref name: (file name)node '@inforef{node}' See node::
+name}' See (file name)chapter '@inforef{node, cross ref name, file
+name}' See cross ref name: (file name)node '@inforef{node}' See node
 '@inforef{node, cross ref name}' See cross ref name: node
-'@inforef{node,,file name}' See (file name)node:: '@inforef{chapter,
-cross ref name, file name, spurious arg}' See cross ref name: (file
-name, spurious arg)chapter
+'@inforef{node,,file name}' See (file name)node '@inforef{chapter, cross
+ref name, file name, spurious arg}' See cross ref name: (file name,
+spurious arg)chapter
 
    '@inforef{s--ect@comma{}ion, a @comma{} in cross ref, a comma@comma{}
 in file}' See a , in cross ref: (a comma, in file)s--ect,ion
 
-   'chapter::'.
+   'chapter'.
 
    cross ref with uref uref1 (href://http/myhost.com/index.html): (info
 file with uref3 uref3 (href://http/myhost.com/index3.html))ext cross ref
@@ -1360,35 +1359,34 @@ b
 
    g-roupe
 
-   '@ref{node}' node::
+   '@ref{node}' node
 
    '@ref{,cross ref name}' cross ref name: '@ref{,,title}' title:
-'@ref{,,,file name}' (file name):: '@ref{,,,,manual}' ()::
-'@ref{node,cross ref name}' cross ref name: node '@ref{node,,title}'
-title: node '@ref{node,,,file name}' (file name)node::
-'@ref{node,,,,manual}' ()node:: '@ref{node,cross ref name,title,}' cross
-ref name: node '@ref{node,cross ref name,,file name}' cross ref name:
-(file name)node '@ref{node,cross ref name,,,manual}' cross ref name:
-()node '@ref{node,cross ref name,title,file name}' cross ref name: (file
-name)node '@ref{node,cross ref name,title,,manual}' cross ref name:
-()node '@ref{node,cross ref name,title, file name, manual}' cross ref
-name: (file name)node '@ref{node,,title,file name}' title: (file
-name)node '@ref{node,,title,,manual}' title: ()node
-'@ref{chapter,,title, file name, manual}' title: (file name)chapter
-'@ref{node,,title, file name, manual}' title: (file name)node
-'@ref{node,,,file name,manual}' (file name)node:: '@ref{,cross ref
-name,title,}' cross ref name: '@ref{,cross ref name,,file name}' cross
-ref name: (file name) '@ref{,cross ref name,,,manual}' cross ref name:
-() '@ref{,cross ref name,title,file name}' cross ref name: (file name)
-'@ref{,cross ref name,title,,manual}' cross ref name: () '@ref{,cross
-ref name,title, file name, manual}' cross ref name: (file name)
-'@ref{,,title,file name}' title: (file name) '@ref{,,title,,manual}'
-title: () '@ref{,,title, file name, manual}' title: (file name)
-'@ref{,,,file name,manual}' (file name)::
+'@ref{,,,file name}' (file name) '@ref{,,,,manual}' () '@ref{node,cross
+ref name}' cross ref name: node '@ref{node,,title}' title: node
+'@ref{node,,,file name}' (file name)node '@ref{node,,,,manual}' ()node
+'@ref{node,cross ref name,title,}' cross ref name: node '@ref{node,cross
+ref name,,file name}' cross ref name: (file name)node '@ref{node,cross
+ref name,,,manual}' cross ref name: ()node '@ref{node,cross ref
+name,title,file name}' cross ref name: (file name)node '@ref{node,cross
+ref name,title,,manual}' cross ref name: ()node '@ref{node,cross ref
+name,title, file name, manual}' cross ref name: (file name)node
+'@ref{node,,title,file name}' title: (file name)node
+'@ref{node,,title,,manual}' title: ()node '@ref{chapter,,title, file
+name, manual}' title: (file name)chapter '@ref{node,,title, file name,
+manual}' title: (file name)node '@ref{node,,,file name,manual}' (file
+name)node '@ref{,cross ref name,title,}' cross ref name: '@ref{,cross
+ref name,,file name}' cross ref name: (file name) '@ref{,cross ref
+name,,,manual}' cross ref name: () '@ref{,cross ref name,title,file
+name}' cross ref name: (file name) '@ref{,cross ref name,title,,manual}'
+cross ref name: () '@ref{,cross ref name,title, file name, manual}'
+cross ref name: (file name) '@ref{,,title,file name}' title: (file name)
+'@ref{,,title,,manual}' title: () '@ref{,,title, file name, manual}'
+title: (file name) '@ref{,,,file name,manual}' (file name)
 
    '@inforef{,cross ref name }' See cross ref name: '@inforef{,,file
-name}' See (file name):: '@inforef{,cross ref name, file name}' See
-cross ref name: (file name) '@inforef{}' See ::
+name}' See (file name) '@inforef{,cross ref name, file name}' See cross
+ref name: (file name) '@inforef{}' See
 
    In example.
 
@@ -1970,10 +1968,10 @@ cross ref name: (file name) '@inforef{}' See ::
      @pxref{chapter, cross ref name, title, file name, manual} see cross ref 
name: (file name)chapter
      @inforef{chapter, cross ref name, file name} See cross ref name: (file 
name)chapter
 
-     @ref{chapter} chapter::
-     @xref{chapter} See chapter::.
-     @pxref{chapter} see chapter::
-     @ref{s--ect@comma{}ion} s--ect,ion::
+     @ref{chapter} chapter
+     @xref{chapter} See chapter.
+     @pxref{chapter} see chapter
+     @ref{s--ect@comma{}ion} s--ect,ion
 
      @ref{s--ect@comma{}ion, a @comma{} in cross
      ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in 
manual name }
@@ -1982,8 +1980,8 @@ cross ref name: (file name) '@inforef{}' See ::
 
      @ref{chapter,cross ref name} cross ref name: chapter
      @ref{chapter,,title} title: chapter
-     @ref{chapter,,,file name} (file name)chapter::
-     @ref{chapter,,,,manual} ()chapter::
+     @ref{chapter,,,file name} (file name)chapter
+     @ref{chapter,,,,manual} ()chapter
      @ref{chapter,cross ref name,title,} cross ref name: chapter
      @ref{chapter,cross ref name,,file name} cross ref name: (file name)chapter
      @ref{chapter,cross ref name,,,manual} cross ref name: ()chapter
@@ -1993,13 +1991,13 @@ cross ref name: (file name) '@inforef{}' See ::
      @ref{chapter,,title,file name} title: (file name)chapter
      @ref{chapter,,title,,manual} title: ()chapter
      @ref{chapter,,title, file name, manual} title: (file name)chapter
-     @ref{chapter,,,file name,manual} (file name)chapter::
+     @ref{chapter,,,file name,manual} (file name)chapter
 
 
      @ref{(pman)anode,cross ref name} cross ref name: (pman)anode
      @ref{(pman)anode,,title} title: (pman)anode
-     @ref{(pman)anode,,,file name} (file name)(pman)anode::
-     @ref{(pman)anode,,,,manual} ()(pman)anode::
+     @ref{(pman)anode,,,file name} (file name)(pman)anode
+     @ref{(pman)anode,,,,manual} ()(pman)anode
      @ref{(pman)anode,cross ref name,title,} cross ref name: (pman)anode
      @ref{(pman)anode,cross ref name,,file name} cross ref name: (file 
name)(pman)anode
      @ref{(pman)anode,cross ref name,,,manual} cross ref name: ()(pman)anode
@@ -2009,17 +2007,17 @@ cross ref name: (file name) '@inforef{}' See ::
      @ref{(pman)anode,,title,file name} title: (file name)(pman)anode
      @ref{(pman)anode,,title,,manual} title: ()(pman)anode
      @ref{(pman)anode,,title, file name, manual} title: (file name)(pman)anode
-     @ref{(pman)anode,,,file name,manual} (file name)(pman)anode::
+     @ref{(pman)anode,,,file name,manual} (file name)(pman)anode
 
 
      @inforef{chapter, cross ref name, file name} See cross ref name: (file 
name)chapter
-     @inforef{chapter} See chapter::
+     @inforef{chapter} See chapter
      @inforef{chapter, cross ref name} See cross ref name: chapter
-     @inforef{chapter,,file name} See (file name)chapter::
+     @inforef{chapter,,file name} See (file name)chapter
      @inforef{node, cross ref name, file name} See cross ref name: (file 
name)node
-     @inforef{node} See node::
+     @inforef{node} See node
      @inforef{node, cross ref name} See cross ref name: node
-     @inforef{node,,file name} See (file name)node::
+     @inforef{node,,file name} See (file name)node
      @inforef{chapter, cross ref name, file name, spurious arg} See cross ref 
name: (file name, spurious arg)chapter
 
      @inforef{s--ect@comma{}ion, a @comma{} in cross
@@ -2027,7 +2025,7 @@ cross ref name: (file name) '@inforef{}' See ::
      See a , in cross
      ref: (a comma, in file)s--ect,ion
 
-     'chapter::'.
+     'chapter'.
 
      cross ref with uref uref1 (href://http/myhost.com/index.html): (info file 
with uref3 uref3 (href://http/myhost.com/index3.html))ext
      cross ref with uref uref1 (href://http/myhost.com/index.html): chapter
@@ -2223,16 +2221,16 @@ aaa
 
      g--roupe
 
-     @ref{node} node::
+     @ref{node} node
 
      @ref{,cross ref name} cross ref name:
      @ref{,,title} title:
-     @ref{,,,file name} (file name)::
-     @ref{,,,,manual} ()::
+     @ref{,,,file name} (file name)
+     @ref{,,,,manual} ()
      @ref{node,cross ref name} cross ref name: node
      @ref{node,,title} title: node
-     @ref{node,,,file name} (file name)node::
-     @ref{node,,,,manual} ()node::
+     @ref{node,,,file name} (file name)node
+     @ref{node,,,,manual} ()node
      @ref{node,cross ref name,title,} cross ref name: node
      @ref{node,cross ref name,,file name} cross ref name: (file name)node
      @ref{node,cross ref name,,,manual} cross ref name: ()node
@@ -2243,7 +2241,7 @@ aaa
      @ref{node,,title,,manual} title: ()node
      @ref{chapter,,title, file name, manual} title: (file name)chapter
      @ref{node,,title, file name, manual} title: (file name)node
-     @ref{node,,,file name,manual} (file name)node::
+     @ref{node,,,file name,manual} (file name)node
      @ref{,cross ref name,title,} cross ref name:
      @ref{,cross ref name,,file name} cross ref name: (file name)
      @ref{,cross ref name,,,manual} cross ref name: ()
@@ -2253,12 +2251,12 @@ aaa
      @ref{,,title,file name} title: (file name)
      @ref{,,title,,manual} title: ()
      @ref{,,title, file name, manual} title: (file name)
-     @ref{,,,file name,manual} (file name)::
+     @ref{,,,file name,manual} (file name)
 
      @inforef{,cross ref name } See cross ref name:
-     @inforef{,,file name} See (file name)::
+     @inforef{,,file name} See (file name)
      @inforef{,cross ref name, file name} See cross ref name: (file name)
-     @inforef{} See ::
+     @inforef{} See
 
 
    Text(7)
@@ -2267,306 +2265,306 @@ aaa
 
 * Menu:
 
-* truc:                                  chapter.            (line 2263)
+* truc:                                  chapter.            (line 2261)
 
    codeidx
 
 * Menu:
 
-* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2263)
+* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2261)
 
    cp
 
 * Menu:
 
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  716)
-* -option <2>:                           chapter.            (line 1415)
-* ?:                                     chapter.            (line 2263)
-* .:                                     chapter.            (line 2263)
+* -option <1>:                           chapter.            (line  715)
+* -option <2>:                           chapter.            (line 1413)
+* ?:                                     chapter.            (line 2261)
+* .:                                     chapter.            (line 2261)
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  716)
-* " <2>:                                 chapter.            (line 1415)
-* a:                                     chapter.            (line 2263)
-* aaa, bbb:                              chapter.            (line 2263)
-* a--a:                                  chapter.            (line 2263)
+* " <1>:                                 chapter.            (line  715)
+* " <2>:                                 chapter.            (line 1413)
+* a:                                     chapter.            (line 2261)
+* aaa, bbb:                              chapter.            (line 2261)
+* a--a:                                  chapter.            (line 2261)
 * a--asis:                               chapter.            (line  519)
-* a--asis <1>:                           chapter.            (line 1207)
-* a--asis <2>:                           chapter.            (line 2037)
+* a--asis <1>:                           chapter.            (line 1206)
+* a--asis <2>:                           chapter.            (line 2035)
   aaa, See bbb.
 * b:                                     chapter.            (line  520)
-* b <1>:                                 chapter.            (line 1208)
-* b <2>:                                 chapter.            (line 2038)
-* b--b, c--c:                            chapter.            (line 2263)
+* b <1>:                                 chapter.            (line 1207)
+* b <2>:                                 chapter.            (line 2036)
+* b--b, c--c:                            chapter.            (line 2261)
 * counting entry:                        chapter.            (line    0)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2263)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2261)
 * d--efcv_name:                          chapter.            (line  366)
 * d--efcv_name <1>:                      chapter.            (line  369)
-* d--efcv_name <2>:                      chapter.            (line 1054)
-* d--efcv_name <3>:                      chapter.            (line 1057)
-* d--efcv_name <4>:                      chapter.            (line 1878)
-* d--efcv_name <5>:                      chapter.            (line 1881)
+* d--efcv_name <2>:                      chapter.            (line 1053)
+* d--efcv_name <3>:                      chapter.            (line 1056)
+* d--efcv_name <4>:                      chapter.            (line 1876)
+* d--efcv_name <5>:                      chapter.            (line 1879)
 * d--efivar_name of c--lass:             chapter.            (line  411)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1099)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1923)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1098)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1921)
 * d--efopt_name:                         chapter.            (line  402)
-* d--efopt_name <1>:                     chapter.            (line 1090)
-* d--efopt_name <2>:                     chapter.            (line 1914)
+* d--efopt_name <1>:                     chapter.            (line 1089)
+* d--efopt_name <2>:                     chapter.            (line 1912)
 * d--eftypecv_name of c--lass:           chapter.            (line  372)
 * d--eftypecv_name of c--lass <1>:       chapter.            (line  375)
-* d--eftypecv_name of c--lass <2>:       chapter.            (line 1060)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1063)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1884)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1887)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1059)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1062)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1882)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1885)
 * d--eftypecv_name2 of c--lass2:         chapter.            (line  443)
 * d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  446)
-* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1131)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1134)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1956)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1959)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1130)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1133)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1954)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1957)
 * d--eftypeivar_name of c--lass:         chapter.            (line  414)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1102)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1926)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1101)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1924)
 * d--eftypevar_name:                     chapter.            (line  408)
-* d--eftypevar_name <1>:                 chapter.            (line 1096)
-* d--eftypevar_name <2>:                 chapter.            (line 1920)
+* d--eftypevar_name <1>:                 chapter.            (line 1095)
+* d--eftypevar_name <2>:                 chapter.            (line 1918)
 * d--eftypevr_name:                      chapter.            (line  363)
-* d--eftypevr_name <1>:                  chapter.            (line 1051)
-* d--eftypevr_name <2>:                  chapter.            (line 1875)
+* d--eftypevr_name <1>:                  chapter.            (line 1050)
+* d--eftypevr_name <2>:                  chapter.            (line 1873)
 * d--efvar_name:                         chapter.            (line  396)
 * d--efvar_name <1>:                     chapter.            (line  399)
-* d--efvar_name <2>:                     chapter.            (line 1084)
-* d--efvar_name <3>:                     chapter.            (line 1087)
-* d--efvar_name <4>:                     chapter.            (line 1908)
-* d--efvar_name <5>:                     chapter.            (line 1911)
+* d--efvar_name <2>:                     chapter.            (line 1083)
+* d--efvar_name <3>:                     chapter.            (line 1086)
+* d--efvar_name <4>:                     chapter.            (line 1906)
+* d--efvar_name <5>:                     chapter.            (line 1909)
 * d--efvr_name:                          chapter.            (line  342)
-* d--efvr_name <1>:                      chapter.            (line 1030)
-* d--efvr_name <2>:                      chapter.            (line 1854)
+* d--efvr_name <1>:                      chapter.            (line 1029)
+* d--efvr_name <2>:                      chapter.            (line 1852)
   ddd:                                   See also ccc.
   ddd:                                   See also ccc.
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2263)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2261)
 * index entry between item and itemx:    chapter.            (line  524)
 * index entry between item and itemx <1>: chapter.           (line  654)
-* index entry between item and itemx <2>: chapter.           (line 1212)
-* index entry between item and itemx <3>: chapter.           (line 1342)
-* index entry between item and itemx <4>: chapter.           (line 2042)
-* index entry between item and itemx <5>: chapter.           (line 2205)
+* index entry between item and itemx <2>: chapter.           (line 1211)
+* index entry between item and itemx <3>: chapter.           (line 1341)
+* index entry between item and itemx <4>: chapter.           (line 2040)
+* index entry between item and itemx <5>: chapter.           (line 2203)
 * index entry in footnote:               chapter.            (line    0)
 * index entry within deffn:              chapter.            (line  317)
-* index entry within deffn <1>:          chapter.            (line 1005)
-* index entry within deffn <2>:          chapter.            (line 1827)
+* index entry within deffn <1>:          chapter.            (line 1004)
+* index entry within deffn <2>:          chapter.            (line 1825)
 * index entry within itemize:            chapter.            (line  228)
-* index entry within itemize <1>:        chapter.            (line  916)
-* index entry within itemize <2>:        chapter.            (line 1738)
+* index entry within itemize <1>:        chapter.            (line  915)
+* index entry within itemize <2>:        chapter.            (line 1736)
 * index entry within multitable:         chapter.            (line  250)
-* index entry within multitable <1>:     chapter.            (line  938)
-* index entry within multitable <2>:     chapter.            (line 1761)
-* t-ruc:                                 chapter.            (line 2263)
-* T-ruc:                                 chapter.            (line 2263)
+* index entry within multitable <1>:     chapter.            (line  937)
+* index entry within multitable <2>:     chapter.            (line 1759)
+* t-ruc:                                 chapter.            (line 2261)
+* T-ruc:                                 chapter.            (line 2261)
 * vtable i--tem code kbdinputstyle:      chapter.            (line  152)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  840)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1661)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  839)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1659)
 * vtable i--tem default kbdinputstyle:   chapter.            (line  147)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  835)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1656)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  834)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1654)
 * vtable i--tem distinct kbdinputstyle:  chapter.            (line  162)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  850)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1671)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  849)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1669)
 * vtable i--tem example kbdinputstyle:   chapter.            (line  157)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  845)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1666)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  844)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1664)
 * vtable i--tem in example code kbdinputstyle: chapter.      (line  154)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  842)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1663)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  841)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1661)
 * vtable i--tem in example default kbdinputstyle: chapter.   (line  149)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  837)
+                                                             (line  836)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1658)
+                                                             (line 1656)
 * vtable i--tem in example distinct kbdinputstyle: chapter.  (line  164)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  852)
+                                                             (line  851)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1673)
+                                                             (line 1671)
 * vtable i--tem in example example kbdinputstyle: chapter.   (line  159)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  847)
+                                                             (line  846)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1668)
+                                                             (line 1666)
 
    fn
 
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  716)
-* --foption <2>:                         chapter.            (line 1415)
-* ?:                                     chapter.            (line 2263)
-* .:                                     chapter.            (line 2263)
+* --foption <1>:                         chapter.            (line  715)
+* --foption <2>:                         chapter.            (line 1413)
+* ?:                                     chapter.            (line 2261)
+* .:                                     chapter.            (line 2261)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  716)
-* `` <2>:                                chapter.            (line 1415)
+* `` <1>:                                chapter.            (line  715)
+* `` <2>:                                chapter.            (line 1413)
 * a:                                     chapter.            (line  330)
 * a <1>:                                 chapter.            (line  523)
 * a <2>:                                 chapter.            (line  653)
-* a <3>:                                 chapter.            (line 1018)
-* a <4>:                                 chapter.            (line 1211)
-* a <5>:                                 chapter.            (line 1341)
-* a <6>:                                 chapter.            (line 1840)
-* a <7>:                                 chapter.            (line 2041)
-* a <8>:                                 chapter.            (line 2204)
-* a <9>:                                 chapter.            (line 2263)
+* a <3>:                                 chapter.            (line 1017)
+* a <4>:                                 chapter.            (line 1210)
+* a <5>:                                 chapter.            (line 1340)
+* a <6>:                                 chapter.            (line 1838)
+* a <7>:                                 chapter.            (line 2039)
+* a <8>:                                 chapter.            (line 2202)
+* a <9>:                                 chapter.            (line 2261)
 * after:                                 chapter.            (line  664)
-* after <1>:                             chapter.            (line 1352)
-* after <2>:                             chapter.            (line 2215)
+* after <1>:                             chapter.            (line 1351)
+* after <2>:                             chapter.            (line 2213)
 * arg2:                                  chapter.            (line  449)
-* arg2 <1>:                              chapter.            (line 1137)
-* arg2 <2>:                              chapter.            (line 1963)
+* arg2 <1>:                              chapter.            (line 1136)
+* arg2 <2>:                              chapter.            (line 1961)
 * b:                                     chapter.            (line  524)
 * b <1>:                                 chapter.            (line  654)
-* b <2>:                                 chapter.            (line 1212)
-* b <3>:                                 chapter.            (line 1342)
-* b <4>:                                 chapter.            (line 2042)
-* b <5>:                                 chapter.            (line 2205)
+* b <2>:                                 chapter.            (line 1211)
+* b <3>:                                 chapter.            (line 1341)
+* b <4>:                                 chapter.            (line 2040)
+* b <5>:                                 chapter.            (line 2203)
 * bidule machin:                         chapter.            (line  325)
-* bidule machin <1>:                     chapter.            (line 1013)
-* bidule machin <2>:                     chapter.            (line 1835)
+* bidule machin <1>:                     chapter.            (line 1012)
+* bidule machin <2>:                     chapter.            (line 1833)
 * d--effn_name:                          chapter.            (line  309)
-* d--effn_name <1>:                      chapter.            (line  997)
-* d--effn_name <2>:                      chapter.            (line 1819)
+* d--effn_name <1>:                      chapter.            (line  996)
+* d--effn_name <2>:                      chapter.            (line 1817)
 * d--efmac_name:                         chapter.            (line  390)
-* d--efmac_name <1>:                     chapter.            (line 1078)
-* d--efmac_name <2>:                     chapter.            (line 1902)
+* d--efmac_name <1>:                     chapter.            (line 1077)
+* d--efmac_name <2>:                     chapter.            (line 1900)
 * d--efmethod_name on c--lass:           chapter.            (line  417)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1105)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1929)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1104)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1927)
 * d--efop_name on c--lass:               chapter.            (line  378)
 * d--efop_name on c--lass <1>:           chapter.            (line  381)
-* d--efop_name on c--lass <2>:           chapter.            (line 1066)
-* d--efop_name on c--lass <3>:           chapter.            (line 1069)
-* d--efop_name on c--lass <4>:           chapter.            (line 1890)
-* d--efop_name on c--lass <5>:           chapter.            (line 1893)
+* d--efop_name on c--lass <2>:           chapter.            (line 1065)
+* d--efop_name on c--lass <3>:           chapter.            (line 1068)
+* d--efop_name on c--lass <4>:           chapter.            (line 1888)
+* d--efop_name on c--lass <5>:           chapter.            (line 1891)
 * d--efspec_name:                        chapter.            (line  393)
-* d--efspec_name <1>:                    chapter.            (line 1081)
-* d--efspec_name <2>:                    chapter.            (line 1905)
+* d--efspec_name <1>:                    chapter.            (line 1080)
+* d--efspec_name <2>:                    chapter.            (line 1903)
 * d--eftypefn_name:                      chapter.            (line  351)
 * d--eftypefn_name <1>:                  chapter.            (line  354)
-* d--eftypefn_name <2>:                  chapter.            (line 1039)
-* d--eftypefn_name <3>:                  chapter.            (line 1042)
-* d--eftypefn_name <4>:                  chapter.            (line 1863)
-* d--eftypefn_name <5>:                  chapter.            (line 1866)
+* d--eftypefn_name <2>:                  chapter.            (line 1038)
+* d--eftypefn_name <3>:                  chapter.            (line 1041)
+* d--eftypefn_name <4>:                  chapter.            (line 1861)
+* d--eftypefn_name <5>:                  chapter.            (line 1864)
 * d--eftypefn_name2:                     chapter.            (line  428)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1116)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1941)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1115)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1939)
 * d--eftypefun_name:                     chapter.            (line  405)
-* d--eftypefun_name <1>:                 chapter.            (line 1093)
-* d--eftypefun_name <2>:                 chapter.            (line 1917)
+* d--eftypefun_name <1>:                 chapter.            (line 1092)
+* d--eftypefun_name <2>:                 chapter.            (line 1915)
 * d--eftypemethod_name on c--lass:       chapter.            (line  420)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1108)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1932)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1107)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1930)
 * d--eftypeop_name on c--lass:           chapter.            (line  357)
 * d--eftypeop_name on c--lass <1>:       chapter.            (line  360)
-* d--eftypeop_name on c--lass <2>:       chapter.            (line 1045)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1048)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1869)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1872)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1044)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1047)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1867)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1870)
 * d--eftypeop_name2 on c--lass2:         chapter.            (line  433)
 * d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  438)
-* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1121)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1126)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1946)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1951)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1120)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1125)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1944)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1949)
 * d--efun_name:                          chapter.            (line  387)
-* d--efun_name <1>:                      chapter.            (line 1075)
-* d--efun_name <2>:                      chapter.            (line 1899)
+* d--efun_name <1>:                      chapter.            (line 1074)
+* d--efun_name <2>:                      chapter.            (line 1897)
 * de--ffn_name:                          chapter.            (line  312)
-* de--ffn_name <1>:                      chapter.            (line 1000)
-* de--ffn_name <2>:                      chapter.            (line 1822)
+* de--ffn_name <1>:                      chapter.            (line  999)
+* de--ffn_name <2>:                      chapter.            (line 1820)
 * deffn:                                 chapter.            (line  333)
 * deffn <1>:                             chapter.            (line  335)
-* deffn <2>:                             chapter.            (line 1021)
-* deffn <3>:                             chapter.            (line 1023)
-* deffn <4>:                             chapter.            (line 1844)
-* deffn <5>:                             chapter.            (line 1846)
+* deffn <2>:                             chapter.            (line 1020)
+* deffn <3>:                             chapter.            (line 1022)
+* deffn <4>:                             chapter.            (line 1842)
+* deffn <5>:                             chapter.            (line 1844)
 * deffnx:                                chapter.            (line  331)
 * deffnx <1>:                            chapter.            (line  336)
-* deffnx <2>:                            chapter.            (line 1019)
-* deffnx <3>:                            chapter.            (line 1024)
-* deffnx <4>:                            chapter.            (line 1841)
-* deffnx <5>:                            chapter.            (line 1847)
-* f---aa:                                chapter.            (line 2263)
+* deffnx <2>:                            chapter.            (line 1018)
+* deffnx <3>:                            chapter.            (line 1023)
+* deffnx <4>:                            chapter.            (line 1839)
+* deffnx <5>:                            chapter.            (line 1845)
+* f---aa:                                chapter.            (line 2261)
   f---aaa, See f---bbb.
-* f---bb, f---cc:                        chapter.            (line 2263)
+* f---bb, f---cc:                        chapter.            (line 2261)
   f---ddd:                               See also f---ccc.
   f---ddd:                               See also f---ccc.
-* f---ddd, f---eee, ffff:                chapter.            (line 2263)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2263)
+* f---ddd, f---eee, ffff:                chapter.            (line 2261)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2261)
 * followed:                              chapter.            (line  328)
 * followed <1>:                          chapter.            (line  662)
-* followed <2>:                          chapter.            (line 1016)
-* followed <3>:                          chapter.            (line 1350)
-* followed <4>:                          chapter.            (line 1838)
-* followed <5>:                          chapter.            (line 2213)
+* followed <2>:                          chapter.            (line 1015)
+* followed <3>:                          chapter.            (line 1349)
+* followed <4>:                          chapter.            (line 1836)
+* followed <5>:                          chapter.            (line 2211)
 * I:                                     chapter.            (line  316)
 * I <1>:                                 chapter.            (line  338)
-* I <2>:                                 chapter.            (line 1004)
-* I <3>:                                 chapter.            (line 1026)
-* I <4>:                                 chapter.            (line 1826)
-* I <5>:                                 chapter.            (line 1849)
+* I <2>:                                 chapter.            (line 1003)
+* I <3>:                                 chapter.            (line 1025)
+* I <4>:                                 chapter.            (line 1824)
+* I <5>:                                 chapter.            (line 1847)
 * id i ule:                              chapter.            (line  322)
-* id i ule <1>:                          chapter.            (line 1010)
-* id i ule <2>:                          chapter.            (line 1832)
+* id i ule <1>:                          chapter.            (line 1009)
+* id i ule <2>:                          chapter.            (line 1830)
 * id ule:                                chapter.            (line  321)
-* id ule <1>:                            chapter.            (line 1009)
-* id ule <2>:                            chapter.            (line 1831)
+* id ule <1>:                            chapter.            (line 1008)
+* id ule <2>:                            chapter.            (line 1829)
 * INVALID:                               chapter.            (line  666)
-* INVALID <1>:                           chapter.            (line 1354)
-* INVALID <2>:                           chapter.            (line 2217)
+* INVALID <1>:                           chapter.            (line 1353)
+* INVALID <2>:                           chapter.            (line 2215)
 * log trap:                              chapter.            (line  318)
-* log trap <1>:                          chapter.            (line 1006)
-* log trap <2>:                          chapter.            (line 1828)
+* log trap <1>:                          chapter.            (line 1005)
+* log trap <2>:                          chapter.            (line 1826)
 * log trap1:                             chapter.            (line  319)
-* log trap1 <1>:                         chapter.            (line 1007)
-* log trap1 <2>:                         chapter.            (line 1829)
+* log trap1 <1>:                         chapter.            (line 1006)
+* log trap1 <2>:                         chapter.            (line 1827)
 * log trap2:                             chapter.            (line  320)
-* log trap2 <1>:                         chapter.            (line 1008)
-* log trap2 <2>:                         chapter.            (line 1830)
+* log trap2 <1>:                         chapter.            (line 1007)
+* log trap2 <2>:                         chapter.            (line 1828)
 * machin:                                chapter.            (line  324)
 * machin <1>:                            chapter.            (line  326)
 * machin <2>:                            chapter.            (line  658)
 * machin <3>:                            chapter.            (line  659)
 * machin <4>:                            chapter.            (line  660)
 * machin <5>:                            chapter.            (line  661)
-* machin <6>:                            chapter.            (line 1012)
-* machin <7>:                            chapter.            (line 1014)
-* machin <8>:                            chapter.            (line 1346)
-* machin <9>:                            chapter.            (line 1347)
-* machin <10>:                           chapter.            (line 1348)
-* machin <11>:                           chapter.            (line 1349)
-* machin <12>:                           chapter.            (line 1834)
-* machin <13>:                           chapter.            (line 1836)
-* machin <14>:                           chapter.            (line 2209)
-* machin <15>:                           chapter.            (line 2210)
-* machin <16>:                           chapter.            (line 2211)
-* machin <17>:                           chapter.            (line 2212)
+* machin <6>:                            chapter.            (line 1011)
+* machin <7>:                            chapter.            (line 1013)
+* machin <8>:                            chapter.            (line 1345)
+* machin <9>:                            chapter.            (line 1346)
+* machin <10>:                           chapter.            (line 1347)
+* machin <11>:                           chapter.            (line 1348)
+* machin <12>:                           chapter.            (line 1832)
+* machin <13>:                           chapter.            (line 1834)
+* machin <14>:                           chapter.            (line 2207)
+* machin <15>:                           chapter.            (line 2208)
+* machin <16>:                           chapter.            (line 2209)
+* machin <17>:                           chapter.            (line 2210)
 * n--ame:                                chapter.            (line  345)
 * n--ame <1>:                            chapter.            (line  348)
-* n--ame <2>:                            chapter.            (line 1033)
-* n--ame <3>:                            chapter.            (line 1036)
-* n--ame <4>:                            chapter.            (line 1857)
-* n--ame <5>:                            chapter.            (line 1860)
+* n--ame <2>:                            chapter.            (line 1032)
+* n--ame <3>:                            chapter.            (line 1035)
+* n--ame <4>:                            chapter.            (line 1855)
+* n--ame <5>:                            chapter.            (line 1858)
 * name2:                                 chapter.            (line  423)
-* name2 <1>:                             chapter.            (line 1111)
-* name2 <2>:                             chapter.            (line 1936)
-* t--ruc:                                chapter.            (line 2263)
-* T--ruc:                                chapter.            (line 2263)
+* name2 <1>:                             chapter.            (line 1110)
+* name2 <2>:                             chapter.            (line 1934)
+* t--ruc:                                chapter.            (line 2261)
+* T--ruc:                                chapter.            (line 2261)
 * truc:                                  chapter.            (line  317)
 * truc <1>:                              chapter.            (line  339)
-* truc <2>:                              chapter.            (line 1005)
-* truc <3>:                              chapter.            (line 1027)
-* truc <4>:                              chapter.            (line 1827)
-* truc <5>:                              chapter.            (line 1850)
-* xxx, zzz:                              chapter.            (line 2263)
+* truc <2>:                              chapter.            (line 1004)
+* truc <3>:                              chapter.            (line 1026)
+* truc <4>:                              chapter.            (line 1825)
+* truc <5>:                              chapter.            (line 1848)
+* xxx, zzz:                              chapter.            (line 2261)
 
    vr
 
@@ -2579,8 +2577,8 @@ aaa
 * Menu:
 
 * d--eftp_name:                          chapter.            (line  384)
-* d--eftp_name <1>:                      chapter.            (line 1072)
-* d--eftp_name <2>:                      chapter.            (line 1896)
+* d--eftp_name <1>:                      chapter.            (line 1071)
+* d--eftp_name <2>:                      chapter.            (line 1894)
 
    (8)
 
@@ -2624,291 +2622,291 @@ chapter 2
 * Menu:
 
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  716)
-* -option <2>:                           chapter.            (line 1415)
-* ?:                                     chapter.            (line 2263)
-* .:                                     chapter.            (line 2263)
+* -option <1>:                           chapter.            (line  715)
+* -option <2>:                           chapter.            (line 1413)
+* ?:                                     chapter.            (line 2261)
+* .:                                     chapter.            (line 2261)
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  716)
-* " <2>:                                 chapter.            (line 1415)
-* a:                                     chapter.            (line 2263)
-* aaa, bbb:                              chapter.            (line 2263)
-* a--a:                                  chapter.            (line 2263)
+* " <1>:                                 chapter.            (line  715)
+* " <2>:                                 chapter.            (line 1413)
+* a:                                     chapter.            (line 2261)
+* aaa, bbb:                              chapter.            (line 2261)
+* a--a:                                  chapter.            (line 2261)
 * a--asis:                               chapter.            (line  519)
-* a--asis <1>:                           chapter.            (line 1207)
-* a--asis <2>:                           chapter.            (line 2037)
+* a--asis <1>:                           chapter.            (line 1206)
+* a--asis <2>:                           chapter.            (line 2035)
   aaa, See bbb.
 * b:                                     chapter.            (line  520)
-* b <1>:                                 chapter.            (line 1208)
-* b <2>:                                 chapter.            (line 2038)
-* b--b, c--c:                            chapter.            (line 2263)
-* counting entry:                        chapter.            (line 2605)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2263)
+* b <1>:                                 chapter.            (line 1207)
+* b <2>:                                 chapter.            (line 2036)
+* b--b, c--c:                            chapter.            (line 2261)
+* counting entry:                        chapter.            (line 2603)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2261)
 * d--efcv_name:                          chapter.            (line  366)
 * d--efcv_name <1>:                      chapter.            (line  369)
-* d--efcv_name <2>:                      chapter.            (line 1054)
-* d--efcv_name <3>:                      chapter.            (line 1057)
-* d--efcv_name <4>:                      chapter.            (line 1878)
-* d--efcv_name <5>:                      chapter.            (line 1881)
+* d--efcv_name <2>:                      chapter.            (line 1053)
+* d--efcv_name <3>:                      chapter.            (line 1056)
+* d--efcv_name <4>:                      chapter.            (line 1876)
+* d--efcv_name <5>:                      chapter.            (line 1879)
 * d--efivar_name of c--lass:             chapter.            (line  411)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1099)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1923)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1098)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1921)
 * d--efopt_name:                         chapter.            (line  402)
-* d--efopt_name <1>:                     chapter.            (line 1090)
-* d--efopt_name <2>:                     chapter.            (line 1914)
+* d--efopt_name <1>:                     chapter.            (line 1089)
+* d--efopt_name <2>:                     chapter.            (line 1912)
 * d--eftypecv_name of c--lass:           chapter.            (line  372)
 * d--eftypecv_name of c--lass <1>:       chapter.            (line  375)
-* d--eftypecv_name of c--lass <2>:       chapter.            (line 1060)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1063)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1884)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1887)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1059)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1062)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1882)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1885)
 * d--eftypecv_name2 of c--lass2:         chapter.            (line  443)
 * d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  446)
-* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1131)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1134)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1956)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1959)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1130)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1133)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1954)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1957)
 * d--eftypeivar_name of c--lass:         chapter.            (line  414)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1102)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1926)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1101)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1924)
 * d--eftypevar_name:                     chapter.            (line  408)
-* d--eftypevar_name <1>:                 chapter.            (line 1096)
-* d--eftypevar_name <2>:                 chapter.            (line 1920)
+* d--eftypevar_name <1>:                 chapter.            (line 1095)
+* d--eftypevar_name <2>:                 chapter.            (line 1918)
 * d--eftypevr_name:                      chapter.            (line  363)
-* d--eftypevr_name <1>:                  chapter.            (line 1051)
-* d--eftypevr_name <2>:                  chapter.            (line 1875)
+* d--eftypevr_name <1>:                  chapter.            (line 1050)
+* d--eftypevr_name <2>:                  chapter.            (line 1873)
 * d--efvar_name:                         chapter.            (line  396)
 * d--efvar_name <1>:                     chapter.            (line  399)
-* d--efvar_name <2>:                     chapter.            (line 1084)
-* d--efvar_name <3>:                     chapter.            (line 1087)
-* d--efvar_name <4>:                     chapter.            (line 1908)
-* d--efvar_name <5>:                     chapter.            (line 1911)
+* d--efvar_name <2>:                     chapter.            (line 1083)
+* d--efvar_name <3>:                     chapter.            (line 1086)
+* d--efvar_name <4>:                     chapter.            (line 1906)
+* d--efvar_name <5>:                     chapter.            (line 1909)
 * d--efvr_name:                          chapter.            (line  342)
-* d--efvr_name <1>:                      chapter.            (line 1030)
-* d--efvr_name <2>:                      chapter.            (line 1854)
+* d--efvr_name <1>:                      chapter.            (line 1029)
+* d--efvr_name <2>:                      chapter.            (line 1852)
   ddd:                                   See also ccc.
   ddd:                                   See also ccc.
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2263)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2261)
 * index entry between item and itemx:    chapter.            (line  524)
 * index entry between item and itemx <1>: chapter.           (line  654)
-* index entry between item and itemx <2>: chapter.           (line 1212)
-* index entry between item and itemx <3>: chapter.           (line 1342)
-* index entry between item and itemx <4>: chapter.           (line 2042)
-* index entry between item and itemx <5>: chapter.           (line 2205)
-* index entry in footnote:               chapter.            (line 2600)
+* index entry between item and itemx <2>: chapter.           (line 1211)
+* index entry between item and itemx <3>: chapter.           (line 1341)
+* index entry between item and itemx <4>: chapter.           (line 2040)
+* index entry between item and itemx <5>: chapter.           (line 2203)
+* index entry in footnote:               chapter.            (line 2598)
 * index entry within deffn:              chapter.            (line  317)
-* index entry within deffn <1>:          chapter.            (line 1005)
-* index entry within deffn <2>:          chapter.            (line 1827)
+* index entry within deffn <1>:          chapter.            (line 1004)
+* index entry within deffn <2>:          chapter.            (line 1825)
 * index entry within itemize:            chapter.            (line  228)
-* index entry within itemize <1>:        chapter.            (line  916)
-* index entry within itemize <2>:        chapter.            (line 1738)
+* index entry within itemize <1>:        chapter.            (line  915)
+* index entry within itemize <2>:        chapter.            (line 1736)
 * index entry within multitable:         chapter.            (line  250)
-* index entry within multitable <1>:     chapter.            (line  938)
-* index entry within multitable <2>:     chapter.            (line 1761)
-* t-ruc:                                 chapter.            (line 2263)
-* T-ruc:                                 chapter.            (line 2263)
+* index entry within multitable <1>:     chapter.            (line  937)
+* index entry within multitable <2>:     chapter.            (line 1759)
+* t-ruc:                                 chapter.            (line 2261)
+* T-ruc:                                 chapter.            (line 2261)
 * vtable i--tem code kbdinputstyle:      chapter.            (line  152)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  840)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1661)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  839)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1659)
 * vtable i--tem default kbdinputstyle:   chapter.            (line  147)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  835)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1656)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  834)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1654)
 * vtable i--tem distinct kbdinputstyle:  chapter.            (line  162)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  850)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1671)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  849)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1669)
 * vtable i--tem example kbdinputstyle:   chapter.            (line  157)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  845)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1666)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  844)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1664)
 * vtable i--tem in example code kbdinputstyle: chapter.      (line  154)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  842)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1663)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  841)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1661)
 * vtable i--tem in example default kbdinputstyle: chapter.   (line  149)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  837)
+                                                             (line  836)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1658)
+                                                             (line 1656)
 * vtable i--tem in example distinct kbdinputstyle: chapter.  (line  164)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  852)
+                                                             (line  851)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1673)
+                                                             (line 1671)
 * vtable i--tem in example example kbdinputstyle: chapter.   (line  159)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  847)
+                                                             (line  846)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1668)
+                                                             (line 1666)
 
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  716)
-* --foption <2>:                         chapter.            (line 1415)
-* ?:                                     chapter.            (line 2263)
-* .:                                     chapter.            (line 2263)
+* --foption <1>:                         chapter.            (line  715)
+* --foption <2>:                         chapter.            (line 1413)
+* ?:                                     chapter.            (line 2261)
+* .:                                     chapter.            (line 2261)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  716)
-* `` <2>:                                chapter.            (line 1415)
+* `` <1>:                                chapter.            (line  715)
+* `` <2>:                                chapter.            (line 1413)
 * a:                                     chapter.            (line  330)
 * a <1>:                                 chapter.            (line  523)
 * a <2>:                                 chapter.            (line  653)
-* a <3>:                                 chapter.            (line 1018)
-* a <4>:                                 chapter.            (line 1211)
-* a <5>:                                 chapter.            (line 1341)
-* a <6>:                                 chapter.            (line 1840)
-* a <7>:                                 chapter.            (line 2041)
-* a <8>:                                 chapter.            (line 2204)
-* a <9>:                                 chapter.            (line 2263)
+* a <3>:                                 chapter.            (line 1017)
+* a <4>:                                 chapter.            (line 1210)
+* a <5>:                                 chapter.            (line 1340)
+* a <6>:                                 chapter.            (line 1838)
+* a <7>:                                 chapter.            (line 2039)
+* a <8>:                                 chapter.            (line 2202)
+* a <9>:                                 chapter.            (line 2261)
 * after:                                 chapter.            (line  664)
-* after <1>:                             chapter.            (line 1352)
-* after <2>:                             chapter.            (line 2215)
+* after <1>:                             chapter.            (line 1351)
+* after <2>:                             chapter.            (line 2213)
 * arg2:                                  chapter.            (line  449)
-* arg2 <1>:                              chapter.            (line 1137)
-* arg2 <2>:                              chapter.            (line 1963)
+* arg2 <1>:                              chapter.            (line 1136)
+* arg2 <2>:                              chapter.            (line 1961)
 * b:                                     chapter.            (line  524)
 * b <1>:                                 chapter.            (line  654)
-* b <2>:                                 chapter.            (line 1212)
-* b <3>:                                 chapter.            (line 1342)
-* b <4>:                                 chapter.            (line 2042)
-* b <5>:                                 chapter.            (line 2205)
+* b <2>:                                 chapter.            (line 1211)
+* b <3>:                                 chapter.            (line 1341)
+* b <4>:                                 chapter.            (line 2040)
+* b <5>:                                 chapter.            (line 2203)
 * bidule machin:                         chapter.            (line  325)
-* bidule machin <1>:                     chapter.            (line 1013)
-* bidule machin <2>:                     chapter.            (line 1835)
+* bidule machin <1>:                     chapter.            (line 1012)
+* bidule machin <2>:                     chapter.            (line 1833)
 * d--effn_name:                          chapter.            (line  309)
-* d--effn_name <1>:                      chapter.            (line  997)
-* d--effn_name <2>:                      chapter.            (line 1819)
+* d--effn_name <1>:                      chapter.            (line  996)
+* d--effn_name <2>:                      chapter.            (line 1817)
 * d--efmac_name:                         chapter.            (line  390)
-* d--efmac_name <1>:                     chapter.            (line 1078)
-* d--efmac_name <2>:                     chapter.            (line 1902)
+* d--efmac_name <1>:                     chapter.            (line 1077)
+* d--efmac_name <2>:                     chapter.            (line 1900)
 * d--efmethod_name on c--lass:           chapter.            (line  417)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1105)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1929)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1104)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1927)
 * d--efop_name on c--lass:               chapter.            (line  378)
 * d--efop_name on c--lass <1>:           chapter.            (line  381)
-* d--efop_name on c--lass <2>:           chapter.            (line 1066)
-* d--efop_name on c--lass <3>:           chapter.            (line 1069)
-* d--efop_name on c--lass <4>:           chapter.            (line 1890)
-* d--efop_name on c--lass <5>:           chapter.            (line 1893)
+* d--efop_name on c--lass <2>:           chapter.            (line 1065)
+* d--efop_name on c--lass <3>:           chapter.            (line 1068)
+* d--efop_name on c--lass <4>:           chapter.            (line 1888)
+* d--efop_name on c--lass <5>:           chapter.            (line 1891)
 * d--efspec_name:                        chapter.            (line  393)
-* d--efspec_name <1>:                    chapter.            (line 1081)
-* d--efspec_name <2>:                    chapter.            (line 1905)
+* d--efspec_name <1>:                    chapter.            (line 1080)
+* d--efspec_name <2>:                    chapter.            (line 1903)
 * d--eftypefn_name:                      chapter.            (line  351)
 * d--eftypefn_name <1>:                  chapter.            (line  354)
-* d--eftypefn_name <2>:                  chapter.            (line 1039)
-* d--eftypefn_name <3>:                  chapter.            (line 1042)
-* d--eftypefn_name <4>:                  chapter.            (line 1863)
-* d--eftypefn_name <5>:                  chapter.            (line 1866)
+* d--eftypefn_name <2>:                  chapter.            (line 1038)
+* d--eftypefn_name <3>:                  chapter.            (line 1041)
+* d--eftypefn_name <4>:                  chapter.            (line 1861)
+* d--eftypefn_name <5>:                  chapter.            (line 1864)
 * d--eftypefn_name2:                     chapter.            (line  428)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1116)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1941)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1115)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1939)
 * d--eftypefun_name:                     chapter.            (line  405)
-* d--eftypefun_name <1>:                 chapter.            (line 1093)
-* d--eftypefun_name <2>:                 chapter.            (line 1917)
+* d--eftypefun_name <1>:                 chapter.            (line 1092)
+* d--eftypefun_name <2>:                 chapter.            (line 1915)
 * d--eftypemethod_name on c--lass:       chapter.            (line  420)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1108)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1932)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1107)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1930)
 * d--eftypeop_name on c--lass:           chapter.            (line  357)
 * d--eftypeop_name on c--lass <1>:       chapter.            (line  360)
-* d--eftypeop_name on c--lass <2>:       chapter.            (line 1045)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1048)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1869)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1872)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1044)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1047)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1867)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1870)
 * d--eftypeop_name2 on c--lass2:         chapter.            (line  433)
 * d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  438)
-* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1121)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1126)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1946)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1951)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1120)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1125)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1944)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1949)
 * d--efun_name:                          chapter.            (line  387)
-* d--efun_name <1>:                      chapter.            (line 1075)
-* d--efun_name <2>:                      chapter.            (line 1899)
+* d--efun_name <1>:                      chapter.            (line 1074)
+* d--efun_name <2>:                      chapter.            (line 1897)
 * de--ffn_name:                          chapter.            (line  312)
-* de--ffn_name <1>:                      chapter.            (line 1000)
-* de--ffn_name <2>:                      chapter.            (line 1822)
+* de--ffn_name <1>:                      chapter.            (line  999)
+* de--ffn_name <2>:                      chapter.            (line 1820)
 * deffn:                                 chapter.            (line  333)
 * deffn <1>:                             chapter.            (line  335)
-* deffn <2>:                             chapter.            (line 1021)
-* deffn <3>:                             chapter.            (line 1023)
-* deffn <4>:                             chapter.            (line 1844)
-* deffn <5>:                             chapter.            (line 1846)
+* deffn <2>:                             chapter.            (line 1020)
+* deffn <3>:                             chapter.            (line 1022)
+* deffn <4>:                             chapter.            (line 1842)
+* deffn <5>:                             chapter.            (line 1844)
 * deffnx:                                chapter.            (line  331)
 * deffnx <1>:                            chapter.            (line  336)
-* deffnx <2>:                            chapter.            (line 1019)
-* deffnx <3>:                            chapter.            (line 1024)
-* deffnx <4>:                            chapter.            (line 1841)
-* deffnx <5>:                            chapter.            (line 1847)
-* f---aa:                                chapter.            (line 2263)
+* deffnx <2>:                            chapter.            (line 1018)
+* deffnx <3>:                            chapter.            (line 1023)
+* deffnx <4>:                            chapter.            (line 1839)
+* deffnx <5>:                            chapter.            (line 1845)
+* f---aa:                                chapter.            (line 2261)
   f---aaa, See f---bbb.
-* f---bb, f---cc:                        chapter.            (line 2263)
+* f---bb, f---cc:                        chapter.            (line 2261)
   f---ddd:                               See also f---ccc.
   f---ddd:                               See also f---ccc.
-* f---ddd, f---eee, ffff:                chapter.            (line 2263)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2263)
+* f---ddd, f---eee, ffff:                chapter.            (line 2261)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2261)
 * followed:                              chapter.            (line  328)
 * followed <1>:                          chapter.            (line  662)
-* followed <2>:                          chapter.            (line 1016)
-* followed <3>:                          chapter.            (line 1350)
-* followed <4>:                          chapter.            (line 1838)
-* followed <5>:                          chapter.            (line 2213)
+* followed <2>:                          chapter.            (line 1015)
+* followed <3>:                          chapter.            (line 1349)
+* followed <4>:                          chapter.            (line 1836)
+* followed <5>:                          chapter.            (line 2211)
 * I:                                     chapter.            (line  316)
 * I <1>:                                 chapter.            (line  338)
-* I <2>:                                 chapter.            (line 1004)
-* I <3>:                                 chapter.            (line 1026)
-* I <4>:                                 chapter.            (line 1826)
-* I <5>:                                 chapter.            (line 1849)
+* I <2>:                                 chapter.            (line 1003)
+* I <3>:                                 chapter.            (line 1025)
+* I <4>:                                 chapter.            (line 1824)
+* I <5>:                                 chapter.            (line 1847)
 * id i ule:                              chapter.            (line  322)
-* id i ule <1>:                          chapter.            (line 1010)
-* id i ule <2>:                          chapter.            (line 1832)
+* id i ule <1>:                          chapter.            (line 1009)
+* id i ule <2>:                          chapter.            (line 1830)
 * id ule:                                chapter.            (line  321)
-* id ule <1>:                            chapter.            (line 1009)
-* id ule <2>:                            chapter.            (line 1831)
+* id ule <1>:                            chapter.            (line 1008)
+* id ule <2>:                            chapter.            (line 1829)
 * INVALID:                               chapter.            (line  666)
-* INVALID <1>:                           chapter.            (line 1354)
-* INVALID <2>:                           chapter.            (line 2217)
+* INVALID <1>:                           chapter.            (line 1353)
+* INVALID <2>:                           chapter.            (line 2215)
 * log trap:                              chapter.            (line  318)
-* log trap <1>:                          chapter.            (line 1006)
-* log trap <2>:                          chapter.            (line 1828)
+* log trap <1>:                          chapter.            (line 1005)
+* log trap <2>:                          chapter.            (line 1826)
 * log trap1:                             chapter.            (line  319)
-* log trap1 <1>:                         chapter.            (line 1007)
-* log trap1 <2>:                         chapter.            (line 1829)
+* log trap1 <1>:                         chapter.            (line 1006)
+* log trap1 <2>:                         chapter.            (line 1827)
 * log trap2:                             chapter.            (line  320)
-* log trap2 <1>:                         chapter.            (line 1008)
-* log trap2 <2>:                         chapter.            (line 1830)
+* log trap2 <1>:                         chapter.            (line 1007)
+* log trap2 <2>:                         chapter.            (line 1828)
 * machin:                                chapter.            (line  324)
 * machin <1>:                            chapter.            (line  326)
 * machin <2>:                            chapter.            (line  658)
 * machin <3>:                            chapter.            (line  659)
 * machin <4>:                            chapter.            (line  660)
 * machin <5>:                            chapter.            (line  661)
-* machin <6>:                            chapter.            (line 1012)
-* machin <7>:                            chapter.            (line 1014)
-* machin <8>:                            chapter.            (line 1346)
-* machin <9>:                            chapter.            (line 1347)
-* machin <10>:                           chapter.            (line 1348)
-* machin <11>:                           chapter.            (line 1349)
-* machin <12>:                           chapter.            (line 1834)
-* machin <13>:                           chapter.            (line 1836)
-* machin <14>:                           chapter.            (line 2209)
-* machin <15>:                           chapter.            (line 2210)
-* machin <16>:                           chapter.            (line 2211)
-* machin <17>:                           chapter.            (line 2212)
+* machin <6>:                            chapter.            (line 1011)
+* machin <7>:                            chapter.            (line 1013)
+* machin <8>:                            chapter.            (line 1345)
+* machin <9>:                            chapter.            (line 1346)
+* machin <10>:                           chapter.            (line 1347)
+* machin <11>:                           chapter.            (line 1348)
+* machin <12>:                           chapter.            (line 1832)
+* machin <13>:                           chapter.            (line 1834)
+* machin <14>:                           chapter.            (line 2207)
+* machin <15>:                           chapter.            (line 2208)
+* machin <16>:                           chapter.            (line 2209)
+* machin <17>:                           chapter.            (line 2210)
 * n--ame:                                chapter.            (line  345)
 * n--ame <1>:                            chapter.            (line  348)
-* n--ame <2>:                            chapter.            (line 1033)
-* n--ame <3>:                            chapter.            (line 1036)
-* n--ame <4>:                            chapter.            (line 1857)
-* n--ame <5>:                            chapter.            (line 1860)
+* n--ame <2>:                            chapter.            (line 1032)
+* n--ame <3>:                            chapter.            (line 1035)
+* n--ame <4>:                            chapter.            (line 1855)
+* n--ame <5>:                            chapter.            (line 1858)
 * name2:                                 chapter.            (line  423)
-* name2 <1>:                             chapter.            (line 1111)
-* name2 <2>:                             chapter.            (line 1936)
-* t--ruc:                                chapter.            (line 2263)
-* T--ruc:                                chapter.            (line 2263)
+* name2 <1>:                             chapter.            (line 1110)
+* name2 <2>:                             chapter.            (line 1934)
+* t--ruc:                                chapter.            (line 2261)
+* T--ruc:                                chapter.            (line 2261)
 * truc:                                  chapter.            (line  317)
 * truc <1>:                              chapter.            (line  339)
-* truc <2>:                              chapter.            (line 1005)
-* truc <3>:                              chapter.            (line 1027)
-* truc <4>:                              chapter.            (line 1827)
-* truc <5>:                              chapter.            (line 1850)
-* xxx, zzz:                              chapter.            (line 2263)
+* truc <2>:                              chapter.            (line 1004)
+* truc <3>:                              chapter.            (line 1026)
+* truc <4>:                              chapter.            (line 1825)
+* truc <5>:                              chapter.            (line 1848)
+* xxx, zzz:                              chapter.            (line 2261)
 
 Top section
 1 chapter



reply via email to

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