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:23 -0400 (EDT)

branch: master
commit ae489a932f4c8da3d4d4c828cf0ec1e71f8030d9
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Jul 6 12:48:43 2024 +0200

    * tp/Texinfo/Convert/Plaintext.pm (format_ref): use see and See
    instead of *note and *Note.
---
 ChangeLog                                          |    5 +
 tp/Texinfo/Convert/Plaintext.pm                    |    4 +-
 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       |   63 +-
 tp/t/results/converters_tests/ref_in_sectioning.pl |  104 +-
 tp/t/results/converters_tests/refs_formatting.pl   |   71 +-
 .../some_at_commands_in_ref_nodes.pl               |    6 +-
 .../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        |   58 +-
 .../coverage_braces/contain_plain_text_nestings.pl |    2 +-
 .../coverage_braces/inforef_too_much_args.pl       |    2 +-
 tp/t/results/coverage_braces/nested_args.pl        |    2 +-
 .../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/coverage_braces/uref_in_ref.pl        |    5 +-
 tp/t/results/coverage_braces/verb_in_xref.pl       |    2 +-
 tp/t/results/def/ref_in_def.pl                     |    8 +-
 tp/t/results/float/complex_float.pl                |    9 +-
 tp/t/results/float/float_copying.pl                |    6 +-
 .../float/numbering_captions_listoffloats.pl       |   14 +-
 tp/t/results/float/ref_to_float.pl                 |    4 +-
 .../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          |    6 +-
 .../res_plaintext/Copying-and-indices.txt          |    6 +-
 .../res_plaintext/Copying-and-indices.txt          |    6 +-
 .../res_plaintext/Copying-and-indices.txt          |    6 +-
 .../res_plaintext/Copying-and-indices.txt          |    6 +-
 .../res_plaintext/Chapter.txt                      |    2 +-
 .../res_plaintext/Copying-and-indices.txt          |    8 +-
 .../res_plaintext/Chapter.txt                      |    2 +-
 .../res_plaintext/Copying-and-indices.txt          |    8 +-
 .../res_plaintext/Copying-and-indices.txt          |    6 +-
 tp/t/results/languages/unknown_language.pl         |    4 +-
 .../menu/commands_in_nodedescriptionblock.pl       |   12 +-
 tp/t/results/misc_commands/ref_in_center.pl        |    4 +-
 tp/t/results/multitable/ref_in_multitable.pl       |   10 +-
 .../at_commands_glued_in_example.pl                |    2 +-
 .../at_commands_glued_in_paragraph.pl              |    2 +-
 .../plaintext_tests/del_quote_linebreaking.pl      |   16 +-
 .../res_plaintext/quote_node_names.txt             |   29 +-
 .../plaintext_tests/xref_quote_long_item.pl        |    2 +-
 ...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 | 1358 ++++++++++----------
 .../formatting.txt                                 | 1358 ++++++++++----------
 57 files changed, 1661 insertions(+), 1689 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5cc7b9b384..cbbd9fb488 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-07-06  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/Plaintext.pm (format_ref): use see and See
+       instead of *note and *Note.
+
 2024-07-06  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/Plaintext.pm (format_ref): simplify output of
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 740457536d..69b38edc36 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -2018,10 +2018,10 @@ sub format_ref($$$$)
 
   if ($cmdname eq 'xref') {
     _convert($self, {'type' => '_stop_upper_case',
-                     'contents' => [{'text' => '*Note '}]});
+                     'contents' => [{'text' => 'See '}]});
   } else {
     _convert($self, {'type' => '_stop_upper_case',
-                     'contents' => [{'text' => '*note '}]});
+                     'contents' => [{'text' => 'see '}]});
   }
   my $name;
   if (defined($args[1])) {
diff --git a/tp/t/no_structure_test.t b/tp/t/no_structure_test.t
index c22ac92e55..91dd9636c1 100644
--- a/tp/t/no_structure_test.t
+++ b/tp/t/no_structure_test.t
@@ -162,7 +162,7 @@ Chap
 Results
 *******
 
-*Note 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 bfe8e61fa8..1c5dbd36f8 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’.
 
-   *Note anchor in html::.
+   See anchor in html::.
 
-   *note anchor in tex::.
+   see 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 55a14d3618..0d565ce8f8 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] *note chap:: *Note (f)node:: *note NAME: (argf)ext inverb ÿ
-MA+TH (1) <la> B (a) LB c E <a@c> AB (D)
+A Ñ Å TeX [myimage] see chap:: See (f)node:: see 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 a7c9c6259a..039f7e143a 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] *note chap:: *Note (f)node:: *note NAME: (argf)ext inverb ÿ
-MA+TH (1) <la> B (a) LB c E <a@c> AB (D)
+A Ñ Å TeX [myimage] see chap:: See (f)node:: see 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 2a1b2dc25f..b6a70a2e75 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(*) (*note chap-Footnote-1::).
+Para(*) (see chap-Footnote-1::).
 
-   Para2(*) (*note 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 c8ae8c8c8b..97000ae6a0 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’
 
-   *Note 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 63597ef66b..cc0ccaf07d 100644
--- a/tp/t/results/converters_tests/ref_error_formatting.pl
+++ b/tp/t/results/converters_tests/ref_error_formatting.pl
@@ -2937,41 +2937,40 @@ $result_floats{'ref_error_formatting'} = {};
 
 
 
-$result_converted{'plaintext'}->{'ref_error_formatting'} = '‘@ref{node}’ *note 
node::
+$result_converted{'plaintext'}->{'ref_error_formatting'} = '‘@ref{node}’ see 
node::
 
-   ‘@ref{,cross ref name}’ *note cross ref name: ‘@ref{,,title}’ *note
-title: ‘@ref{,,,file name}’ *note (file name):: ‘@ref{,,,,manual}’ *note
-():: ‘@ref{node,cross ref name}’ *note cross ref name: node
-‘@ref{node,,title}’ *note title: node ‘@ref{node,,,file name}’ *note
-(file name)node:: ‘@ref{node,,,,manual}’ *note ()node:: ‘@ref{node,cross
-ref name,title,}’ *note cross ref name: node ‘@ref{node,cross ref
-name,,file name}’ *note cross ref name: (file name)node ‘@ref{node,cross
-ref name,,,manual}’ *note cross ref name: ()node ‘@ref{node,cross ref
-name,title,file name}’ *note cross ref name: (file name)node
-‘@ref{node,cross ref name,title,,manual}’ *note cross ref name: ()node
-‘@ref{node,cross ref name,title, file name, manual}’ *note cross ref
-name: (file name)node ‘@ref{node,,title,file name}’ *note title: (file
-name)node ‘@ref{node,,title,,manual}’ *note title: ()node
-‘@ref{node,,title, file name, manual}’ *note title: (file name)node
-‘@ref{node,,,file name,manual}’ *note (file name)node:: ‘@ref{,cross ref
-name,title,}’ *note cross ref name: ‘@ref{,cross ref name,,file name}’
-*note cross ref name: (file name) ‘@ref{,cross ref name,,,manual}’ *note
-cross ref name: () ‘@ref{,cross ref name,title,file name}’ *note cross
-ref name: (file name) ‘@ref{,cross ref name,title,,manual}’ *note cross
-ref name: () ‘@ref{,cross ref name,title, file name, manual}’ *note
-cross ref name: (file name) ‘@ref{,,title,file name}’ *note title: (file
-name) ‘@ref{,,title,,manual}’ *note title: () ‘@ref{,,title, file name,
-manual}’ *note title: (file name) ‘@ref{,,,file name,manual}’ *note
-(file name)::
+   ‘@ref{,cross ref name}’ see cross ref name: ‘@ref{,,title}’ see
+title: ‘@ref{,,,file name}’ see (file name):: ‘@ref{,,,,manual}’ see
+():: ‘@ref{node,cross ref name}’ see cross ref name: node
+‘@ref{node,,title}’ see title: node ‘@ref{node,,,file name}’ see (file
+name)node:: ‘@ref{node,,,,manual}’ see ()node:: ‘@ref{node,cross ref
+name,title,}’ see cross ref name: node ‘@ref{node,cross ref name,,file
+name}’ see cross ref name: (file name)node ‘@ref{node,cross ref
+name,,,manual}’ see cross ref name: ()node ‘@ref{node,cross ref
+name,title,file name}’ see cross ref name: (file name)node
+‘@ref{node,cross ref name,title,,manual}’ see cross ref name: ()node
+‘@ref{node,cross ref name,title, file name, manual}’ see cross ref name:
+(file name)node ‘@ref{node,,title,file name}’ see title: (file name)node
+‘@ref{node,,title,,manual}’ see title: ()node ‘@ref{node,,title, file
+name, manual}’ see title: (file name)node ‘@ref{node,,,file
+name,manual}’ see (file name)node:: ‘@ref{,cross ref name,title,}’ see
+cross ref name: ‘@ref{,cross ref name,,file name}’ see cross ref name:
+(file name) ‘@ref{,cross ref name,,,manual}’ see cross ref name: ()
+‘@ref{,cross ref name,title,file name}’ see cross ref name: (file name)
+‘@ref{,cross ref name,title,,manual}’ see cross ref name: ()
+‘@ref{,cross ref name,title, file name, manual}’ see cross ref name:
+(file name) ‘@ref{,,title,file name}’ see title: (file name)
+‘@ref{,,title,,manual}’ see title: () ‘@ref{,,title, file name, manual}’
+see title: (file name) ‘@ref{,,,file name,manual}’ see (file name)::
 
-   ‘@inforef{,cross ref name }’ *note cross ref name: ‘@inforef{,,file
-name}’ *note (file name):: ‘@inforef{,cross ref name, file name}’ *note
-cross ref name: (file name) ‘@inforef{}’ *note ::
+   ‘@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 ::
 
-   ‘@inforef{node, cross ref name, file name}’ *note cross ref name:
-(file name)node ‘@inforef{node}’ *note node:: ‘@inforef{node, cross ref
-name}’ *note cross ref name: node ‘@inforef{node,,file name}’ *note
-(file name)node::
+   ‘@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::
 ';
 
 
diff --git a/tp/t/results/converters_tests/ref_in_sectioning.pl 
b/tp/t/results/converters_tests/ref_in_sectioning.pl
index 8bcb939cd5..b73657458e 100644
--- a/tp/t/results/converters_tests/ref_in_sectioning.pl
+++ b/tp/t/results/converters_tests/ref_in_sectioning.pl
@@ -2164,70 +2164,70 @@ $result_floats{'ref_in_sectioning'} = {};
 
 
 
-$result_converted{'plaintext'}->{'ref_in_sectioning'} = 'for example *note 
node:: (*note node::) (*note (file)Top::)
-1 *Note title: (file name)node.
-2 *note node:: just node
-  2.1 for example *note node:: (*note node::) (*note (file)Top::)
-  2.2 *note cross ref name: node node, crossref arg2
-  2.3 *note ‘title’: node code node, samptitle arg3
-  2.4 *note (file name)node:: code node, file name
-  2.5 *note ()node:: node and manual
-  2.6 *note ()Top:: Top and manual
-  2.7 *note ():: no node just manual
-  2.8 *note (file name):: no node just file name
-  2.9 *note b: (c)a inforef a b c
-  2.10 (*note (file name)Top::) pxref Top file name, spaces
-  2.11 (*note (file name)::) pxref file name only, spaces
-  2.12 *Note (filename)Top::, xref Top filename only, no spaces
-  2.13 *Note (filename)::. xref filename only, no spaces
-
-for example *note node:: (*note node::) (*note (file)Top::)
-***********************************************************
-
-1 *Note title: (file name)node.
-*******************************
-
-2 *note node:: just node
-************************
-
-2.1 for example *note node:: (*note node::) (*note (file)Top::)
-===============================================================
-
-2.2 *note cross ref name: node node, crossref arg2
-==================================================
-
-2.3 *note ‘title’: node code node, samptitle arg3
-=================================================
-
-2.4 *note (file name)node:: code node, file name
+$result_converted{'plaintext'}->{'ref_in_sectioning'} = 'for example see 
node:: (see node::) (see (file)Top::)
+1 See title: (file name)node.
+2 see node:: just node
+  2.1 for example see node:: (see node::) (see (file)Top::)
+  2.2 see cross ref name: node node, crossref arg2
+  2.3 see ‘title’: node code node, samptitle arg3
+  2.4 see (file name)node:: code node, file name
+  2.5 see ()node:: node and manual
+  2.6 see ()Top:: Top and manual
+  2.7 see ():: no node just manual
+  2.8 see (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
+
+for example see node:: (see node::) (see (file)Top::)
+*****************************************************
+
+1 See title: (file name)node.
+*****************************
+
+2 see node:: just node
+**********************
+
+2.1 for example see node:: (see node::) (see (file)Top::)
+=========================================================
+
+2.2 see cross ref name: node node, crossref arg2
 ================================================
 
-2.5 *note ()node:: node and manual
-==================================
+2.3 see ‘title’: node code node, samptitle arg3
+===============================================
+
+2.4 see (file name)node:: code node, file name
+==============================================
 
-2.6 *note ()Top:: Top and manual
+2.5 see ()node:: node and manual
 ================================
 
-2.7 *note ():: no node just manual
-==================================
+2.6 see ()Top:: Top and manual
+==============================
 
-2.8 *note (file name):: no node just file name
-==============================================
+2.7 see ():: no node just manual
+================================
 
-2.9 *note b: (c)a inforef a b c
-===============================
+2.8 see (file name):: no node just file name
+============================================
 
-2.10 (*note (file name)Top::) pxref Top file name, spaces
-=========================================================
+2.9 see b: (c)a inforef a b c
+=============================
 
-2.11 (*note (file name)::) pxref file name only, spaces
+2.10 (see (file name)Top::) pxref Top file name, spaces
 =======================================================
 
-2.12 *Note (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 *Note (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 b90baca4eb..f9e63f806f 100644
--- a/tp/t/results/converters_tests/refs_formatting.pl
+++ b/tp/t/results/converters_tests/refs_formatting.pl
@@ -3030,44 +3030,43 @@ $result_floats{'refs_formatting'} = {};
 $result_converted{'plaintext'}->{'refs_formatting'} = '1 chapter
 *********
 
-‘@ref{chapter,cross ref name}’ *note cross ref name: chapter
-‘@ref{chapter,,title}’ *note title: chapter ‘@ref{chapter,,,file name}’
-*note (file name)chapter:: ‘@ref{chapter,,,,manual}’ *note ()chapter::
-‘@ref{chapter,cross ref name,title,}’ *note cross ref name: chapter
-‘@ref{chapter,cross ref name,,file name}’ *note cross ref name: (file
-name)chapter ‘@ref{chapter,cross ref name,,,manual}’ *note cross ref
-name: ()chapter ‘@ref{chapter,cross ref name,title,file name}’ *note
-cross ref name: (file name)chapter ‘@ref{chapter,cross ref
-name,title,,manual}’ *note cross ref name: ()chapter ‘@ref{chapter,cross
-ref name,title, file name, manual}’ *note cross ref name: (file
-name)chapter ‘@ref{chapter,,title,file name}’ *note title: (file
-name)chapter ‘@ref{chapter,,title,,manual}’ *note title: ()chapter
-‘@ref{chapter,,title, file name, manual}’ *note title: (file
-name)chapter ‘@ref{chapter,,,file name,manual}’ *note (file
-name)chapter::
+‘@ref{chapter,cross ref name}’ see cross ref name: chapter
+‘@ref{chapter,,title}’ see title: chapter ‘@ref{chapter,,,file name}’
+see (file name)chapter:: ‘@ref{chapter,,,,manual}’ see ()chapter::
+‘@ref{chapter,cross ref name,title,}’ see cross ref name: chapter
+‘@ref{chapter,cross ref name,,file name}’ see cross ref name: (file
+name)chapter ‘@ref{chapter,cross ref name,,,manual}’ see cross ref name:
+()chapter ‘@ref{chapter,cross ref name,title,file name}’ see cross ref
+name: (file name)chapter ‘@ref{chapter,cross ref name,title,,manual}’
+see cross ref name: ()chapter ‘@ref{chapter,cross ref name,title, file
+name, manual}’ see cross ref name: (file name)chapter
+‘@ref{chapter,,title,file name}’ see title: (file name)chapter
+‘@ref{chapter,,title,,manual}’ see title: ()chapter
+‘@ref{chapter,,title, file name, manual}’ see title: (file name)chapter
+‘@ref{chapter,,,file name,manual}’ see (file name)chapter::
 
-   ‘@ref{(pman)anode,cross ref name}’ *note cross ref name: (pman)anode
-‘@ref{(pman)anode,,title}’ *note title: (pman)anode
-‘@ref{(pman)anode,,,file name}’ *note (file name)(pman)anode::
-‘@ref{(pman)anode,,,,manual}’ *note ()(pman)anode::
-‘@ref{(pman)anode,cross ref name,title,}’ *note cross ref name:
-(pman)anode ‘@ref{(pman)anode,cross ref name,,file name}’ *note cross
-ref name: (file name)(pman)anode ‘@ref{(pman)anode,cross ref
-name,,,manual}’ *note cross ref name: ()(pman)anode
-‘@ref{(pman)anode,cross ref name,title,file name}’ *note cross ref name:
-(file name)(pman)anode ‘@ref{(pman)anode,cross ref name,title,,manual}’
-*note cross ref name: ()(pman)anode ‘@ref{(pman)anode,cross ref
-name,title, file name, manual}’ *note cross ref name: (file
-name)(pman)anode ‘@ref{(pman)anode,,title,file name}’ *note title: (file
-name)(pman)anode ‘@ref{(pman)anode,,title,,manual}’ *note title:
-()(pman)anode ‘@ref{(pman)anode,,title, file name, manual}’ *note title:
-(file name)(pman)anode ‘@ref{(pman)anode,,,file name,manual}’ *note
-(file name)(pman)anode::
+   ‘@ref{(pman)anode,cross ref name}’ see cross ref name: (pman)anode
+‘@ref{(pman)anode,,title}’ see title: (pman)anode
+‘@ref{(pman)anode,,,file name}’ see (file name)(pman)anode::
+‘@ref{(pman)anode,,,,manual}’ see ()(pman)anode::
+‘@ref{(pman)anode,cross ref name,title,}’ see cross ref name:
+(pman)anode ‘@ref{(pman)anode,cross ref name,,file name}’ see cross ref
+name: (file name)(pman)anode ‘@ref{(pman)anode,cross ref name,,,manual}’
+see cross ref name: ()(pman)anode ‘@ref{(pman)anode,cross ref
+name,title,file name}’ see cross ref name: (file name)(pman)anode
+‘@ref{(pman)anode,cross ref name,title,,manual}’ see cross ref name:
+()(pman)anode ‘@ref{(pman)anode,cross ref name,title, file name,
+manual}’ see cross ref name: (file name)(pman)anode
+‘@ref{(pman)anode,,title,file name}’ see title: (file name)(pman)anode
+‘@ref{(pman)anode,,title,,manual}’ see title: ()(pman)anode
+‘@ref{(pman)anode,,title, file name, manual}’ see title: (file
+name)(pman)anode ‘@ref{(pman)anode,,,file name,manual}’ see (file
+name)(pman)anode::
 
-   ‘@inforef{chapter, cross ref name, file name}’ *note cross ref name:
-(file name)chapter ‘@inforef{chapter}’ *note chapter::
-‘@inforef{chapter, cross ref name}’ *note cross ref name: chapter
-‘@inforef{chapter,,file name}’ *note (file name)chapter::
+   ‘@inforef{chapter, cross ref name, file name}’ see cross ref name:
+(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::
 ';
 
 
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 13c944238f..9cd7e3ec83 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
@@ -1492,10 +1492,10 @@ 
$result_converted{'plaintext'}->{'some_at_commands_in_ref_nodes'} = 'Top
 1 A SC node ï ï Ḕ ł Ḉ ¡
 ***********************
 
-see *note (manual)a *strong* ref with SC, a i trema ï, a dotless i trema
-ï Ḕ and exclamdown ¡::.
+see see (manual)a *strong* ref with SC, a i trema ï, a dotless i trema ï
+Ḕ and exclamdown ¡::.
 
-   *Note 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 15cebe8345..1dd287f12d 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'} = '*note   ::
+$result_converted{'plaintext'}->{'spaces_in_empty_node_names'} = 'see   ::
 
-   *note   ::
+   see   ::
 
-   *note  ::
+   see  ::
 ';
 
 
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 c8e918df75..9878d1939b 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'} = '*note chap  ::
+$result_converted{'plaintext'}->{'spaces_in_node_names'} = 'see chap  ::
 
-   *note b  ::
+   see b  ::
 
-   *note c ::
+   see c ::
 ';
 
 
diff --git a/tp/t/results/converters_tests/things_before_setfilename.pl 
b/tp/t/results/converters_tests/things_before_setfilename.pl
index 5da1efb679..b80946966e 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 *note An anchor::
+Ref to anchor see An anchor::
 
-   Ref to footnote anchor *note Anchor in footnote::
+   Ref to footnote anchor see 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 6126302719..8f81dbebd8 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 *note An anchor::
+$result_converted{'plaintext'}->{'things_before_setfilename_no_element'} = 
'Ref to anchor see An anchor::
 
-   Ref to footnote anchor *note Anchor in footnote::
+   Ref to footnote anchor see 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 485c6375ba..bb78fb9f03 100644
--- a/tp/t/results/converters_tests/top_in_ref.pl
+++ b/tp/t/results/converters_tests/top_in_ref.pl
@@ -3025,40 +3025,38 @@ $result_floats{'top_in_ref'} = {};
 
 
 
-$result_converted{'plaintext'}->{'top_in_ref'} = '‘@ref{Top,cross ref name}’ 
*note cross ref name: Top ‘@ref{Top,,title}’
-*note title: Top ‘@ref{Top,,,file name}’ *note (file name)Top::
-‘@ref{Top,,,,manual}’ *note ()Top:: ‘@ref{Top,cross ref name,title,}’
-*note cross ref name: Top ‘@ref{Top,cross ref name,,file name}’ *note
-cross ref name: (file name)Top ‘@ref{Top,cross ref name,,,manual}’ *note
-cross ref name: ()Top ‘@ref{Top,cross ref name,title,file name}’ *note
-cross ref name: (file name)Top ‘@ref{Top,cross ref name,title,,manual}’
-*note cross ref name: ()Top ‘@ref{Top,cross ref name,title, file name,
-manual}’ *note cross ref name: (file name)Top ‘@ref{Top,,title,file
-name}’ *note title: (file name)Top ‘@ref{Top,,title,,manual}’ *note
-title: ()Top ‘@ref{Top,,title, file name, manual}’ *note title: (file
-name)Top ‘@ref{Top,,,file name,manual}’ *note (file name)Top::
+$result_converted{'plaintext'}->{'top_in_ref'} = '‘@ref{Top,cross ref name}’ 
see cross ref name: Top ‘@ref{Top,,title}’
+see title: Top ‘@ref{Top,,,file name}’ see (file name)Top::
+‘@ref{Top,,,,manual}’ see ()Top:: ‘@ref{Top,cross ref name,title,}’ see
+cross ref name: Top ‘@ref{Top,cross ref name,,file name}’ see cross ref
+name: (file name)Top ‘@ref{Top,cross ref name,,,manual}’ see cross ref
+name: ()Top ‘@ref{Top,cross ref name,title,file name}’ see cross ref
+name: (file name)Top ‘@ref{Top,cross ref name,title,,manual}’ see cross
+ref name: ()Top ‘@ref{Top,cross ref name,title, file name, manual}’ see
+cross ref name: (file name)Top ‘@ref{Top,,title,file name}’ see title:
+(file name)Top ‘@ref{Top,,title,,manual}’ see title: ()Top
+‘@ref{Top,,title, file name, manual}’ see title: (file name)Top
+‘@ref{Top,,,file name,manual}’ see (file name)Top::
 
-   ‘@ref{(pman)Top,cross ref name}’ *note cross ref name: (pman)Top
-‘@ref{(pman)Top,,title}’ *note title: (pman)Top ‘@ref{(pman)Top,,,file
-name}’ *note (file name)(pman)Top:: ‘@ref{(pman)Top,,,,manual}’ *note
-()(pman)Top:: ‘@ref{(pman)Top,cross ref name,title,}’ *note cross ref
-name: (pman)Top ‘@ref{(pman)Top,cross ref name,,file name}’ *note cross
+   ‘@ref{(pman)Top,cross ref name}’ see cross ref name: (pman)Top
+‘@ref{(pman)Top,,title}’ see title: (pman)Top ‘@ref{(pman)Top,,,file
+name}’ see (file name)(pman)Top:: ‘@ref{(pman)Top,,,,manual}’ see
+()(pman)Top:: ‘@ref{(pman)Top,cross ref name,title,}’ see cross ref
+name: (pman)Top ‘@ref{(pman)Top,cross ref name,,file name}’ see cross
 ref name: (file name)(pman)Top ‘@ref{(pman)Top,cross ref name,,,manual}’
-*note cross ref name: ()(pman)Top ‘@ref{(pman)Top,cross ref
-name,title,file name}’ *note cross ref name: (file name)(pman)Top
-‘@ref{(pman)Top,cross ref name,title,,manual}’ *note cross ref name:
+see cross ref name: ()(pman)Top ‘@ref{(pman)Top,cross ref
+name,title,file name}’ see cross ref name: (file name)(pman)Top
+‘@ref{(pman)Top,cross ref name,title,,manual}’ see cross ref name:
 ()(pman)Top ‘@ref{(pman)Top,cross ref name,title, file name, manual}’
-*note cross ref name: (file name)(pman)Top ‘@ref{(pman)Top,,title,file
-name}’ *note title: (file name)(pman)Top
-‘@ref{(pman)Top,,title,,manual}’ *note title: ()(pman)Top
-‘@ref{(pman)Top,,title, file name, manual}’ *note title: (file
-name)(pman)Top ‘@ref{(pman)Top,,,file name,manual}’ *note (file
-name)(pman)Top::
+see cross ref name: (file name)(pman)Top ‘@ref{(pman)Top,,title,file
+name}’ see title: (file name)(pman)Top ‘@ref{(pman)Top,,title,,manual}’
+see title: ()(pman)Top ‘@ref{(pman)Top,,title, file name, manual}’ see
+title: (file name)(pman)Top ‘@ref{(pman)Top,,,file name,manual}’ see
+(file name)(pman)Top::
 
-   ‘@inforef{Top, cross ref name, file name}’ *note cross ref name:
-(file name)Top ‘@inforef{Top}’ *note Top:: ‘@inforef{Top, cross ref
-name}’ *note cross ref name: Top ‘@inforef{Top,,file name}’ *note (file
-name)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::
 ';
 
 
diff --git a/tp/t/results/coverage_braces/contain_plain_text_nestings.pl 
b/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
index 51ac58449d..54f853b1f8 100644
--- a/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
+++ b/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
@@ -886,7 +886,7 @@ 
$result_converted{'plaintext'}->{'contain_plain_text_nestings'} = 'top
 
 Text ‘code in w’ text.  <‘code in key’ text>
 
-   Text *note cross in w: Top text.  <*note cross in key: Top text>
+   Text see cross in w: Top text.  <see cross in key: Top text>
 
 * Menu:
 
diff --git a/tp/t/results/coverage_braces/inforef_too_much_args.pl 
b/tp/t/results/coverage_braces/inforef_too_much_args.pl
index a6df77ae23..f66f49c77a 100644
--- a/tp/t/results/coverage_braces/inforef_too_much_args.pl
+++ b/tp/t/results/coverage_braces/inforef_too_much_args.pl
@@ -153,7 +153,7 @@ $result_floats{'inforef_too_much_args'} = {};
 
 
 
-$result_converted{'plaintext'}->{'inforef_too_much_args'} = '*note cross ref 
name: (file name, spurious arg)chapter
+$result_converted{'plaintext'}->{'inforef_too_much_args'} = 'see cross ref 
name: (file name, spurious arg)chapter
 ';
 
 
diff --git a/tp/t/results/coverage_braces/nested_args.pl 
b/tp/t/results/coverage_braces/nested_args.pl
index a4597ec9a3..8358d455ae 100644
--- a/tp/t/results/coverage_braces/nested_args.pl
+++ b/tp/t/results/coverage_braces/nested_args.pl
@@ -172,7 +172,7 @@ $result_floats{'nested_args'} = {};
 
 
 
-$result_converted{'plaintext'}->{'nested_args'} = '*Note descr in b: 
(‘manual’)@ in samp.
+$result_converted{'plaintext'}->{'nested_args'} = 'See descr in b: (‘manual’)@ 
in samp.
 ';
 
 
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 8ed717134b..0c8d0e2d05 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'} = '‘*note 
(manula)other node::’.
+$result_converted{'plaintext'}->{'ref_in_style_command'} = '‘see (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 f4ba277848..7ae482ed1c 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) (*note Top-Footnote-1::)
+A(1) (see Top-Footnote-1::)
 
-   B(2) (*note Top-Footnote-2::)
+   B(2) (see Top-Footnote-2::)
 
    (1) Footnote Top/1
 
@@ -830,9 +830,9 @@ A(1) (*note Top-Footnote-1::)
 1 chapter
 *********
 
-C(1) (*note chapter-Footnote-1::)
+C(1) (see chapter-Footnote-1::)
 
-   D(2) (*note 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 c5b5dfe589..e4da92efce 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) (*note Top-Footnote-1::)
+A(1) (see Top-Footnote-1::)
 
-   B(2) (*note Top-Footnote-2::)
+   B(2) (see Top-Footnote-2::)
 
    (1) Footnote Top/1
 
@@ -818,9 +818,9 @@ A(1) (*note Top-Footnote-1::)
 1 chapter
 *********
 
-C(1) (*note chapter-Footnote-1::)
+C(1) (see chapter-Footnote-1::)
 
-   D(2) (*note chapter-Footnote-2::)
+   D(2) (see chapter-Footnote-2::)
 
    (1) Footnote chapter/1
 
diff --git a/tp/t/results/coverage_braces/uref_in_ref.pl 
b/tp/t/results/coverage_braces/uref_in_ref.pl
index 68a20624c2..59a0e4482c 100644
--- a/tp/t/results/coverage_braces/uref_in_ref.pl
+++ b/tp/t/results/coverage_braces/uref_in_ref.pl
@@ -226,9 +226,8 @@ $result_floats{'uref_in_ref'} = {};
 
 
 
-$result_converted{'plaintext'}->{'uref_in_ref'} = '*note cross ref with uref 
uref1 (href://http/myhost.com/index.html):
-(info file with uref3 uref3
-(href://http/myhost.com/index3.html))(file)node
+$result_converted{'plaintext'}->{'uref_in_ref'} = 'see cross ref with uref 
uref1 (href://http/myhost.com/index.html): (info
+file with uref3 uref3 (href://http/myhost.com/index3.html))(file)node
 ';
 
 
diff --git a/tp/t/results/coverage_braces/verb_in_xref.pl 
b/tp/t/results/coverage_braces/verb_in_xref.pl
index be553259c4..1e8c1e16b8 100644
--- a/tp/t/results/coverage_braces/verb_in_xref.pl
+++ b/tp/t/results/coverage_braces/verb_in_xref.pl
@@ -153,7 +153,7 @@ $result_floats{'verb_in_xref'} = {};
 
 
 
-$result_converted{'plaintext'}->{'verb_in_xref'} = '*Note with
+$result_converted{'plaintext'}->{'verb_in_xref'} = 'See with
 verb
 
 ggg : point.
diff --git a/tp/t/results/def/ref_in_def.pl b/tp/t/results/def/ref_in_def.pl
index 7422da66e2..23e6d2522f 100644
--- a/tp/t/results/def/ref_in_def.pl
+++ b/tp/t/results/def/ref_in_def.pl
@@ -711,10 +711,10 @@ $result_indices_sort_strings{'ref_in_def'} = {
 
 
 
-$result_converted{'plaintext'}->{'ref_in_def'} = ' - *note myanchor::: *note 
myanchor:: *note myanchor:: *note myanchor::
-          *note myanchor::
- - *note myanchor::: *note myanchor:: *note myanchor:: *note myanchor::
-          *note myanchor::
+$result_converted{'plaintext'}->{'ref_in_def'} = ' - see myanchor::: see 
myanchor:: see myanchor:: see myanchor:: see
+          myanchor::
+ - see myanchor::: see myanchor:: see myanchor:: see myanchor:: see
+          myanchor::
      T
 
 ';
diff --git a/tp/t/results/float/complex_float.pl 
b/tp/t/results/float/complex_float.pl
index 2975f4071c..fb9950d0f2 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -3693,7 +3693,7 @@ _truc_
 An itemize.
    − truc line
 
-A ref.  *Note xref Text with features: Top.  A footnote.  (1).
+A ref.  See xref Text with features: Top.  A footnote.  (1).
 
 TeX and _téî<an_url>_ AND it is @verb  a word !@ Æ.
 
@@ -3712,7 +3712,7 @@ An index entry
 An itemize.
    − truc line
 
-A ref.  *Note xref Text with features caption: Top.  A footnote.  (2).
+A ref.  See xref Text with features caption: Top.  A footnote.  (2).
 
 TeX and _téî<an_url>_ AND it is @verb  a word !@ Æ.
 
@@ -3744,12 +3744,11 @@ An index entry 2
 An itemize 2.
    − truc 2 line
 
-A ref 2.  *Note xref Text with features caption: Top.  A footnote 2.
-(1).
+A ref 2.  See xref Text with features caption: Top.  A footnote 2.  (1).
 
 TeX and _téî<an_url>_ AND it is @verb  a word !@ Æ.
 
-*Note Text 1: text with a lot of features.
+See Text 1: text with a lot of features.
 
    ---------- Footnotes ----------
 
diff --git a/tp/t/results/float/float_copying.pl 
b/tp/t/results/float/float_copying.pl
index ecb4d1a79d..5703a7a6cf 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 *note Copying and floats::.
+   see 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 *note Copying and floats::.
+   see see Copying and floats::.
 
    (2) The caption copying footnote
 
-   see *note Copying and floats::.
+   see see Copying and floats::.
 
 ';
 
diff --git a/tp/t/results/float/numbering_captions_listoffloats.pl 
b/tp/t/results/float/numbering_captions_listoffloats.pl
index 66bb2c751d..3dd0a73718 100644
--- a/tp/t/results/float/numbering_captions_listoffloats.pl
+++ b/tp/t/results/float/numbering_captions_listoffloats.pl
@@ -6183,19 +6183,19 @@ Text A.1: C appendix sec float
 list of floats
 **************
 
-See *note Text 1.3: text in section.  And (*note Text 1.1: text in
-chapter).  *Note Text 1: text with a lot of features.
+See see Text 1.3: text in section.  And (see Text 1.1: text in chapter).
+See Text 1: text with a lot of features.
 
-   And now a ref (without manual or printed manual) *note cross ref:
-text with a lot of features.
+   And now a ref (without manual or printed manual) see cross ref: text
+with a lot of features.
 
-   And now a ref (with manual without printed manual) *note cross ref:
+   And now a ref (with manual without printed manual) see cross ref:
 (manual)text with a lot of features.
 
-   And now a ref (without manual with a printed manual) *note cross ref:
+   And now a ref (without manual with a printed manual) see cross ref:
 ()text with a lot of features.
 
-   A ref to float without type *note 1: label but no type.
+   A ref to float without type see 1: label but no type.
 
 * Menu:
 
diff --git a/tp/t/results/float/ref_to_float.pl 
b/tp/t/results/float/ref_to_float.pl
index b7d17324f1..6c7dd4ded6 100644
--- a/tp/t/results/float/ref_to_float.pl
+++ b/tp/t/results/float/ref_to_float.pl
@@ -325,9 +325,9 @@ Text 1
 In foat 2.
 
 1
-*note Text 1: Label1
+see Text 1: Label1
 
-   *note 1: Label2
+   see 1: Label2
 ';
 
 
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 42a6545855..cb810e503b 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
 ***************************************
 
-*note { }::
+see { }::
 
-   *note     !
+   see     !
 . . ? @::
 
-   *note @ { } \\ #::
+   see @ { } \\ #::
 
-   *note LaTeX TeX • , © ... ...::
+   see LaTeX TeX • , © ... ...::
 
-   *note ≡ error→ € ¡ ↦ −::
+   see ≡ error→ € ¡ ↦ −::
 
-   *note ≥ ≤ →::
+   see ≥ ≤ →::
 
-   *note ª º ⋆ £ ⊣ ¿ ®::
+   see ª º ⋆ £ ⊣ ¿ ®::
 
-   *note ⇒ ° a b a sunny day å::
+   see ⇒ ° a b a sunny day å::
 
-   *note Å æ œ Æ Œ ø Ø ß ł Ł Ð ð Þ þ::
+   see Å æ œ Æ Œ ø Ø ß ł Ł Ð ð Þ þ::
 
-   *note ä ẽ î â à é ç ē e̊ e̋ ę::
+   see ä ẽ î â à é ç ē e̊ e̋ ę::
 
-   *note ė ĕ e̲ ẹ ě ȷ e͡e::
+   see ė ĕ e̲ ẹ ě ȷ e͡e::
 
-   *note ı Ḕ Ḉ::
+   see ı Ḕ Ḉ::
 
-   *note “ ” ‘ ’ „ ‚::
+   see “ ” ‘ ’ „ ‚::
 
-   *note « » « » ‹ ›::
+   see « » « » ‹ ›::
 
-   *note `` \'\' --- -- ` \'::
+   see `` \'\' --- -- ` \'::
 
-   *note AAA (fff) AAA BBB::
+   see AAA (fff) AAA BBB::
 
-   *note CCC (rrr) CCC DDD::
+   see CCC (rrr) CCC DDD::
 
-   *note the someone <someone@somewher> <no_explain@there>::
+   see the someone <someone@somewher> <no_explain@there>::
 
-   *note [f--ile1] Image description""\\.::
+   see [f--ile1] Image description""\\.::
 
-   *note  @ {} . ::
+   see  @ {} . ::
 
-   *note cite asis in @w b in r SC *str* t VAR dfn i::
+   see cite asis in @w b in r SC *str* t VAR dfn i::
 
-   *note env code option samp command file C-x <ESC>::
+   see env code option samp command file C-x <ESC>::
 
-   *note 8.27in::
+   see 8.27in::
 
-   *note sansserif slanted::
+   see sansserif slanted::
 
-   *note indicateurl::
+   see indicateurl::
 
-   *note _{g}H 3^{rd}::
+   see _{g}H 3^{rd}::
 
-   *note <http://somewhere_aaa> text (url) ls::
+   see <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 1880ec0295..7b3b6b718f 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) (*note 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 c6a55b77ee..058db20426 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) (*note 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 2fd15b79b7..b6d61f9766 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,10 +3,10 @@ Appendix A Copying and indices
 
 In the appendix, we print the indices and references.
 
-   *note Copying information:: for the copying information.  *note
-Public domain reference:: for reference on the licence.
+   see Copying information:: for the copying information.  see Public
+domain reference:: for reference on the licence.
 
-   *note Titlepage anchor:: for the titlepage.  *note Titlepage footnote
+   see Titlepage anchor:: for the titlepage.  see Titlepage footnote
 anchor:: for reference on the titlepage.
 
    This is a test manual, trivially and explicitly in the public
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 329d3f386d..af5714d000 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,10 +3,10 @@ Appendix A Copying and indices
 
 In the appendix, we print the indices and references.
 
-   *note Copying information:: for the copying information.  *note
-Public domain reference:: for reference on the licence.
+   see Copying information:: for the copying information.  see Public
+domain reference:: for reference on the licence.
 
-   *note Titlepage anchor:: for the titlepage.  *note Titlepage footnote
+   see Titlepage anchor:: for the titlepage.  see 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 329d3f386d..af5714d000 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,10 +3,10 @@ Appendix A Copying and indices
 
 In the appendix, we print the indices and references.
 
-   *note Copying information:: for the copying information.  *note
-Public domain reference:: for reference on the licence.
+   see Copying information:: for the copying information.  see Public
+domain reference:: for reference on the licence.
 
-   *note Titlepage anchor:: for the titlepage.  *note Titlepage footnote
+   see Titlepage anchor:: for the titlepage.  see 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 329d3f386d..af5714d000 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,10 +3,10 @@ Appendix A Copying and indices
 
 In the appendix, we print the indices and references.
 
-   *note Copying information:: for the copying information.  *note
-Public domain reference:: for reference on the licence.
+   see Copying information:: for the copying information.  see Public
+domain reference:: for reference on the licence.
 
-   *note Titlepage anchor:: for the titlepage.  *note Titlepage footnote
+   see Titlepage anchor:: for the titlepage.  see 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 329d3f386d..af5714d000 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,10 +3,10 @@ Appendix A Copying and indices
 
 In the appendix, we print the indices and references.
 
-   *note Copying information:: for the copying information.  *note
-Public domain reference:: for reference on the licence.
+   see Copying information:: for the copying information.  see Public
+domain reference:: for reference on the licence.
 
-   *note Titlepage anchor:: for the titlepage.  *note Titlepage footnote
+   see Titlepage anchor:: for the titlepage.  see 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 1cde9d12e9..baf3a88c67 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)
-(*note 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 081d5e28e5..6d4b6739de 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.
 
-   *note Copying information:: for the copying information.  *note
-Public domain reference:: for reference on the licence.
+   see Copying information:: for the copying information.  see Public
+domain reference:: for reference on the licence.
 
-   *note Titlepage anchor:: for the titlepage.  *note Titlepage footnote
+   see Titlepage anchor:: for the titlepage.  see Titlepage footnote
 anchor:: for reference on the titlepage.
 
    This is a test manual, trivially and explicitly in the public
-domain(1) (*note 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 1cde9d12e9..baf3a88c67 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)
-(*note 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 081d5e28e5..6d4b6739de 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.
 
-   *note Copying information:: for the copying information.  *note
-Public domain reference:: for reference on the licence.
+   see Copying information:: for the copying information.  see Public
+domain reference:: for reference on the licence.
 
-   *note Titlepage anchor:: for the titlepage.  *note Titlepage footnote
+   see Titlepage anchor:: for the titlepage.  see Titlepage footnote
 anchor:: for reference on the titlepage.
 
    This is a test manual, trivially and explicitly in the public
-domain(1) (*note 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 2fd15b79b7..b6d61f9766 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,10 +3,10 @@ Appendix A Copying and indices
 
 In the appendix, we print the indices and references.
 
-   *note Copying information:: for the copying information.  *note
-Public domain reference:: for reference on the licence.
+   see Copying information:: for the copying information.  see Public
+domain reference:: for reference on the licence.
 
-   *note Titlepage anchor:: for the titlepage.  *note Titlepage footnote
+   see Titlepage anchor:: for the titlepage.  see Titlepage footnote
 anchor:: for reference on the titlepage.
 
    This is a test manual, trivially and explicitly in the public
diff --git a/tp/t/results/languages/unknown_language.pl 
b/tp/t/results/languages/unknown_language.pl
index a6279a0ada..0a85fb906a 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.  *Note Top::.
+Unknown language.  See Top::.
 
-   Another unknown language.  *Note 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 51351bd371..8fd5d68a7a 100644
--- a/tp/t/results/menu/commands_in_nodedescriptionblock.pl
+++ b/tp/t/results/menu/commands_in_nodedescriptionblock.pl
@@ -1318,8 +1318,8 @@ 
$result_converted{'plaintext'}->{'commands_in_nodedescriptionblock'} = 'test com
 * Menu:
 
 * node1::
-               *note node2::.  Footnote(1).  Some text to see where the max 
column could
-               be.  in w.
+               see 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::
 
-*note in nodescription::, *note tfloat 1.1: f1.
+see in nodescription::, see tfloat 1.1: f1.
 
    ---------- Footnotes ----------
 
@@ -1340,13 +1340,13 @@ 
$result_converted{'plaintext'}->{'commands_in_nodedescriptionblock'} = 'test com
 2 chap2
 *******
 
-*note in nodescription::, *note tfloat 1.1: f1.
+see in nodescription::, see tfloat 1.1: f1.
 
 * Menu:
 
 * node1::
-               *note node2::.  Footnote(1).  Some text to see where the max 
column could
-               be.  in w.
+               see 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 d2d956a623..39dcf68f7e 100644
--- a/tp/t/results/misc_commands/ref_in_center.pl
+++ b/tp/t/results/misc_commands/ref_in_center.pl
@@ -416,9 +416,9 @@ $result_converted{'plaintext'}->{'ref_in_center'} = 'top
 1 Chapter
 *********
 
-                              *note Top::
+                               see Top::
 
-                              *note title
+                               see title
                                  : Top
    very long
 ';
diff --git a/tp/t/results/multitable/ref_in_multitable.pl 
b/tp/t/results/multitable/ref_in_multitable.pl
index cd0f1a9880..db70e9c82c 100644
--- a/tp/t/results/multitable/ref_in_multitable.pl
+++ b/tp/t/results/multitable/ref_in_multitable.pl
@@ -535,23 +535,23 @@ $result_floats{'ref_in_multitable'} = {};
 
 
 
-$result_converted{'plaintext'}->{'ref_in_multitable'} = '*note XXX XXX XXX XXX 
XXX XXX XXX XXX XXX XXX XXX XXX XX XXX XXX XXX XXX
+$result_converted{'plaintext'}->{'ref_in_multitable'} = 'see 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   See *note RRR RRR RRR RRR RRR RRR RRR RRR RRR
+XXX XXX XXX XXX XXX XXX   See see RRR RRR RRR RRR RRR RRR RRR RRR RRR
 XXX XXX XXX XXX XXX XXX   RRRR::.
 XX
-XXX XXX XXX XXX XXX XXX   See *note SSS SSS SSS SSS SSS SSS SSS SSS SSS
+XXX XXX XXX XXX XXX XXX   See see SSS SSS SSS SSS SSS SSS SSS SSS SSS
 XXX XXX XXX XXX XXX XXX   SSS SSS SSS SSSSS::.
 XX
 adsf(1)                   second column
 
-   *note XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XX XXX XXX XXX
+   see 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::.
 
    ---------- Footnotes ----------
 
-   (1) *note XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XX XXX XXX
+   (1) see 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::
 
 ';
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 96143d16b3..49042d1fb4 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.
-     ref*note Top::ref.
+     refsee Top::ref.
      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 10cc10a5a6..b4d109a51d 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.  ref*note Top::ref.
+acronym2ABCacronym.  emailmali <somebody>email.  refsee Top::ref.
 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 12999efb87..b3e8df00f4 100644
--- a/tp/t/results/plaintext_tests/del_quote_linebreaking.pl
+++ b/tp/t/results/plaintext_tests/del_quote_linebreaking.pl
@@ -498,23 +498,19 @@ $result_floats{'del_quote_linebreaking'} = {};
 
 $result_converted{'plaintext'}->{'del_quote_linebreaking'} = 'first para
 
-   xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx *Note
-(manual)noxde::
+   xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx See (manual)noxde::
 
-   xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx *Note
-(manual)noxde::
+   xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx See (manual)noxde::
 
-   xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx *Note (manual)noxde::
+   xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx See (manual)noxde::
 
    %
 
-   xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx *Note
-(manual)no:de::
+   xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx See (manual)no:de::
 
-   xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx *Note
-(manual)no:de::
+   xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx See (manual)no:de::
 
-   xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx *Note (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 949b0a4968..2c113e1e1a 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
@@ -1,32 +1,29 @@
-*Note the::caption and a word: normal node *Note the::caption: normal
-node
+See the::caption and a word: normal node See the::caption: normal node
 
-   *Note the::caption and a word: blah:blah *Note the::caption:
-blah:blah
+   See the::caption and a word: blah:blah See the::caption: blah:blah
 
-   *Note the::caption and a word: blumpty.fump *Note the::caption:
+   See the::caption and a word: blumpty.fump See the::caption:
 blumpty.fump.mrmrmrmmrmrmr
 
-   *Note blah:blah::.
+   See blah:blah::.
 
-   *Note secret,node::.
+   See secret,node::.
 
-   AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA *Note
-blah:blah::.)
+   AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA See blah:blah::.)
 
-   *Note (man_ual)x:y::z::.
+   See (man_ual)x:y::z::.
 
-   *Note (man_ual)x.y.z::.
+   See (man_ual)x.y.z::.
 
-   *Note label: (man_ual)pp:qq::rr.
+   See label: (man_ual)pp:qq::rr.
 
-   *Note label: (man_ual)pp:qq.rr.
+   See label: (man_ual)pp:qq.rr.
 
-   *Note label: (man:u.al)ext.
+   See label: (man:u.al)ext.
 
-   *Note label: (man:u.al)e:x.t.
+   See label: (man:u.al)e:x.t.
 
-   *Note la:bel: (man:u.al)ext.
+   See la:bel: (man:u.al)ext.
 
 1 blah:blah
 ***********
diff --git a/tp/t/results/plaintext_tests/xref_quote_long_item.pl 
b/tp/t/results/plaintext_tests/xref_quote_long_item.pl
index afb36745d0..be0cf226c5 100644
--- a/tp/t/results/plaintext_tests/xref_quote_long_item.pl
+++ b/tp/t/results/plaintext_tests/xref_quote_long_item.pl
@@ -278,7 +278,7 @@ $result_floats{'xref_quote_long_item'} = {};
 
 
 $result_converted{'plaintext'}->{'xref_quote_long_item'} = '‘@verbatiminclude’
-     *Note Texinfo::Convert::Utils::expand_verbatiminclude:
+     See Texinfo::Convert::Utils::expand_verbatiminclude:
      (tp_api)Texinfo::Convert::Utils $tree =
      expand_verbatiminclude($registrar, $configuration_information,
      $verbatiminclude).
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 6dc657d459..ece83789d6 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 *note to *note node1::::
-**************************
+1 see to see 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 15580fdb4e..30e5b3a6ae 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 *note n2::
-************
+$result_converted{'plaintext'}->{'double_recursive_self_section_reference'} = 
'1 see n2::
+**********
 
-2 *note n1::
-************
+2 see n1::
+**********
 
 ';
 
diff --git a/tp/t/results/sectioning/recursive_self_section_reference.pl 
b/tp/t/results/sectioning/recursive_self_section_reference.pl
index 8c7a6ee41d..3ab61e5666 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 
*note sharp:: tuple
-*********************
+$result_converted{'plaintext'}->{'recursive_self_section_reference'} = '1 see 
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 87373f9893..fb4d7e20f1 100644
--- a/tp/tests/coverage/res_parser/formatting_plaintext/formatting.txt
+++ b/tp/tests/coverage/res_parser/formatting_plaintext/formatting.txt
@@ -451,74 +451,71 @@ s-mallformat
      fff2
 
    ‘@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file n---ame@@,
-ma---nual@@}’ *Note cross r--ef name@: (file n---ame@)c---hapter@.
-‘@ref{chapter, cross ref name, title, file name, manual}’ *note cross
-ref name: (file name)chapter ‘@pxref{chapter, cross ref name, title,
-file name, manual}’ *note cross ref name: (file name)chapter
-‘@inforef{chapter, cross ref name, file name}’ *note cross ref name:
-(file name)chapter
-
-   ‘@ref{chapter}’ *note chapter:: ‘@xref{chapter}’ *Note chapter::.
-‘@pxref{chapter}’ *note chapter:: ‘@ref{s--ect@comma{}ion}’ *note
+ma---nual@@}’ See cross r--ef name@: (file n---ame@)c---hapter@.
+‘@ref{chapter, cross ref name, title, file name, manual}’ see cross ref
+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}’ see chapter:: ‘@xref{chapter}’ See chapter::.
+‘@pxref{chapter}’ see chapter:: ‘@ref{s--ect@comma{}ion}’ see
 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 }’ *note a ,
-in cross ref: (a comma, in file)s--ect,ion
-
-   ‘@ref{chapter,cross ref name}’ *note cross ref name: chapter
-‘@ref{chapter,,title}’ *note title: chapter ‘@ref{chapter,,,file name}’
-*note (file name)chapter:: ‘@ref{chapter,,,,manual}’ *note ()chapter::
-‘@ref{chapter,cross ref name,title,}’ *note cross ref name: chapter
-‘@ref{chapter,cross ref name,,file name}’ *note cross ref name: (file
-name)chapter ‘@ref{chapter,cross ref name,,,manual}’ *note cross ref
-name: ()chapter ‘@ref{chapter,cross ref name,title,file name}’ *note
-cross ref name: (file name)chapter ‘@ref{chapter,cross ref
-name,title,,manual}’ *note cross ref name: ()chapter ‘@ref{chapter,cross
-ref name,title, file name, manual}’ *note cross ref name: (file
-name)chapter ‘@ref{chapter,,title,file name}’ *note title: (file
-name)chapter ‘@ref{chapter,,title,,manual}’ *note title: ()chapter
-‘@ref{chapter,,title, file name, manual}’ *note title: (file
-name)chapter ‘@ref{chapter,,,file name,manual}’ *note (file
-name)chapter::
-
-   ‘@ref{(pman)anode,cross ref name}’ *note cross ref name: (pman)anode
-‘@ref{(pman)anode,,title}’ *note title: (pman)anode
-‘@ref{(pman)anode,,,file name}’ *note (file name)(pman)anode::
-‘@ref{(pman)anode,,,,manual}’ *note ()(pman)anode::
-‘@ref{(pman)anode,cross ref name,title,}’ *note cross ref name:
-(pman)anode ‘@ref{(pman)anode,cross ref name,,file name}’ *note cross
-ref name: (file name)(pman)anode ‘@ref{(pman)anode,cross ref
-name,,,manual}’ *note cross ref name: ()(pman)anode
-‘@ref{(pman)anode,cross ref name,title,file name}’ *note cross ref name:
-(file name)(pman)anode ‘@ref{(pman)anode,cross ref name,title,,manual}’
-*note cross ref name: ()(pman)anode ‘@ref{(pman)anode,cross ref
-name,title, file name, manual}’ *note cross ref name: (file
-name)(pman)anode ‘@ref{(pman)anode,,title,file name}’ *note title: (file
-name)(pman)anode ‘@ref{(pman)anode,,title,,manual}’ *note title:
-()(pman)anode ‘@ref{(pman)anode,,title, file name, manual}’ *note title:
-(file name)(pman)anode ‘@ref{(pman)anode,,,file name,manual}’ *note
-(file name)(pman)anode::
-
-   ‘@inforef{chapter, cross ref name, file name}’ *note cross ref name:
-(file name)chapter ‘@inforef{chapter}’ *note chapter::
-‘@inforef{chapter, cross ref name}’ *note cross ref name: chapter
-‘@inforef{chapter,,file name}’ *note (file name)chapter::
-‘@inforef{node, cross ref name, file name}’ *note cross ref name: (file
-name)node ‘@inforef{node}’ *note node:: ‘@inforef{node, cross ref name}’
-*note cross ref name: node ‘@inforef{node,,file name}’ *note (file
-name)node:: ‘@inforef{chapter, cross ref name, file name, spurious arg}’
-*note cross ref name: (file name, spurious arg)chapter
+title, a comma@comma{} in file, a @comma{} in manual name }’ see a , in
+cross ref: (a comma, in file)s--ect,ion
+
+   ‘@ref{chapter,cross ref name}’ see cross ref name: chapter
+‘@ref{chapter,,title}’ see title: chapter ‘@ref{chapter,,,file name}’
+see (file name)chapter:: ‘@ref{chapter,,,,manual}’ see ()chapter::
+‘@ref{chapter,cross ref name,title,}’ see cross ref name: chapter
+‘@ref{chapter,cross ref name,,file name}’ see cross ref name: (file
+name)chapter ‘@ref{chapter,cross ref name,,,manual}’ see cross ref name:
+()chapter ‘@ref{chapter,cross ref name,title,file name}’ see cross ref
+name: (file name)chapter ‘@ref{chapter,cross ref name,title,,manual}’
+see cross ref name: ()chapter ‘@ref{chapter,cross ref name,title, file
+name, manual}’ see cross ref name: (file name)chapter
+‘@ref{chapter,,title,file name}’ see title: (file name)chapter
+‘@ref{chapter,,title,,manual}’ see title: ()chapter
+‘@ref{chapter,,title, file name, manual}’ see title: (file name)chapter
+‘@ref{chapter,,,file name,manual}’ see (file name)chapter::
+
+   ‘@ref{(pman)anode,cross ref name}’ see cross ref name: (pman)anode
+‘@ref{(pman)anode,,title}’ see title: (pman)anode
+‘@ref{(pman)anode,,,file name}’ see (file name)(pman)anode::
+‘@ref{(pman)anode,,,,manual}’ see ()(pman)anode::
+‘@ref{(pman)anode,cross ref name,title,}’ see cross ref name:
+(pman)anode ‘@ref{(pman)anode,cross ref name,,file name}’ see cross ref
+name: (file name)(pman)anode ‘@ref{(pman)anode,cross ref name,,,manual}’
+see cross ref name: ()(pman)anode ‘@ref{(pman)anode,cross ref
+name,title,file name}’ see cross ref name: (file name)(pman)anode
+‘@ref{(pman)anode,cross ref name,title,,manual}’ see cross ref name:
+()(pman)anode ‘@ref{(pman)anode,cross ref name,title, file name,
+manual}’ see cross ref name: (file name)(pman)anode
+‘@ref{(pman)anode,,title,file name}’ see title: (file name)(pman)anode
+‘@ref{(pman)anode,,title,,manual}’ see title: ()(pman)anode
+‘@ref{(pman)anode,,title, file name, manual}’ see title: (file
+name)(pman)anode ‘@ref{(pman)anode,,,file name,manual}’ see (file
+name)(pman)anode::
+
+   ‘@inforef{chapter, cross ref name, file name}’ see cross ref name:
+(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::
+‘@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{s--ect@comma{}ion, a @comma{} in cross ref, a comma@comma{}
-in file}’ *note a , in cross ref: (a comma, in file)s--ect,ion
+in file}’ see a , in cross ref: (a comma, in file)s--ect,ion
 
-   ‘*note chapter::’.
+   ‘see chapter::’.
 
-   *note cross ref with uref uref1 (href://http/myhost.com/index.html):
-(info file with uref3 uref3 (href://http/myhost.com/index3.html))ext
-*note cross ref with uref uref1 (href://http/myhost.com/index.html):
-chapter
+   see cross ref with uref uref1 (href://http/myhost.com/index.html):
+(info file with uref3 uref3 (href://http/myhost.com/index3.html))ext see
+cross ref with uref uref1 (href://http/myhost.com/index.html): chapter
 
 *a-strong*
      l-ine
@@ -678,38 +675,36 @@ b
 
    g-roupe
 
-   ‘@ref{node}’ *note node::
-
-   ‘@ref{,cross ref name}’ *note cross ref name: ‘@ref{,,title}’ *note
-title: ‘@ref{,,,file name}’ *note (file name):: ‘@ref{,,,,manual}’ *note
-():: ‘@ref{node,cross ref name}’ *note cross ref name: node
-‘@ref{node,,title}’ *note title: node ‘@ref{node,,,file name}’ *note
-(file name)node:: ‘@ref{node,,,,manual}’ *note ()node:: ‘@ref{node,cross
-ref name,title,}’ *note cross ref name: node ‘@ref{node,cross ref
-name,,file name}’ *note cross ref name: (file name)node ‘@ref{node,cross
-ref name,,,manual}’ *note cross ref name: ()node ‘@ref{node,cross ref
-name,title,file name}’ *note cross ref name: (file name)node
-‘@ref{node,cross ref name,title,,manual}’ *note cross ref name: ()node
-‘@ref{node,cross ref name,title, file name, manual}’ *note cross ref
-name: (file name)node ‘@ref{node,,title,file name}’ *note title: (file
-name)node ‘@ref{node,,title,,manual}’ *note title: ()node
-‘@ref{chapter,,title, file name, manual}’ *note title: (file
-name)chapter ‘@ref{node,,title, file name, manual}’ *note title: (file
-name)node ‘@ref{node,,,file name,manual}’ *note (file name)node::
-‘@ref{,cross ref name,title,}’ *note cross ref name: ‘@ref{,cross ref
-name,,file name}’ *note cross ref name: (file name) ‘@ref{,cross ref
-name,,,manual}’ *note cross ref name: () ‘@ref{,cross ref
-name,title,file name}’ *note cross ref name: (file name) ‘@ref{,cross
-ref name,title,,manual}’ *note cross ref name: () ‘@ref{,cross ref
-name,title, file name, manual}’ *note cross ref name: (file name)
-‘@ref{,,title,file name}’ *note title: (file name)
-‘@ref{,,title,,manual}’ *note title: () ‘@ref{,,title, file name,
-manual}’ *note title: (file name) ‘@ref{,,,file name,manual}’ *note
-(file name)::
-
-   ‘@inforef{,cross ref name }’ *note cross ref name: ‘@inforef{,,file
-name}’ *note (file name):: ‘@inforef{,cross ref name, file name}’ *note
-cross ref name: (file name) ‘@inforef{}’ *note ::
+   ‘@ref{node}’ see node::
+
+   ‘@ref{,cross ref name}’ see cross ref name: ‘@ref{,,title}’ see
+title: ‘@ref{,,,file name}’ see (file name):: ‘@ref{,,,,manual}’ see
+():: ‘@ref{node,cross ref name}’ see cross ref name: node
+‘@ref{node,,title}’ see title: node ‘@ref{node,,,file name}’ see (file
+name)node:: ‘@ref{node,,,,manual}’ see ()node:: ‘@ref{node,cross ref
+name,title,}’ see cross ref name: node ‘@ref{node,cross ref name,,file
+name}’ see cross ref name: (file name)node ‘@ref{node,cross ref
+name,,,manual}’ see cross ref name: ()node ‘@ref{node,cross ref
+name,title,file name}’ see cross ref name: (file name)node
+‘@ref{node,cross ref name,title,,manual}’ see cross ref name: ()node
+‘@ref{node,cross ref name,title, file name, manual}’ see cross ref name:
+(file name)node ‘@ref{node,,title,file name}’ see title: (file name)node
+‘@ref{node,,title,,manual}’ see title: ()node ‘@ref{chapter,,title, file
+name, manual}’ see title: (file name)chapter ‘@ref{node,,title, file
+name, manual}’ see title: (file name)node ‘@ref{node,,,file
+name,manual}’ see (file name)node:: ‘@ref{,cross ref name,title,}’ see
+cross ref name: ‘@ref{,cross ref name,,file name}’ see cross ref name:
+(file name) ‘@ref{,cross ref name,,,manual}’ see cross ref name: ()
+‘@ref{,cross ref name,title,file name}’ see cross ref name: (file name)
+‘@ref{,cross ref name,title,,manual}’ see cross ref name: ()
+‘@ref{,cross ref name,title, file name, manual}’ see cross ref name:
+(file name) ‘@ref{,,title,file name}’ see title: (file name)
+‘@ref{,,title,,manual}’ see title: () ‘@ref{,,title, file name, manual}’
+see title: (file name) ‘@ref{,,,file name,manual}’ see (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 ::
 
    Normal text
 
@@ -1148,74 +1143,71 @@ s-mallformat
      fff2
 
    ‘@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file n---ame@@,
-ma---nual@@}’ *Note cross r--ef name@: (file n---ame@)c---hapter@.
-‘@ref{chapter, cross ref name, title, file name, manual}’ *note cross
-ref name: (file name)chapter ‘@pxref{chapter, cross ref name, title,
-file name, manual}’ *note cross ref name: (file name)chapter
-‘@inforef{chapter, cross ref name, file name}’ *note cross ref name:
-(file name)chapter
-
-   ‘@ref{chapter}’ *note chapter:: ‘@xref{chapter}’ *Note chapter::.
-‘@pxref{chapter}’ *note chapter:: ‘@ref{s--ect@comma{}ion}’ *note
+ma---nual@@}’ See cross r--ef name@: (file n---ame@)c---hapter@.
+‘@ref{chapter, cross ref name, title, file name, manual}’ see cross ref
+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}’ see chapter:: ‘@xref{chapter}’ See chapter::.
+‘@pxref{chapter}’ see chapter:: ‘@ref{s--ect@comma{}ion}’ see
 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 }’ *note a ,
-in cross ref: (a comma, in file)s--ect,ion
-
-   ‘@ref{chapter,cross ref name}’ *note cross ref name: chapter
-‘@ref{chapter,,title}’ *note title: chapter ‘@ref{chapter,,,file name}’
-*note (file name)chapter:: ‘@ref{chapter,,,,manual}’ *note ()chapter::
-‘@ref{chapter,cross ref name,title,}’ *note cross ref name: chapter
-‘@ref{chapter,cross ref name,,file name}’ *note cross ref name: (file
-name)chapter ‘@ref{chapter,cross ref name,,,manual}’ *note cross ref
-name: ()chapter ‘@ref{chapter,cross ref name,title,file name}’ *note
-cross ref name: (file name)chapter ‘@ref{chapter,cross ref
-name,title,,manual}’ *note cross ref name: ()chapter ‘@ref{chapter,cross
-ref name,title, file name, manual}’ *note cross ref name: (file
-name)chapter ‘@ref{chapter,,title,file name}’ *note title: (file
-name)chapter ‘@ref{chapter,,title,,manual}’ *note title: ()chapter
-‘@ref{chapter,,title, file name, manual}’ *note title: (file
-name)chapter ‘@ref{chapter,,,file name,manual}’ *note (file
-name)chapter::
-
-   ‘@ref{(pman)anode,cross ref name}’ *note cross ref name: (pman)anode
-‘@ref{(pman)anode,,title}’ *note title: (pman)anode
-‘@ref{(pman)anode,,,file name}’ *note (file name)(pman)anode::
-‘@ref{(pman)anode,,,,manual}’ *note ()(pman)anode::
-‘@ref{(pman)anode,cross ref name,title,}’ *note cross ref name:
-(pman)anode ‘@ref{(pman)anode,cross ref name,,file name}’ *note cross
-ref name: (file name)(pman)anode ‘@ref{(pman)anode,cross ref
-name,,,manual}’ *note cross ref name: ()(pman)anode
-‘@ref{(pman)anode,cross ref name,title,file name}’ *note cross ref name:
-(file name)(pman)anode ‘@ref{(pman)anode,cross ref name,title,,manual}’
-*note cross ref name: ()(pman)anode ‘@ref{(pman)anode,cross ref
-name,title, file name, manual}’ *note cross ref name: (file
-name)(pman)anode ‘@ref{(pman)anode,,title,file name}’ *note title: (file
-name)(pman)anode ‘@ref{(pman)anode,,title,,manual}’ *note title:
-()(pman)anode ‘@ref{(pman)anode,,title, file name, manual}’ *note title:
-(file name)(pman)anode ‘@ref{(pman)anode,,,file name,manual}’ *note
-(file name)(pman)anode::
-
-   ‘@inforef{chapter, cross ref name, file name}’ *note cross ref name:
-(file name)chapter ‘@inforef{chapter}’ *note chapter::
-‘@inforef{chapter, cross ref name}’ *note cross ref name: chapter
-‘@inforef{chapter,,file name}’ *note (file name)chapter::
-‘@inforef{node, cross ref name, file name}’ *note cross ref name: (file
-name)node ‘@inforef{node}’ *note node:: ‘@inforef{node, cross ref name}’
-*note cross ref name: node ‘@inforef{node,,file name}’ *note (file
-name)node:: ‘@inforef{chapter, cross ref name, file name, spurious arg}’
-*note cross ref name: (file name, spurious arg)chapter
+title, a comma@comma{} in file, a @comma{} in manual name }’ see a , in
+cross ref: (a comma, in file)s--ect,ion
+
+   ‘@ref{chapter,cross ref name}’ see cross ref name: chapter
+‘@ref{chapter,,title}’ see title: chapter ‘@ref{chapter,,,file name}’
+see (file name)chapter:: ‘@ref{chapter,,,,manual}’ see ()chapter::
+‘@ref{chapter,cross ref name,title,}’ see cross ref name: chapter
+‘@ref{chapter,cross ref name,,file name}’ see cross ref name: (file
+name)chapter ‘@ref{chapter,cross ref name,,,manual}’ see cross ref name:
+()chapter ‘@ref{chapter,cross ref name,title,file name}’ see cross ref
+name: (file name)chapter ‘@ref{chapter,cross ref name,title,,manual}’
+see cross ref name: ()chapter ‘@ref{chapter,cross ref name,title, file
+name, manual}’ see cross ref name: (file name)chapter
+‘@ref{chapter,,title,file name}’ see title: (file name)chapter
+‘@ref{chapter,,title,,manual}’ see title: ()chapter
+‘@ref{chapter,,title, file name, manual}’ see title: (file name)chapter
+‘@ref{chapter,,,file name,manual}’ see (file name)chapter::
+
+   ‘@ref{(pman)anode,cross ref name}’ see cross ref name: (pman)anode
+‘@ref{(pman)anode,,title}’ see title: (pman)anode
+‘@ref{(pman)anode,,,file name}’ see (file name)(pman)anode::
+‘@ref{(pman)anode,,,,manual}’ see ()(pman)anode::
+‘@ref{(pman)anode,cross ref name,title,}’ see cross ref name:
+(pman)anode ‘@ref{(pman)anode,cross ref name,,file name}’ see cross ref
+name: (file name)(pman)anode ‘@ref{(pman)anode,cross ref name,,,manual}’
+see cross ref name: ()(pman)anode ‘@ref{(pman)anode,cross ref
+name,title,file name}’ see cross ref name: (file name)(pman)anode
+‘@ref{(pman)anode,cross ref name,title,,manual}’ see cross ref name:
+()(pman)anode ‘@ref{(pman)anode,cross ref name,title, file name,
+manual}’ see cross ref name: (file name)(pman)anode
+‘@ref{(pman)anode,,title,file name}’ see title: (file name)(pman)anode
+‘@ref{(pman)anode,,title,,manual}’ see title: ()(pman)anode
+‘@ref{(pman)anode,,title, file name, manual}’ see title: (file
+name)(pman)anode ‘@ref{(pman)anode,,,file name,manual}’ see (file
+name)(pman)anode::
+
+   ‘@inforef{chapter, cross ref name, file name}’ see cross ref name:
+(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::
+‘@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{s--ect@comma{}ion, a @comma{} in cross ref, a comma@comma{}
-in file}’ *note a , in cross ref: (a comma, in file)s--ect,ion
+in file}’ see a , in cross ref: (a comma, in file)s--ect,ion
 
-   ‘*note chapter::’.
+   ‘see chapter::’.
 
-   *note cross ref with uref uref1 (href://http/myhost.com/index.html):
-(info file with uref3 uref3 (href://http/myhost.com/index3.html))ext
-*note cross ref with uref uref1 (href://http/myhost.com/index.html):
-chapter
+   see cross ref with uref uref1 (href://http/myhost.com/index.html):
+(info file with uref3 uref3 (href://http/myhost.com/index3.html))ext see
+cross ref with uref uref1 (href://http/myhost.com/index.html): chapter
 
 *a-strong*
      l-ine
@@ -1375,38 +1367,36 @@ b
 
    g-roupe
 
-   ‘@ref{node}’ *note node::
-
-   ‘@ref{,cross ref name}’ *note cross ref name: ‘@ref{,,title}’ *note
-title: ‘@ref{,,,file name}’ *note (file name):: ‘@ref{,,,,manual}’ *note
-():: ‘@ref{node,cross ref name}’ *note cross ref name: node
-‘@ref{node,,title}’ *note title: node ‘@ref{node,,,file name}’ *note
-(file name)node:: ‘@ref{node,,,,manual}’ *note ()node:: ‘@ref{node,cross
-ref name,title,}’ *note cross ref name: node ‘@ref{node,cross ref
-name,,file name}’ *note cross ref name: (file name)node ‘@ref{node,cross
-ref name,,,manual}’ *note cross ref name: ()node ‘@ref{node,cross ref
-name,title,file name}’ *note cross ref name: (file name)node
-‘@ref{node,cross ref name,title,,manual}’ *note cross ref name: ()node
-‘@ref{node,cross ref name,title, file name, manual}’ *note cross ref
-name: (file name)node ‘@ref{node,,title,file name}’ *note title: (file
-name)node ‘@ref{node,,title,,manual}’ *note title: ()node
-‘@ref{chapter,,title, file name, manual}’ *note title: (file
-name)chapter ‘@ref{node,,title, file name, manual}’ *note title: (file
-name)node ‘@ref{node,,,file name,manual}’ *note (file name)node::
-‘@ref{,cross ref name,title,}’ *note cross ref name: ‘@ref{,cross ref
-name,,file name}’ *note cross ref name: (file name) ‘@ref{,cross ref
-name,,,manual}’ *note cross ref name: () ‘@ref{,cross ref
-name,title,file name}’ *note cross ref name: (file name) ‘@ref{,cross
-ref name,title,,manual}’ *note cross ref name: () ‘@ref{,cross ref
-name,title, file name, manual}’ *note cross ref name: (file name)
-‘@ref{,,title,file name}’ *note title: (file name)
-‘@ref{,,title,,manual}’ *note title: () ‘@ref{,,title, file name,
-manual}’ *note title: (file name) ‘@ref{,,,file name,manual}’ *note
-(file name)::
-
-   ‘@inforef{,cross ref name }’ *note cross ref name: ‘@inforef{,,file
-name}’ *note (file name):: ‘@inforef{,cross ref name, file name}’ *note
-cross ref name: (file name) ‘@inforef{}’ *note ::
+   ‘@ref{node}’ see node::
+
+   ‘@ref{,cross ref name}’ see cross ref name: ‘@ref{,,title}’ see
+title: ‘@ref{,,,file name}’ see (file name):: ‘@ref{,,,,manual}’ see
+():: ‘@ref{node,cross ref name}’ see cross ref name: node
+‘@ref{node,,title}’ see title: node ‘@ref{node,,,file name}’ see (file
+name)node:: ‘@ref{node,,,,manual}’ see ()node:: ‘@ref{node,cross ref
+name,title,}’ see cross ref name: node ‘@ref{node,cross ref name,,file
+name}’ see cross ref name: (file name)node ‘@ref{node,cross ref
+name,,,manual}’ see cross ref name: ()node ‘@ref{node,cross ref
+name,title,file name}’ see cross ref name: (file name)node
+‘@ref{node,cross ref name,title,,manual}’ see cross ref name: ()node
+‘@ref{node,cross ref name,title, file name, manual}’ see cross ref name:
+(file name)node ‘@ref{node,,title,file name}’ see title: (file name)node
+‘@ref{node,,title,,manual}’ see title: ()node ‘@ref{chapter,,title, file
+name, manual}’ see title: (file name)chapter ‘@ref{node,,title, file
+name, manual}’ see title: (file name)node ‘@ref{node,,,file
+name,manual}’ see (file name)node:: ‘@ref{,cross ref name,title,}’ see
+cross ref name: ‘@ref{,cross ref name,,file name}’ see cross ref name:
+(file name) ‘@ref{,cross ref name,,,manual}’ see cross ref name: ()
+‘@ref{,cross ref name,title,file name}’ see cross ref name: (file name)
+‘@ref{,cross ref name,title,,manual}’ see cross ref name: ()
+‘@ref{,cross ref name,title, file name, manual}’ see cross ref name:
+(file name) ‘@ref{,,title,file name}’ see title: (file name)
+‘@ref{,,title,,manual}’ see title: () ‘@ref{,,title, file name, manual}’
+see title: (file name) ‘@ref{,,,file name,manual}’ see (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 ::
 
    In example.
 
@@ -1983,72 +1973,72 @@ cross ref name: (file name) ‘@inforef{}’ *note ::
           fff2
 
 
-     @xref{c---hapter@@, cross r---ef name@@, t---itle@@, file n---ame@@, 
ma---nual@@} *Note cross r---ef name@: (file n---ame@)c---hapter@.
-     @ref{chapter, cross ref name, title, file name, manual} *note cross ref 
name: (file name)chapter
-     @pxref{chapter, cross ref name, title, file name, manual} *note cross ref 
name: (file name)chapter
-     @inforef{chapter, cross ref name, file name} *note cross ref name: (file 
name)chapter
+     @xref{c---hapter@@, cross r---ef name@@, t---itle@@, file n---ame@@, 
ma---nual@@} See cross r---ef name@: (file n---ame@)c---hapter@.
+     @ref{chapter, cross ref name, title, file name, manual} see cross ref 
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} *note chapter::
-     @xref{chapter} *Note chapter::.
-     @pxref{chapter} *note chapter::
-     @ref{s--ect@comma{}ion} *note s--ect,ion::
+     @ref{chapter} see chapter::
+     @xref{chapter} See chapter::.
+     @pxref{chapter} see chapter::
+     @ref{s--ect@comma{}ion} see 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 }
-     *note a , in cross
+     see a , in cross
      ref: (a comma, in file)s--ect,ion
 
-     @ref{chapter,cross ref name} *note cross ref name: chapter
-     @ref{chapter,,title} *note title: chapter
-     @ref{chapter,,,file name} *note (file name)chapter::
-     @ref{chapter,,,,manual} *note ()chapter::
-     @ref{chapter,cross ref name,title,} *note cross ref name: chapter
-     @ref{chapter,cross ref name,,file name} *note cross ref name: (file 
name)chapter
-     @ref{chapter,cross ref name,,,manual} *note cross ref name: ()chapter
-     @ref{chapter,cross ref name,title,file name} *note cross ref name: (file 
name)chapter
-     @ref{chapter,cross ref name,title,,manual} *note cross ref name: ()chapter
-     @ref{chapter,cross ref name,title, file name, manual} *note cross ref 
name: (file name)chapter
-     @ref{chapter,,title,file name} *note title: (file name)chapter
-     @ref{chapter,,title,,manual} *note title: ()chapter
-     @ref{chapter,,title, file name, manual} *note title: (file name)chapter
-     @ref{chapter,,,file name,manual} *note (file name)chapter::
-
-
-     @ref{(pman)anode,cross ref name} *note cross ref name: (pman)anode
-     @ref{(pman)anode,,title} *note title: (pman)anode
-     @ref{(pman)anode,,,file name} *note (file name)(pman)anode::
-     @ref{(pman)anode,,,,manual} *note ()(pman)anode::
-     @ref{(pman)anode,cross ref name,title,} *note cross ref name: (pman)anode
-     @ref{(pman)anode,cross ref name,,file name} *note cross ref name: (file 
name)(pman)anode
-     @ref{(pman)anode,cross ref name,,,manual} *note cross ref name: 
()(pman)anode
-     @ref{(pman)anode,cross ref name,title,file name} *note cross ref name: 
(file name)(pman)anode
-     @ref{(pman)anode,cross ref name,title,,manual} *note cross ref name: 
()(pman)anode
-     @ref{(pman)anode,cross ref name,title, file name, manual} *note cross ref 
name: (file name)(pman)anode
-     @ref{(pman)anode,,title,file name} *note title: (file name)(pman)anode
-     @ref{(pman)anode,,title,,manual} *note title: ()(pman)anode
-     @ref{(pman)anode,,title, file name, manual} *note title: (file 
name)(pman)anode
-     @ref{(pman)anode,,,file name,manual} *note (file name)(pman)anode::
-
-
-     @inforef{chapter, cross ref name, file name} *note cross ref name: (file 
name)chapter
-     @inforef{chapter} *note chapter::
-     @inforef{chapter, cross ref name} *note cross ref name: chapter
-     @inforef{chapter,,file name} *note (file name)chapter::
-     @inforef{node, cross ref name, file name} *note cross ref name: (file 
name)node
-     @inforef{node} *note node::
-     @inforef{node, cross ref name} *note cross ref name: node
-     @inforef{node,,file name} *note (file name)node::
-     @inforef{chapter, cross ref name, file name, spurious arg} *note cross 
ref name: (file name, spurious arg)chapter
+     @ref{chapter,cross ref name} see cross ref name: chapter
+     @ref{chapter,,title} see title: chapter
+     @ref{chapter,,,file name} see (file name)chapter::
+     @ref{chapter,,,,manual} see ()chapter::
+     @ref{chapter,cross ref name,title,} see cross ref name: chapter
+     @ref{chapter,cross ref name,,file name} see cross ref name: (file 
name)chapter
+     @ref{chapter,cross ref name,,,manual} see cross ref name: ()chapter
+     @ref{chapter,cross ref name,title,file name} see cross ref name: (file 
name)chapter
+     @ref{chapter,cross ref name,title,,manual} see cross ref name: ()chapter
+     @ref{chapter,cross ref name,title, file name, manual} see cross ref name: 
(file name)chapter
+     @ref{chapter,,title,file name} see title: (file name)chapter
+     @ref{chapter,,title,,manual} see title: ()chapter
+     @ref{chapter,,title, file name, manual} see title: (file name)chapter
+     @ref{chapter,,,file name,manual} see (file name)chapter::
+
+
+     @ref{(pman)anode,cross ref name} see cross ref name: (pman)anode
+     @ref{(pman)anode,,title} see title: (pman)anode
+     @ref{(pman)anode,,,file name} see (file name)(pman)anode::
+     @ref{(pman)anode,,,,manual} see ()(pman)anode::
+     @ref{(pman)anode,cross ref name,title,} see cross ref name: (pman)anode
+     @ref{(pman)anode,cross ref name,,file name} see cross ref name: (file 
name)(pman)anode
+     @ref{(pman)anode,cross ref name,,,manual} see cross ref name: 
()(pman)anode
+     @ref{(pman)anode,cross ref name,title,file name} see cross ref name: 
(file name)(pman)anode
+     @ref{(pman)anode,cross ref name,title,,manual} see cross ref name: 
()(pman)anode
+     @ref{(pman)anode,cross ref name,title, file name, manual} see cross ref 
name: (file name)(pman)anode
+     @ref{(pman)anode,,title,file name} see title: (file name)(pman)anode
+     @ref{(pman)anode,,title,,manual} see title: ()(pman)anode
+     @ref{(pman)anode,,title, file name, manual} see title: (file 
name)(pman)anode
+     @ref{(pman)anode,,,file name,manual} see (file name)(pman)anode::
+
+
+     @inforef{chapter, cross ref name, file name} see cross ref name: (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::
+     @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{s--ect@comma{}ion, a @comma{} in cross
      ref, a comma@comma{} in file}
-     *note a , in cross
+     see a , in cross
      ref: (a comma, in file)s--ect,ion
 
-     ‘*note chapter::’.
+     ‘see chapter::’.
 
-     *note cross ref with uref uref1 (href://http/myhost.com/index.html): 
(info file with uref3 uref3 (href://http/myhost.com/index3.html))ext
-     *note cross ref with uref uref1 (href://http/myhost.com/index.html): 
chapter
+     see cross ref with uref uref1 (href://http/myhost.com/index.html): (info 
file with uref3 uref3 (href://http/myhost.com/index3.html))ext
+     see cross ref with uref uref1 (href://http/myhost.com/index.html): chapter
 
      *a-strong*
           l--ine
@@ -2241,42 +2231,42 @@ aaa
 
      g--roupe
 
-     @ref{node} *note node::
-
-     @ref{,cross ref name} *note cross ref name:
-     @ref{,,title} *note title:
-     @ref{,,,file name} *note (file name)::
-     @ref{,,,,manual} *note ()::
-     @ref{node,cross ref name} *note cross ref name: node
-     @ref{node,,title} *note title: node
-     @ref{node,,,file name} *note (file name)node::
-     @ref{node,,,,manual} *note ()node::
-     @ref{node,cross ref name,title,} *note cross ref name: node
-     @ref{node,cross ref name,,file name} *note cross ref name: (file name)node
-     @ref{node,cross ref name,,,manual} *note cross ref name: ()node
-     @ref{node,cross ref name,title,file name} *note cross ref name: (file 
name)node
-     @ref{node,cross ref name,title,,manual} *note cross ref name: ()node
-     @ref{node,cross ref name,title, file name, manual} *note cross ref name: 
(file name)node
-     @ref{node,,title,file name} *note title: (file name)node
-     @ref{node,,title,,manual} *note title: ()node
-     @ref{chapter,,title, file name, manual} *note title: (file name)chapter
-     @ref{node,,title, file name, manual} *note title: (file name)node
-     @ref{node,,,file name,manual} *note (file name)node::
-     @ref{,cross ref name,title,} *note cross ref name:
-     @ref{,cross ref name,,file name} *note cross ref name: (file name)
-     @ref{,cross ref name,,,manual} *note cross ref name: ()
-     @ref{,cross ref name,title,file name} *note cross ref name: (file name)
-     @ref{,cross ref name,title,,manual} *note cross ref name: ()
-     @ref{,cross ref name,title, file name, manual} *note cross ref name: 
(file name)
-     @ref{,,title,file name} *note title: (file name)
-     @ref{,,title,,manual} *note title: ()
-     @ref{,,title, file name, manual} *note title: (file name)
-     @ref{,,,file name,manual} *note (file name)::
-
-     @inforef{,cross ref name } *note cross ref name:
-     @inforef{,,file name} *note (file name)::
-     @inforef{,cross ref name, file name} *note cross ref name: (file name)
-     @inforef{} *note ::
+     @ref{node} see node::
+
+     @ref{,cross ref name} see cross ref name:
+     @ref{,,title} see title:
+     @ref{,,,file name} see (file name)::
+     @ref{,,,,manual} see ()::
+     @ref{node,cross ref name} see cross ref name: node
+     @ref{node,,title} see title: node
+     @ref{node,,,file name} see (file name)node::
+     @ref{node,,,,manual} see ()node::
+     @ref{node,cross ref name,title,} see cross ref name: node
+     @ref{node,cross ref name,,file name} see cross ref name: (file name)node
+     @ref{node,cross ref name,,,manual} see cross ref name: ()node
+     @ref{node,cross ref name,title,file name} see cross ref name: (file 
name)node
+     @ref{node,cross ref name,title,,manual} see cross ref name: ()node
+     @ref{node,cross ref name,title, file name, manual} see cross ref name: 
(file name)node
+     @ref{node,,title,file name} see title: (file name)node
+     @ref{node,,title,,manual} see title: ()node
+     @ref{chapter,,title, file name, manual} see title: (file name)chapter
+     @ref{node,,title, file name, manual} see title: (file name)node
+     @ref{node,,,file name,manual} see (file name)node::
+     @ref{,cross ref name,title,} see cross ref name:
+     @ref{,cross ref name,,file name} see cross ref name: (file name)
+     @ref{,cross ref name,,,manual} see cross ref name: ()
+     @ref{,cross ref name,title,file name} see cross ref name: (file name)
+     @ref{,cross ref name,title,,manual} see cross ref name: ()
+     @ref{,cross ref name,title, file name, manual} see cross ref name: (file 
name)
+     @ref{,,title,file name} see title: (file name)
+     @ref{,,title,,manual} see title: ()
+     @ref{,,title, file name, manual} see title: (file name)
+     @ref{,,,file name,manual} see (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 ::
 
 
    Text(7)
@@ -2285,306 +2275,306 @@ aaa
 
 * Menu:
 
-* truc:                                  chapter.            (line 2281)
+* truc:                                  chapter.            (line 2271)
 
    codeidx
 
 * Menu:
 
-* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2281)
+* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2271)
 
    cp
 
 * Menu:
 
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  725)
-* -option <2>:                           chapter.            (line 1433)
-* ?:                                     chapter.            (line 2281)
-* .:                                     chapter.            (line 2281)
+* -option <1>:                           chapter.            (line  720)
+* -option <2>:                           chapter.            (line 1423)
+* ?:                                     chapter.            (line 2271)
+* .:                                     chapter.            (line 2271)
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  725)
-* " <2>:                                 chapter.            (line 1433)
-* a:                                     chapter.            (line 2281)
-* aaa, bbb:                              chapter.            (line 2281)
-* a--a:                                  chapter.            (line 2281)
-* a--asis:                               chapter.            (line  525)
-* a--asis <1>:                           chapter.            (line 1222)
-* a--asis <2>:                           chapter.            (line 2055)
+* " <1>:                                 chapter.            (line  720)
+* " <2>:                                 chapter.            (line 1423)
+* a:                                     chapter.            (line 2271)
+* aaa, bbb:                              chapter.            (line 2271)
+* a--a:                                  chapter.            (line 2271)
+* a--asis:                               chapter.            (line  522)
+* a--asis <1>:                           chapter.            (line 1214)
+* a--asis <2>:                           chapter.            (line 2045)
   aaa, See bbb.
-* b:                                     chapter.            (line  526)
-* b <1>:                                 chapter.            (line 1223)
-* b <2>:                                 chapter.            (line 2056)
-* b--b, c--c:                            chapter.            (line 2281)
+* b:                                     chapter.            (line  523)
+* b <1>:                                 chapter.            (line 1215)
+* b <2>:                                 chapter.            (line 2046)
+* b--b, c--c:                            chapter.            (line 2271)
 * counting entry:                        chapter.            (line    0)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2281)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2271)
 * d--efcv_name:                          chapter.            (line  366)
 * d--efcv_name <1>:                      chapter.            (line  369)
-* d--efcv_name <2>:                      chapter.            (line 1063)
-* d--efcv_name <3>:                      chapter.            (line 1066)
-* d--efcv_name <4>:                      chapter.            (line 1896)
-* d--efcv_name <5>:                      chapter.            (line 1899)
+* d--efcv_name <2>:                      chapter.            (line 1058)
+* d--efcv_name <3>:                      chapter.            (line 1061)
+* d--efcv_name <4>:                      chapter.            (line 1886)
+* d--efcv_name <5>:                      chapter.            (line 1889)
 * d--efivar_name of c--lass:             chapter.            (line  411)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1108)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1941)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1103)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1931)
 * d--efopt_name:                         chapter.            (line  402)
-* d--efopt_name <1>:                     chapter.            (line 1099)
-* d--efopt_name <2>:                     chapter.            (line 1932)
+* d--efopt_name <1>:                     chapter.            (line 1094)
+* d--efopt_name <2>:                     chapter.            (line 1922)
 * 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 1069)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1072)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1902)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1905)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1064)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1067)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1892)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1895)
 * 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 1140)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1143)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1974)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1977)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1135)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1138)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1964)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1967)
 * d--eftypeivar_name of c--lass:         chapter.            (line  414)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1111)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1944)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1106)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1934)
 * d--eftypevar_name:                     chapter.            (line  408)
-* d--eftypevar_name <1>:                 chapter.            (line 1105)
-* d--eftypevar_name <2>:                 chapter.            (line 1938)
+* d--eftypevar_name <1>:                 chapter.            (line 1100)
+* d--eftypevar_name <2>:                 chapter.            (line 1928)
 * d--eftypevr_name:                      chapter.            (line  363)
-* d--eftypevr_name <1>:                  chapter.            (line 1060)
-* d--eftypevr_name <2>:                  chapter.            (line 1893)
+* d--eftypevr_name <1>:                  chapter.            (line 1055)
+* d--eftypevr_name <2>:                  chapter.            (line 1883)
 * d--efvar_name:                         chapter.            (line  396)
 * d--efvar_name <1>:                     chapter.            (line  399)
-* d--efvar_name <2>:                     chapter.            (line 1093)
-* d--efvar_name <3>:                     chapter.            (line 1096)
-* d--efvar_name <4>:                     chapter.            (line 1926)
-* d--efvar_name <5>:                     chapter.            (line 1929)
+* d--efvar_name <2>:                     chapter.            (line 1088)
+* d--efvar_name <3>:                     chapter.            (line 1091)
+* d--efvar_name <4>:                     chapter.            (line 1916)
+* d--efvar_name <5>:                     chapter.            (line 1919)
 * d--efvr_name:                          chapter.            (line  342)
-* d--efvr_name <1>:                      chapter.            (line 1039)
-* d--efvr_name <2>:                      chapter.            (line 1872)
+* d--efvr_name <1>:                      chapter.            (line 1034)
+* d--efvr_name <2>:                      chapter.            (line 1862)
   ddd:                                   See also ccc.
   ddd:                                   See also ccc.
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2281)
-* index entry between item and itemx:    chapter.            (line  530)
-* index entry between item and itemx <1>: chapter.           (line  660)
-* index entry between item and itemx <2>: chapter.           (line 1227)
-* index entry between item and itemx <3>: chapter.           (line 1357)
-* index entry between item and itemx <4>: chapter.           (line 2060)
-* index entry between item and itemx <5>: chapter.           (line 2223)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2271)
+* index entry between item and itemx:    chapter.            (line  527)
+* index entry between item and itemx <1>: chapter.           (line  657)
+* index entry between item and itemx <2>: chapter.           (line 1219)
+* index entry between item and itemx <3>: chapter.           (line 1349)
+* index entry between item and itemx <4>: chapter.           (line 2050)
+* index entry between item and itemx <5>: chapter.           (line 2213)
 * index entry in footnote:               chapter.            (line    0)
 * index entry within deffn:              chapter.            (line  317)
-* index entry within deffn <1>:          chapter.            (line 1014)
-* index entry within deffn <2>:          chapter.            (line 1845)
+* index entry within deffn <1>:          chapter.            (line 1009)
+* index entry within deffn <2>:          chapter.            (line 1835)
 * index entry within itemize:            chapter.            (line  228)
-* index entry within itemize <1>:        chapter.            (line  925)
-* index entry within itemize <2>:        chapter.            (line 1756)
+* index entry within itemize <1>:        chapter.            (line  920)
+* index entry within itemize <2>:        chapter.            (line 1746)
 * index entry within multitable:         chapter.            (line  250)
-* index entry within multitable <1>:     chapter.            (line  947)
-* index entry within multitable <2>:     chapter.            (line 1779)
-* t-ruc:                                 chapter.            (line 2281)
-* T-ruc:                                 chapter.            (line 2281)
+* index entry within multitable <1>:     chapter.            (line  942)
+* index entry within multitable <2>:     chapter.            (line 1769)
+* t-ruc:                                 chapter.            (line 2271)
+* T-ruc:                                 chapter.            (line 2271)
 * vtable i--tem code kbdinputstyle:      chapter.            (line  152)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  849)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1679)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  844)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1669)
 * vtable i--tem default kbdinputstyle:   chapter.            (line  147)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  844)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1674)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  839)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1664)
 * vtable i--tem distinct kbdinputstyle:  chapter.            (line  162)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  859)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1689)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  854)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1679)
 * vtable i--tem example kbdinputstyle:   chapter.            (line  157)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  854)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1684)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  849)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1674)
 * vtable i--tem in example code kbdinputstyle: chapter.      (line  154)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  851)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1681)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  846)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1671)
 * vtable i--tem in example default kbdinputstyle: chapter.   (line  149)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  846)
+                                                             (line  841)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1676)
+                                                             (line 1666)
 * vtable i--tem in example distinct kbdinputstyle: chapter.  (line  164)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  861)
+                                                             (line  856)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1691)
+                                                             (line 1681)
 * vtable i--tem in example example kbdinputstyle: chapter.   (line  159)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  856)
+                                                             (line  851)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1686)
+                                                             (line 1676)
 
    fn
 
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  725)
-* --foption <2>:                         chapter.            (line 1433)
-* ?:                                     chapter.            (line 2281)
-* .:                                     chapter.            (line 2281)
+* --foption <1>:                         chapter.            (line  720)
+* --foption <2>:                         chapter.            (line 1423)
+* ?:                                     chapter.            (line 2271)
+* .:                                     chapter.            (line 2271)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  725)
-* `` <2>:                                chapter.            (line 1433)
+* `` <1>:                                chapter.            (line  720)
+* `` <2>:                                chapter.            (line 1423)
 * a:                                     chapter.            (line  330)
-* a <1>:                                 chapter.            (line  529)
-* a <2>:                                 chapter.            (line  659)
-* a <3>:                                 chapter.            (line 1027)
-* a <4>:                                 chapter.            (line 1226)
-* a <5>:                                 chapter.            (line 1356)
-* a <6>:                                 chapter.            (line 1858)
-* a <7>:                                 chapter.            (line 2059)
-* a <8>:                                 chapter.            (line 2222)
-* a <9>:                                 chapter.            (line 2281)
-* after:                                 chapter.            (line  670)
-* after <1>:                             chapter.            (line 1367)
-* after <2>:                             chapter.            (line 2233)
+* a <1>:                                 chapter.            (line  526)
+* a <2>:                                 chapter.            (line  656)
+* a <3>:                                 chapter.            (line 1022)
+* a <4>:                                 chapter.            (line 1218)
+* a <5>:                                 chapter.            (line 1348)
+* a <6>:                                 chapter.            (line 1848)
+* a <7>:                                 chapter.            (line 2049)
+* a <8>:                                 chapter.            (line 2212)
+* a <9>:                                 chapter.            (line 2271)
+* after:                                 chapter.            (line  667)
+* after <1>:                             chapter.            (line 1359)
+* after <2>:                             chapter.            (line 2223)
 * arg2:                                  chapter.            (line  449)
-* arg2 <1>:                              chapter.            (line 1146)
-* arg2 <2>:                              chapter.            (line 1981)
-* b:                                     chapter.            (line  530)
-* b <1>:                                 chapter.            (line  660)
-* b <2>:                                 chapter.            (line 1227)
-* b <3>:                                 chapter.            (line 1357)
-* b <4>:                                 chapter.            (line 2060)
-* b <5>:                                 chapter.            (line 2223)
+* arg2 <1>:                              chapter.            (line 1141)
+* arg2 <2>:                              chapter.            (line 1971)
+* b:                                     chapter.            (line  527)
+* b <1>:                                 chapter.            (line  657)
+* b <2>:                                 chapter.            (line 1219)
+* b <3>:                                 chapter.            (line 1349)
+* b <4>:                                 chapter.            (line 2050)
+* b <5>:                                 chapter.            (line 2213)
 * bidule machin:                         chapter.            (line  325)
-* bidule machin <1>:                     chapter.            (line 1022)
-* bidule machin <2>:                     chapter.            (line 1853)
+* bidule machin <1>:                     chapter.            (line 1017)
+* bidule machin <2>:                     chapter.            (line 1843)
 * d--effn_name:                          chapter.            (line  309)
-* d--effn_name <1>:                      chapter.            (line 1006)
-* d--effn_name <2>:                      chapter.            (line 1837)
+* d--effn_name <1>:                      chapter.            (line 1001)
+* d--effn_name <2>:                      chapter.            (line 1827)
 * d--efmac_name:                         chapter.            (line  390)
-* d--efmac_name <1>:                     chapter.            (line 1087)
-* d--efmac_name <2>:                     chapter.            (line 1920)
+* d--efmac_name <1>:                     chapter.            (line 1082)
+* d--efmac_name <2>:                     chapter.            (line 1910)
 * d--efmethod_name on c--lass:           chapter.            (line  417)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1114)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1947)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1109)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1937)
 * 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 1075)
-* d--efop_name on c--lass <3>:           chapter.            (line 1078)
-* d--efop_name on c--lass <4>:           chapter.            (line 1908)
-* d--efop_name on c--lass <5>:           chapter.            (line 1911)
+* d--efop_name on c--lass <2>:           chapter.            (line 1070)
+* d--efop_name on c--lass <3>:           chapter.            (line 1073)
+* d--efop_name on c--lass <4>:           chapter.            (line 1898)
+* d--efop_name on c--lass <5>:           chapter.            (line 1901)
 * d--efspec_name:                        chapter.            (line  393)
-* d--efspec_name <1>:                    chapter.            (line 1090)
-* d--efspec_name <2>:                    chapter.            (line 1923)
+* d--efspec_name <1>:                    chapter.            (line 1085)
+* d--efspec_name <2>:                    chapter.            (line 1913)
 * d--eftypefn_name:                      chapter.            (line  351)
 * d--eftypefn_name <1>:                  chapter.            (line  354)
-* d--eftypefn_name <2>:                  chapter.            (line 1048)
-* d--eftypefn_name <3>:                  chapter.            (line 1051)
-* d--eftypefn_name <4>:                  chapter.            (line 1881)
-* d--eftypefn_name <5>:                  chapter.            (line 1884)
+* d--eftypefn_name <2>:                  chapter.            (line 1043)
+* d--eftypefn_name <3>:                  chapter.            (line 1046)
+* d--eftypefn_name <4>:                  chapter.            (line 1871)
+* d--eftypefn_name <5>:                  chapter.            (line 1874)
 * d--eftypefn_name2:                     chapter.            (line  428)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1125)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1959)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1120)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1949)
 * d--eftypefun_name:                     chapter.            (line  405)
-* d--eftypefun_name <1>:                 chapter.            (line 1102)
-* d--eftypefun_name <2>:                 chapter.            (line 1935)
+* d--eftypefun_name <1>:                 chapter.            (line 1097)
+* d--eftypefun_name <2>:                 chapter.            (line 1925)
 * d--eftypemethod_name on c--lass:       chapter.            (line  420)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1117)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1950)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1112)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1940)
 * 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 1054)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1057)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1887)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1890)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1049)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1052)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1877)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1880)
 * 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 1130)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1135)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1964)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1969)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1125)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1130)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1954)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1959)
 * d--efun_name:                          chapter.            (line  387)
-* d--efun_name <1>:                      chapter.            (line 1084)
-* d--efun_name <2>:                      chapter.            (line 1917)
+* d--efun_name <1>:                      chapter.            (line 1079)
+* d--efun_name <2>:                      chapter.            (line 1907)
 * de--ffn_name:                          chapter.            (line  312)
-* de--ffn_name <1>:                      chapter.            (line 1009)
-* de--ffn_name <2>:                      chapter.            (line 1840)
+* de--ffn_name <1>:                      chapter.            (line 1004)
+* de--ffn_name <2>:                      chapter.            (line 1830)
 * deffn:                                 chapter.            (line  333)
 * deffn <1>:                             chapter.            (line  335)
-* deffn <2>:                             chapter.            (line 1030)
-* deffn <3>:                             chapter.            (line 1032)
-* deffn <4>:                             chapter.            (line 1862)
-* deffn <5>:                             chapter.            (line 1864)
+* deffn <2>:                             chapter.            (line 1025)
+* deffn <3>:                             chapter.            (line 1027)
+* deffn <4>:                             chapter.            (line 1852)
+* deffn <5>:                             chapter.            (line 1854)
 * deffnx:                                chapter.            (line  331)
 * deffnx <1>:                            chapter.            (line  336)
-* deffnx <2>:                            chapter.            (line 1028)
-* deffnx <3>:                            chapter.            (line 1033)
-* deffnx <4>:                            chapter.            (line 1859)
-* deffnx <5>:                            chapter.            (line 1865)
-* f---aa:                                chapter.            (line 2281)
+* deffnx <2>:                            chapter.            (line 1023)
+* deffnx <3>:                            chapter.            (line 1028)
+* deffnx <4>:                            chapter.            (line 1849)
+* deffnx <5>:                            chapter.            (line 1855)
+* f---aa:                                chapter.            (line 2271)
   f---aaa, See f---bbb.
-* f---bb, f---cc:                        chapter.            (line 2281)
+* f---bb, f---cc:                        chapter.            (line 2271)
   f---ddd:                               See also f---ccc.
   f---ddd:                               See also f---ccc.
-* f---ddd, f---eee, ffff:                chapter.            (line 2281)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2281)
+* f---ddd, f---eee, ffff:                chapter.            (line 2271)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2271)
 * followed:                              chapter.            (line  328)
-* followed <1>:                          chapter.            (line  668)
-* followed <2>:                          chapter.            (line 1025)
-* followed <3>:                          chapter.            (line 1365)
-* followed <4>:                          chapter.            (line 1856)
-* followed <5>:                          chapter.            (line 2231)
+* followed <1>:                          chapter.            (line  665)
+* followed <2>:                          chapter.            (line 1020)
+* followed <3>:                          chapter.            (line 1357)
+* followed <4>:                          chapter.            (line 1846)
+* followed <5>:                          chapter.            (line 2221)
 * I:                                     chapter.            (line  316)
 * I <1>:                                 chapter.            (line  338)
-* I <2>:                                 chapter.            (line 1013)
-* I <3>:                                 chapter.            (line 1035)
-* I <4>:                                 chapter.            (line 1844)
-* I <5>:                                 chapter.            (line 1867)
+* I <2>:                                 chapter.            (line 1008)
+* I <3>:                                 chapter.            (line 1030)
+* I <4>:                                 chapter.            (line 1834)
+* I <5>:                                 chapter.            (line 1857)
 * id i ule:                              chapter.            (line  322)
-* id i ule <1>:                          chapter.            (line 1019)
-* id i ule <2>:                          chapter.            (line 1850)
+* id i ule <1>:                          chapter.            (line 1014)
+* id i ule <2>:                          chapter.            (line 1840)
 * id ule:                                chapter.            (line  321)
-* id ule <1>:                            chapter.            (line 1018)
-* id ule <2>:                            chapter.            (line 1849)
-* INVALID:                               chapter.            (line  672)
-* INVALID <1>:                           chapter.            (line 1369)
-* INVALID <2>:                           chapter.            (line 2235)
+* id ule <1>:                            chapter.            (line 1013)
+* id ule <2>:                            chapter.            (line 1839)
+* INVALID:                               chapter.            (line  669)
+* INVALID <1>:                           chapter.            (line 1361)
+* INVALID <2>:                           chapter.            (line 2225)
 * log trap:                              chapter.            (line  318)
-* log trap <1>:                          chapter.            (line 1015)
-* log trap <2>:                          chapter.            (line 1846)
+* log trap <1>:                          chapter.            (line 1010)
+* log trap <2>:                          chapter.            (line 1836)
 * log trap1:                             chapter.            (line  319)
-* log trap1 <1>:                         chapter.            (line 1016)
-* log trap1 <2>:                         chapter.            (line 1847)
+* log trap1 <1>:                         chapter.            (line 1011)
+* log trap1 <2>:                         chapter.            (line 1837)
 * log trap2:                             chapter.            (line  320)
-* log trap2 <1>:                         chapter.            (line 1017)
-* log trap2 <2>:                         chapter.            (line 1848)
+* log trap2 <1>:                         chapter.            (line 1012)
+* log trap2 <2>:                         chapter.            (line 1838)
 * machin:                                chapter.            (line  324)
 * machin <1>:                            chapter.            (line  326)
-* machin <2>:                            chapter.            (line  664)
-* machin <3>:                            chapter.            (line  665)
-* machin <4>:                            chapter.            (line  666)
-* machin <5>:                            chapter.            (line  667)
-* machin <6>:                            chapter.            (line 1021)
-* machin <7>:                            chapter.            (line 1023)
-* machin <8>:                            chapter.            (line 1361)
-* machin <9>:                            chapter.            (line 1362)
-* machin <10>:                           chapter.            (line 1363)
-* machin <11>:                           chapter.            (line 1364)
-* machin <12>:                           chapter.            (line 1852)
-* machin <13>:                           chapter.            (line 1854)
-* machin <14>:                           chapter.            (line 2227)
-* machin <15>:                           chapter.            (line 2228)
-* machin <16>:                           chapter.            (line 2229)
-* machin <17>:                           chapter.            (line 2230)
+* machin <2>:                            chapter.            (line  661)
+* machin <3>:                            chapter.            (line  662)
+* machin <4>:                            chapter.            (line  663)
+* machin <5>:                            chapter.            (line  664)
+* machin <6>:                            chapter.            (line 1016)
+* machin <7>:                            chapter.            (line 1018)
+* machin <8>:                            chapter.            (line 1353)
+* machin <9>:                            chapter.            (line 1354)
+* machin <10>:                           chapter.            (line 1355)
+* machin <11>:                           chapter.            (line 1356)
+* machin <12>:                           chapter.            (line 1842)
+* machin <13>:                           chapter.            (line 1844)
+* machin <14>:                           chapter.            (line 2217)
+* machin <15>:                           chapter.            (line 2218)
+* machin <16>:                           chapter.            (line 2219)
+* machin <17>:                           chapter.            (line 2220)
 * n--ame:                                chapter.            (line  345)
 * n--ame <1>:                            chapter.            (line  348)
-* n--ame <2>:                            chapter.            (line 1042)
-* n--ame <3>:                            chapter.            (line 1045)
-* n--ame <4>:                            chapter.            (line 1875)
-* n--ame <5>:                            chapter.            (line 1878)
+* n--ame <2>:                            chapter.            (line 1037)
+* n--ame <3>:                            chapter.            (line 1040)
+* n--ame <4>:                            chapter.            (line 1865)
+* n--ame <5>:                            chapter.            (line 1868)
 * name2:                                 chapter.            (line  423)
-* name2 <1>:                             chapter.            (line 1120)
-* name2 <2>:                             chapter.            (line 1954)
-* t--ruc:                                chapter.            (line 2281)
-* T--ruc:                                chapter.            (line 2281)
+* name2 <1>:                             chapter.            (line 1115)
+* name2 <2>:                             chapter.            (line 1944)
+* t--ruc:                                chapter.            (line 2271)
+* T--ruc:                                chapter.            (line 2271)
 * truc:                                  chapter.            (line  317)
 * truc <1>:                              chapter.            (line  339)
-* truc <2>:                              chapter.            (line 1014)
-* truc <3>:                              chapter.            (line 1036)
-* truc <4>:                              chapter.            (line 1845)
-* truc <5>:                              chapter.            (line 1868)
-* xxx, zzz:                              chapter.            (line 2281)
+* truc <2>:                              chapter.            (line 1009)
+* truc <3>:                              chapter.            (line 1031)
+* truc <4>:                              chapter.            (line 1835)
+* truc <5>:                              chapter.            (line 1858)
+* xxx, zzz:                              chapter.            (line 2271)
 
    vr
 
@@ -2597,8 +2587,8 @@ aaa
 * Menu:
 
 * d--eftp_name:                          chapter.            (line  384)
-* d--eftp_name <1>:                      chapter.            (line 1081)
-* d--eftp_name <2>:                      chapter.            (line 1914)
+* d--eftp_name <1>:                      chapter.            (line 1076)
+* d--eftp_name <2>:                      chapter.            (line 1904)
 
    (8)
 
@@ -2642,291 +2632,291 @@ chapter 2
 * Menu:
 
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  725)
-* -option <2>:                           chapter.            (line 1433)
-* ?:                                     chapter.            (line 2281)
-* .:                                     chapter.            (line 2281)
+* -option <1>:                           chapter.            (line  720)
+* -option <2>:                           chapter.            (line 1423)
+* ?:                                     chapter.            (line 2271)
+* .:                                     chapter.            (line 2271)
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  725)
-* " <2>:                                 chapter.            (line 1433)
-* a:                                     chapter.            (line 2281)
-* aaa, bbb:                              chapter.            (line 2281)
-* a--a:                                  chapter.            (line 2281)
-* a--asis:                               chapter.            (line  525)
-* a--asis <1>:                           chapter.            (line 1222)
-* a--asis <2>:                           chapter.            (line 2055)
+* " <1>:                                 chapter.            (line  720)
+* " <2>:                                 chapter.            (line 1423)
+* a:                                     chapter.            (line 2271)
+* aaa, bbb:                              chapter.            (line 2271)
+* a--a:                                  chapter.            (line 2271)
+* a--asis:                               chapter.            (line  522)
+* a--asis <1>:                           chapter.            (line 1214)
+* a--asis <2>:                           chapter.            (line 2045)
   aaa, See bbb.
-* b:                                     chapter.            (line  526)
-* b <1>:                                 chapter.            (line 1223)
-* b <2>:                                 chapter.            (line 2056)
-* b--b, c--c:                            chapter.            (line 2281)
-* counting entry:                        chapter.            (line 2623)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2281)
+* b:                                     chapter.            (line  523)
+* b <1>:                                 chapter.            (line 1215)
+* b <2>:                                 chapter.            (line 2046)
+* b--b, c--c:                            chapter.            (line 2271)
+* counting entry:                        chapter.            (line 2613)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2271)
 * d--efcv_name:                          chapter.            (line  366)
 * d--efcv_name <1>:                      chapter.            (line  369)
-* d--efcv_name <2>:                      chapter.            (line 1063)
-* d--efcv_name <3>:                      chapter.            (line 1066)
-* d--efcv_name <4>:                      chapter.            (line 1896)
-* d--efcv_name <5>:                      chapter.            (line 1899)
+* d--efcv_name <2>:                      chapter.            (line 1058)
+* d--efcv_name <3>:                      chapter.            (line 1061)
+* d--efcv_name <4>:                      chapter.            (line 1886)
+* d--efcv_name <5>:                      chapter.            (line 1889)
 * d--efivar_name of c--lass:             chapter.            (line  411)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1108)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1941)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1103)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1931)
 * d--efopt_name:                         chapter.            (line  402)
-* d--efopt_name <1>:                     chapter.            (line 1099)
-* d--efopt_name <2>:                     chapter.            (line 1932)
+* d--efopt_name <1>:                     chapter.            (line 1094)
+* d--efopt_name <2>:                     chapter.            (line 1922)
 * 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 1069)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1072)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1902)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1905)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1064)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1067)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1892)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1895)
 * 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 1140)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1143)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1974)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1977)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1135)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1138)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1964)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1967)
 * d--eftypeivar_name of c--lass:         chapter.            (line  414)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1111)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1944)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1106)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1934)
 * d--eftypevar_name:                     chapter.            (line  408)
-* d--eftypevar_name <1>:                 chapter.            (line 1105)
-* d--eftypevar_name <2>:                 chapter.            (line 1938)
+* d--eftypevar_name <1>:                 chapter.            (line 1100)
+* d--eftypevar_name <2>:                 chapter.            (line 1928)
 * d--eftypevr_name:                      chapter.            (line  363)
-* d--eftypevr_name <1>:                  chapter.            (line 1060)
-* d--eftypevr_name <2>:                  chapter.            (line 1893)
+* d--eftypevr_name <1>:                  chapter.            (line 1055)
+* d--eftypevr_name <2>:                  chapter.            (line 1883)
 * d--efvar_name:                         chapter.            (line  396)
 * d--efvar_name <1>:                     chapter.            (line  399)
-* d--efvar_name <2>:                     chapter.            (line 1093)
-* d--efvar_name <3>:                     chapter.            (line 1096)
-* d--efvar_name <4>:                     chapter.            (line 1926)
-* d--efvar_name <5>:                     chapter.            (line 1929)
+* d--efvar_name <2>:                     chapter.            (line 1088)
+* d--efvar_name <3>:                     chapter.            (line 1091)
+* d--efvar_name <4>:                     chapter.            (line 1916)
+* d--efvar_name <5>:                     chapter.            (line 1919)
 * d--efvr_name:                          chapter.            (line  342)
-* d--efvr_name <1>:                      chapter.            (line 1039)
-* d--efvr_name <2>:                      chapter.            (line 1872)
+* d--efvr_name <1>:                      chapter.            (line 1034)
+* d--efvr_name <2>:                      chapter.            (line 1862)
   ddd:                                   See also ccc.
   ddd:                                   See also ccc.
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2281)
-* index entry between item and itemx:    chapter.            (line  530)
-* index entry between item and itemx <1>: chapter.           (line  660)
-* index entry between item and itemx <2>: chapter.           (line 1227)
-* index entry between item and itemx <3>: chapter.           (line 1357)
-* index entry between item and itemx <4>: chapter.           (line 2060)
-* index entry between item and itemx <5>: chapter.           (line 2223)
-* index entry in footnote:               chapter.            (line 2618)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2271)
+* index entry between item and itemx:    chapter.            (line  527)
+* index entry between item and itemx <1>: chapter.           (line  657)
+* index entry between item and itemx <2>: chapter.           (line 1219)
+* index entry between item and itemx <3>: chapter.           (line 1349)
+* index entry between item and itemx <4>: chapter.           (line 2050)
+* index entry between item and itemx <5>: chapter.           (line 2213)
+* index entry in footnote:               chapter.            (line 2608)
 * index entry within deffn:              chapter.            (line  317)
-* index entry within deffn <1>:          chapter.            (line 1014)
-* index entry within deffn <2>:          chapter.            (line 1845)
+* index entry within deffn <1>:          chapter.            (line 1009)
+* index entry within deffn <2>:          chapter.            (line 1835)
 * index entry within itemize:            chapter.            (line  228)
-* index entry within itemize <1>:        chapter.            (line  925)
-* index entry within itemize <2>:        chapter.            (line 1756)
+* index entry within itemize <1>:        chapter.            (line  920)
+* index entry within itemize <2>:        chapter.            (line 1746)
 * index entry within multitable:         chapter.            (line  250)
-* index entry within multitable <1>:     chapter.            (line  947)
-* index entry within multitable <2>:     chapter.            (line 1779)
-* t-ruc:                                 chapter.            (line 2281)
-* T-ruc:                                 chapter.            (line 2281)
+* index entry within multitable <1>:     chapter.            (line  942)
+* index entry within multitable <2>:     chapter.            (line 1769)
+* t-ruc:                                 chapter.            (line 2271)
+* T-ruc:                                 chapter.            (line 2271)
 * vtable i--tem code kbdinputstyle:      chapter.            (line  152)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  849)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1679)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  844)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1669)
 * vtable i--tem default kbdinputstyle:   chapter.            (line  147)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  844)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1674)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  839)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1664)
 * vtable i--tem distinct kbdinputstyle:  chapter.            (line  162)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  859)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1689)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  854)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1679)
 * vtable i--tem example kbdinputstyle:   chapter.            (line  157)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  854)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1684)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  849)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1674)
 * vtable i--tem in example code kbdinputstyle: chapter.      (line  154)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  851)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1681)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  846)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1671)
 * vtable i--tem in example default kbdinputstyle: chapter.   (line  149)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  846)
+                                                             (line  841)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1676)
+                                                             (line 1666)
 * vtable i--tem in example distinct kbdinputstyle: chapter.  (line  164)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  861)
+                                                             (line  856)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1691)
+                                                             (line 1681)
 * vtable i--tem in example example kbdinputstyle: chapter.   (line  159)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  856)
+                                                             (line  851)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1686)
+                                                             (line 1676)
 
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  725)
-* --foption <2>:                         chapter.            (line 1433)
-* ?:                                     chapter.            (line 2281)
-* .:                                     chapter.            (line 2281)
+* --foption <1>:                         chapter.            (line  720)
+* --foption <2>:                         chapter.            (line 1423)
+* ?:                                     chapter.            (line 2271)
+* .:                                     chapter.            (line 2271)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  725)
-* `` <2>:                                chapter.            (line 1433)
+* `` <1>:                                chapter.            (line  720)
+* `` <2>:                                chapter.            (line 1423)
 * a:                                     chapter.            (line  330)
-* a <1>:                                 chapter.            (line  529)
-* a <2>:                                 chapter.            (line  659)
-* a <3>:                                 chapter.            (line 1027)
-* a <4>:                                 chapter.            (line 1226)
-* a <5>:                                 chapter.            (line 1356)
-* a <6>:                                 chapter.            (line 1858)
-* a <7>:                                 chapter.            (line 2059)
-* a <8>:                                 chapter.            (line 2222)
-* a <9>:                                 chapter.            (line 2281)
-* after:                                 chapter.            (line  670)
-* after <1>:                             chapter.            (line 1367)
-* after <2>:                             chapter.            (line 2233)
+* a <1>:                                 chapter.            (line  526)
+* a <2>:                                 chapter.            (line  656)
+* a <3>:                                 chapter.            (line 1022)
+* a <4>:                                 chapter.            (line 1218)
+* a <5>:                                 chapter.            (line 1348)
+* a <6>:                                 chapter.            (line 1848)
+* a <7>:                                 chapter.            (line 2049)
+* a <8>:                                 chapter.            (line 2212)
+* a <9>:                                 chapter.            (line 2271)
+* after:                                 chapter.            (line  667)
+* after <1>:                             chapter.            (line 1359)
+* after <2>:                             chapter.            (line 2223)
 * arg2:                                  chapter.            (line  449)
-* arg2 <1>:                              chapter.            (line 1146)
-* arg2 <2>:                              chapter.            (line 1981)
-* b:                                     chapter.            (line  530)
-* b <1>:                                 chapter.            (line  660)
-* b <2>:                                 chapter.            (line 1227)
-* b <3>:                                 chapter.            (line 1357)
-* b <4>:                                 chapter.            (line 2060)
-* b <5>:                                 chapter.            (line 2223)
+* arg2 <1>:                              chapter.            (line 1141)
+* arg2 <2>:                              chapter.            (line 1971)
+* b:                                     chapter.            (line  527)
+* b <1>:                                 chapter.            (line  657)
+* b <2>:                                 chapter.            (line 1219)
+* b <3>:                                 chapter.            (line 1349)
+* b <4>:                                 chapter.            (line 2050)
+* b <5>:                                 chapter.            (line 2213)
 * bidule machin:                         chapter.            (line  325)
-* bidule machin <1>:                     chapter.            (line 1022)
-* bidule machin <2>:                     chapter.            (line 1853)
+* bidule machin <1>:                     chapter.            (line 1017)
+* bidule machin <2>:                     chapter.            (line 1843)
 * d--effn_name:                          chapter.            (line  309)
-* d--effn_name <1>:                      chapter.            (line 1006)
-* d--effn_name <2>:                      chapter.            (line 1837)
+* d--effn_name <1>:                      chapter.            (line 1001)
+* d--effn_name <2>:                      chapter.            (line 1827)
 * d--efmac_name:                         chapter.            (line  390)
-* d--efmac_name <1>:                     chapter.            (line 1087)
-* d--efmac_name <2>:                     chapter.            (line 1920)
+* d--efmac_name <1>:                     chapter.            (line 1082)
+* d--efmac_name <2>:                     chapter.            (line 1910)
 * d--efmethod_name on c--lass:           chapter.            (line  417)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1114)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1947)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1109)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1937)
 * 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 1075)
-* d--efop_name on c--lass <3>:           chapter.            (line 1078)
-* d--efop_name on c--lass <4>:           chapter.            (line 1908)
-* d--efop_name on c--lass <5>:           chapter.            (line 1911)
+* d--efop_name on c--lass <2>:           chapter.            (line 1070)
+* d--efop_name on c--lass <3>:           chapter.            (line 1073)
+* d--efop_name on c--lass <4>:           chapter.            (line 1898)
+* d--efop_name on c--lass <5>:           chapter.            (line 1901)
 * d--efspec_name:                        chapter.            (line  393)
-* d--efspec_name <1>:                    chapter.            (line 1090)
-* d--efspec_name <2>:                    chapter.            (line 1923)
+* d--efspec_name <1>:                    chapter.            (line 1085)
+* d--efspec_name <2>:                    chapter.            (line 1913)
 * d--eftypefn_name:                      chapter.            (line  351)
 * d--eftypefn_name <1>:                  chapter.            (line  354)
-* d--eftypefn_name <2>:                  chapter.            (line 1048)
-* d--eftypefn_name <3>:                  chapter.            (line 1051)
-* d--eftypefn_name <4>:                  chapter.            (line 1881)
-* d--eftypefn_name <5>:                  chapter.            (line 1884)
+* d--eftypefn_name <2>:                  chapter.            (line 1043)
+* d--eftypefn_name <3>:                  chapter.            (line 1046)
+* d--eftypefn_name <4>:                  chapter.            (line 1871)
+* d--eftypefn_name <5>:                  chapter.            (line 1874)
 * d--eftypefn_name2:                     chapter.            (line  428)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1125)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1959)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1120)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1949)
 * d--eftypefun_name:                     chapter.            (line  405)
-* d--eftypefun_name <1>:                 chapter.            (line 1102)
-* d--eftypefun_name <2>:                 chapter.            (line 1935)
+* d--eftypefun_name <1>:                 chapter.            (line 1097)
+* d--eftypefun_name <2>:                 chapter.            (line 1925)
 * d--eftypemethod_name on c--lass:       chapter.            (line  420)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1117)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1950)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1112)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1940)
 * 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 1054)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1057)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1887)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1890)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1049)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1052)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1877)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1880)
 * 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 1130)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1135)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1964)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1969)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1125)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1130)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1954)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1959)
 * d--efun_name:                          chapter.            (line  387)
-* d--efun_name <1>:                      chapter.            (line 1084)
-* d--efun_name <2>:                      chapter.            (line 1917)
+* d--efun_name <1>:                      chapter.            (line 1079)
+* d--efun_name <2>:                      chapter.            (line 1907)
 * de--ffn_name:                          chapter.            (line  312)
-* de--ffn_name <1>:                      chapter.            (line 1009)
-* de--ffn_name <2>:                      chapter.            (line 1840)
+* de--ffn_name <1>:                      chapter.            (line 1004)
+* de--ffn_name <2>:                      chapter.            (line 1830)
 * deffn:                                 chapter.            (line  333)
 * deffn <1>:                             chapter.            (line  335)
-* deffn <2>:                             chapter.            (line 1030)
-* deffn <3>:                             chapter.            (line 1032)
-* deffn <4>:                             chapter.            (line 1862)
-* deffn <5>:                             chapter.            (line 1864)
+* deffn <2>:                             chapter.            (line 1025)
+* deffn <3>:                             chapter.            (line 1027)
+* deffn <4>:                             chapter.            (line 1852)
+* deffn <5>:                             chapter.            (line 1854)
 * deffnx:                                chapter.            (line  331)
 * deffnx <1>:                            chapter.            (line  336)
-* deffnx <2>:                            chapter.            (line 1028)
-* deffnx <3>:                            chapter.            (line 1033)
-* deffnx <4>:                            chapter.            (line 1859)
-* deffnx <5>:                            chapter.            (line 1865)
-* f---aa:                                chapter.            (line 2281)
+* deffnx <2>:                            chapter.            (line 1023)
+* deffnx <3>:                            chapter.            (line 1028)
+* deffnx <4>:                            chapter.            (line 1849)
+* deffnx <5>:                            chapter.            (line 1855)
+* f---aa:                                chapter.            (line 2271)
   f---aaa, See f---bbb.
-* f---bb, f---cc:                        chapter.            (line 2281)
+* f---bb, f---cc:                        chapter.            (line 2271)
   f---ddd:                               See also f---ccc.
   f---ddd:                               See also f---ccc.
-* f---ddd, f---eee, ffff:                chapter.            (line 2281)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2281)
+* f---ddd, f---eee, ffff:                chapter.            (line 2271)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2271)
 * followed:                              chapter.            (line  328)
-* followed <1>:                          chapter.            (line  668)
-* followed <2>:                          chapter.            (line 1025)
-* followed <3>:                          chapter.            (line 1365)
-* followed <4>:                          chapter.            (line 1856)
-* followed <5>:                          chapter.            (line 2231)
+* followed <1>:                          chapter.            (line  665)
+* followed <2>:                          chapter.            (line 1020)
+* followed <3>:                          chapter.            (line 1357)
+* followed <4>:                          chapter.            (line 1846)
+* followed <5>:                          chapter.            (line 2221)
 * I:                                     chapter.            (line  316)
 * I <1>:                                 chapter.            (line  338)
-* I <2>:                                 chapter.            (line 1013)
-* I <3>:                                 chapter.            (line 1035)
-* I <4>:                                 chapter.            (line 1844)
-* I <5>:                                 chapter.            (line 1867)
+* I <2>:                                 chapter.            (line 1008)
+* I <3>:                                 chapter.            (line 1030)
+* I <4>:                                 chapter.            (line 1834)
+* I <5>:                                 chapter.            (line 1857)
 * id i ule:                              chapter.            (line  322)
-* id i ule <1>:                          chapter.            (line 1019)
-* id i ule <2>:                          chapter.            (line 1850)
+* id i ule <1>:                          chapter.            (line 1014)
+* id i ule <2>:                          chapter.            (line 1840)
 * id ule:                                chapter.            (line  321)
-* id ule <1>:                            chapter.            (line 1018)
-* id ule <2>:                            chapter.            (line 1849)
-* INVALID:                               chapter.            (line  672)
-* INVALID <1>:                           chapter.            (line 1369)
-* INVALID <2>:                           chapter.            (line 2235)
+* id ule <1>:                            chapter.            (line 1013)
+* id ule <2>:                            chapter.            (line 1839)
+* INVALID:                               chapter.            (line  669)
+* INVALID <1>:                           chapter.            (line 1361)
+* INVALID <2>:                           chapter.            (line 2225)
 * log trap:                              chapter.            (line  318)
-* log trap <1>:                          chapter.            (line 1015)
-* log trap <2>:                          chapter.            (line 1846)
+* log trap <1>:                          chapter.            (line 1010)
+* log trap <2>:                          chapter.            (line 1836)
 * log trap1:                             chapter.            (line  319)
-* log trap1 <1>:                         chapter.            (line 1016)
-* log trap1 <2>:                         chapter.            (line 1847)
+* log trap1 <1>:                         chapter.            (line 1011)
+* log trap1 <2>:                         chapter.            (line 1837)
 * log trap2:                             chapter.            (line  320)
-* log trap2 <1>:                         chapter.            (line 1017)
-* log trap2 <2>:                         chapter.            (line 1848)
+* log trap2 <1>:                         chapter.            (line 1012)
+* log trap2 <2>:                         chapter.            (line 1838)
 * machin:                                chapter.            (line  324)
 * machin <1>:                            chapter.            (line  326)
-* machin <2>:                            chapter.            (line  664)
-* machin <3>:                            chapter.            (line  665)
-* machin <4>:                            chapter.            (line  666)
-* machin <5>:                            chapter.            (line  667)
-* machin <6>:                            chapter.            (line 1021)
-* machin <7>:                            chapter.            (line 1023)
-* machin <8>:                            chapter.            (line 1361)
-* machin <9>:                            chapter.            (line 1362)
-* machin <10>:                           chapter.            (line 1363)
-* machin <11>:                           chapter.            (line 1364)
-* machin <12>:                           chapter.            (line 1852)
-* machin <13>:                           chapter.            (line 1854)
-* machin <14>:                           chapter.            (line 2227)
-* machin <15>:                           chapter.            (line 2228)
-* machin <16>:                           chapter.            (line 2229)
-* machin <17>:                           chapter.            (line 2230)
+* machin <2>:                            chapter.            (line  661)
+* machin <3>:                            chapter.            (line  662)
+* machin <4>:                            chapter.            (line  663)
+* machin <5>:                            chapter.            (line  664)
+* machin <6>:                            chapter.            (line 1016)
+* machin <7>:                            chapter.            (line 1018)
+* machin <8>:                            chapter.            (line 1353)
+* machin <9>:                            chapter.            (line 1354)
+* machin <10>:                           chapter.            (line 1355)
+* machin <11>:                           chapter.            (line 1356)
+* machin <12>:                           chapter.            (line 1842)
+* machin <13>:                           chapter.            (line 1844)
+* machin <14>:                           chapter.            (line 2217)
+* machin <15>:                           chapter.            (line 2218)
+* machin <16>:                           chapter.            (line 2219)
+* machin <17>:                           chapter.            (line 2220)
 * n--ame:                                chapter.            (line  345)
 * n--ame <1>:                            chapter.            (line  348)
-* n--ame <2>:                            chapter.            (line 1042)
-* n--ame <3>:                            chapter.            (line 1045)
-* n--ame <4>:                            chapter.            (line 1875)
-* n--ame <5>:                            chapter.            (line 1878)
+* n--ame <2>:                            chapter.            (line 1037)
+* n--ame <3>:                            chapter.            (line 1040)
+* n--ame <4>:                            chapter.            (line 1865)
+* n--ame <5>:                            chapter.            (line 1868)
 * name2:                                 chapter.            (line  423)
-* name2 <1>:                             chapter.            (line 1120)
-* name2 <2>:                             chapter.            (line 1954)
-* t--ruc:                                chapter.            (line 2281)
-* T--ruc:                                chapter.            (line 2281)
+* name2 <1>:                             chapter.            (line 1115)
+* name2 <2>:                             chapter.            (line 1944)
+* t--ruc:                                chapter.            (line 2271)
+* T--ruc:                                chapter.            (line 2271)
 * truc:                                  chapter.            (line  317)
 * truc <1>:                              chapter.            (line  339)
-* truc <2>:                              chapter.            (line 1014)
-* truc <3>:                              chapter.            (line 1036)
-* truc <4>:                              chapter.            (line 1845)
-* truc <5>:                              chapter.            (line 1868)
-* xxx, zzz:                              chapter.            (line 2281)
+* truc <2>:                              chapter.            (line 1009)
+* truc <3>:                              chapter.            (line 1031)
+* truc <4>:                              chapter.            (line 1835)
+* truc <5>:                              chapter.            (line 1858)
+* xxx, zzz:                              chapter.            (line 2271)
 
 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 0bbca165cb..a993e27f11 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
@@ -451,74 +451,71 @@ s-mallformat
      fff2
 
    '@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file n---ame@@,
-ma---nual@@}' *Note cross r--ef name@: (file n---ame@)c---hapter@.
-'@ref{chapter, cross ref name, title, file name, manual}' *note cross
-ref name: (file name)chapter '@pxref{chapter, cross ref name, title,
-file name, manual}' *note cross ref name: (file name)chapter
-'@inforef{chapter, cross ref name, file name}' *note cross ref name:
-(file name)chapter
-
-   '@ref{chapter}' *note chapter:: '@xref{chapter}' *Note chapter::.
-'@pxref{chapter}' *note chapter:: '@ref{s--ect@comma{}ion}' *note
+ma---nual@@}' See cross r--ef name@: (file n---ame@)c---hapter@.
+'@ref{chapter, cross ref name, title, file name, manual}' see cross ref
+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}' see chapter:: '@xref{chapter}' See chapter::.
+'@pxref{chapter}' see chapter:: '@ref{s--ect@comma{}ion}' see
 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 }' *note a ,
-in cross ref: (a comma, in file)s--ect,ion
-
-   '@ref{chapter,cross ref name}' *note cross ref name: chapter
-'@ref{chapter,,title}' *note title: chapter '@ref{chapter,,,file name}'
-*note (file name)chapter:: '@ref{chapter,,,,manual}' *note ()chapter::
-'@ref{chapter,cross ref name,title,}' *note cross ref name: chapter
-'@ref{chapter,cross ref name,,file name}' *note cross ref name: (file
-name)chapter '@ref{chapter,cross ref name,,,manual}' *note cross ref
-name: ()chapter '@ref{chapter,cross ref name,title,file name}' *note
-cross ref name: (file name)chapter '@ref{chapter,cross ref
-name,title,,manual}' *note cross ref name: ()chapter '@ref{chapter,cross
-ref name,title, file name, manual}' *note cross ref name: (file
-name)chapter '@ref{chapter,,title,file name}' *note title: (file
-name)chapter '@ref{chapter,,title,,manual}' *note title: ()chapter
-'@ref{chapter,,title, file name, manual}' *note title: (file
-name)chapter '@ref{chapter,,,file name,manual}' *note (file
-name)chapter::
-
-   '@ref{(pman)anode,cross ref name}' *note cross ref name: (pman)anode
-'@ref{(pman)anode,,title}' *note title: (pman)anode
-'@ref{(pman)anode,,,file name}' *note (file name)(pman)anode::
-'@ref{(pman)anode,,,,manual}' *note ()(pman)anode::
-'@ref{(pman)anode,cross ref name,title,}' *note cross ref name:
-(pman)anode '@ref{(pman)anode,cross ref name,,file name}' *note cross
-ref name: (file name)(pman)anode '@ref{(pman)anode,cross ref
-name,,,manual}' *note cross ref name: ()(pman)anode
-'@ref{(pman)anode,cross ref name,title,file name}' *note cross ref name:
-(file name)(pman)anode '@ref{(pman)anode,cross ref name,title,,manual}'
-*note cross ref name: ()(pman)anode '@ref{(pman)anode,cross ref
-name,title, file name, manual}' *note cross ref name: (file
-name)(pman)anode '@ref{(pman)anode,,title,file name}' *note title: (file
-name)(pman)anode '@ref{(pman)anode,,title,,manual}' *note title:
-()(pman)anode '@ref{(pman)anode,,title, file name, manual}' *note title:
-(file name)(pman)anode '@ref{(pman)anode,,,file name,manual}' *note
-(file name)(pman)anode::
-
-   '@inforef{chapter, cross ref name, file name}' *note cross ref name:
-(file name)chapter '@inforef{chapter}' *note chapter::
-'@inforef{chapter, cross ref name}' *note cross ref name: chapter
-'@inforef{chapter,,file name}' *note (file name)chapter::
-'@inforef{node, cross ref name, file name}' *note cross ref name: (file
-name)node '@inforef{node}' *note node:: '@inforef{node, cross ref name}'
-*note cross ref name: node '@inforef{node,,file name}' *note (file
-name)node:: '@inforef{chapter, cross ref name, file name, spurious arg}'
-*note cross ref name: (file name, spurious arg)chapter
+title, a comma@comma{} in file, a @comma{} in manual name }' see a , in
+cross ref: (a comma, in file)s--ect,ion
+
+   '@ref{chapter,cross ref name}' see cross ref name: chapter
+'@ref{chapter,,title}' see title: chapter '@ref{chapter,,,file name}'
+see (file name)chapter:: '@ref{chapter,,,,manual}' see ()chapter::
+'@ref{chapter,cross ref name,title,}' see cross ref name: chapter
+'@ref{chapter,cross ref name,,file name}' see cross ref name: (file
+name)chapter '@ref{chapter,cross ref name,,,manual}' see cross ref name:
+()chapter '@ref{chapter,cross ref name,title,file name}' see cross ref
+name: (file name)chapter '@ref{chapter,cross ref name,title,,manual}'
+see cross ref name: ()chapter '@ref{chapter,cross ref name,title, file
+name, manual}' see cross ref name: (file name)chapter
+'@ref{chapter,,title,file name}' see title: (file name)chapter
+'@ref{chapter,,title,,manual}' see title: ()chapter
+'@ref{chapter,,title, file name, manual}' see title: (file name)chapter
+'@ref{chapter,,,file name,manual}' see (file name)chapter::
+
+   '@ref{(pman)anode,cross ref name}' see cross ref name: (pman)anode
+'@ref{(pman)anode,,title}' see title: (pman)anode
+'@ref{(pman)anode,,,file name}' see (file name)(pman)anode::
+'@ref{(pman)anode,,,,manual}' see ()(pman)anode::
+'@ref{(pman)anode,cross ref name,title,}' see cross ref name:
+(pman)anode '@ref{(pman)anode,cross ref name,,file name}' see cross ref
+name: (file name)(pman)anode '@ref{(pman)anode,cross ref name,,,manual}'
+see cross ref name: ()(pman)anode '@ref{(pman)anode,cross ref
+name,title,file name}' see cross ref name: (file name)(pman)anode
+'@ref{(pman)anode,cross ref name,title,,manual}' see cross ref name:
+()(pman)anode '@ref{(pman)anode,cross ref name,title, file name,
+manual}' see cross ref name: (file name)(pman)anode
+'@ref{(pman)anode,,title,file name}' see title: (file name)(pman)anode
+'@ref{(pman)anode,,title,,manual}' see title: ()(pman)anode
+'@ref{(pman)anode,,title, file name, manual}' see title: (file
+name)(pman)anode '@ref{(pman)anode,,,file name,manual}' see (file
+name)(pman)anode::
+
+   '@inforef{chapter, cross ref name, file name}' see cross ref name:
+(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::
+'@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{s--ect@comma{}ion, a @comma{} in cross ref, a comma@comma{}
-in file}' *note a , in cross ref: (a comma, in file)s--ect,ion
+in file}' see a , in cross ref: (a comma, in file)s--ect,ion
 
-   '*note chapter::'.
+   'see chapter::'.
 
-   *note cross ref with uref uref1 (href://http/myhost.com/index.html):
-(info file with uref3 uref3 (href://http/myhost.com/index3.html))ext
-*note cross ref with uref uref1 (href://http/myhost.com/index.html):
-chapter
+   see cross ref with uref uref1 (href://http/myhost.com/index.html):
+(info file with uref3 uref3 (href://http/myhost.com/index3.html))ext see
+cross ref with uref uref1 (href://http/myhost.com/index.html): chapter
 
 *a-strong*
      l-ine
@@ -678,38 +675,36 @@ b
 
    g-roupe
 
-   '@ref{node}' *note node::
-
-   '@ref{,cross ref name}' *note cross ref name: '@ref{,,title}' *note
-title: '@ref{,,,file name}' *note (file name):: '@ref{,,,,manual}' *note
-():: '@ref{node,cross ref name}' *note cross ref name: node
-'@ref{node,,title}' *note title: node '@ref{node,,,file name}' *note
-(file name)node:: '@ref{node,,,,manual}' *note ()node:: '@ref{node,cross
-ref name,title,}' *note cross ref name: node '@ref{node,cross ref
-name,,file name}' *note cross ref name: (file name)node '@ref{node,cross
-ref name,,,manual}' *note cross ref name: ()node '@ref{node,cross ref
-name,title,file name}' *note cross ref name: (file name)node
-'@ref{node,cross ref name,title,,manual}' *note cross ref name: ()node
-'@ref{node,cross ref name,title, file name, manual}' *note cross ref
-name: (file name)node '@ref{node,,title,file name}' *note title: (file
-name)node '@ref{node,,title,,manual}' *note title: ()node
-'@ref{chapter,,title, file name, manual}' *note title: (file
-name)chapter '@ref{node,,title, file name, manual}' *note title: (file
-name)node '@ref{node,,,file name,manual}' *note (file name)node::
-'@ref{,cross ref name,title,}' *note cross ref name: '@ref{,cross ref
-name,,file name}' *note cross ref name: (file name) '@ref{,cross ref
-name,,,manual}' *note cross ref name: () '@ref{,cross ref
-name,title,file name}' *note cross ref name: (file name) '@ref{,cross
-ref name,title,,manual}' *note cross ref name: () '@ref{,cross ref
-name,title, file name, manual}' *note cross ref name: (file name)
-'@ref{,,title,file name}' *note title: (file name)
-'@ref{,,title,,manual}' *note title: () '@ref{,,title, file name,
-manual}' *note title: (file name) '@ref{,,,file name,manual}' *note
-(file name)::
-
-   '@inforef{,cross ref name }' *note cross ref name: '@inforef{,,file
-name}' *note (file name):: '@inforef{,cross ref name, file name}' *note
-cross ref name: (file name) '@inforef{}' *note ::
+   '@ref{node}' see node::
+
+   '@ref{,cross ref name}' see cross ref name: '@ref{,,title}' see
+title: '@ref{,,,file name}' see (file name):: '@ref{,,,,manual}' see
+():: '@ref{node,cross ref name}' see cross ref name: node
+'@ref{node,,title}' see title: node '@ref{node,,,file name}' see (file
+name)node:: '@ref{node,,,,manual}' see ()node:: '@ref{node,cross ref
+name,title,}' see cross ref name: node '@ref{node,cross ref name,,file
+name}' see cross ref name: (file name)node '@ref{node,cross ref
+name,,,manual}' see cross ref name: ()node '@ref{node,cross ref
+name,title,file name}' see cross ref name: (file name)node
+'@ref{node,cross ref name,title,,manual}' see cross ref name: ()node
+'@ref{node,cross ref name,title, file name, manual}' see cross ref name:
+(file name)node '@ref{node,,title,file name}' see title: (file name)node
+'@ref{node,,title,,manual}' see title: ()node '@ref{chapter,,title, file
+name, manual}' see title: (file name)chapter '@ref{node,,title, file
+name, manual}' see title: (file name)node '@ref{node,,,file
+name,manual}' see (file name)node:: '@ref{,cross ref name,title,}' see
+cross ref name: '@ref{,cross ref name,,file name}' see cross ref name:
+(file name) '@ref{,cross ref name,,,manual}' see cross ref name: ()
+'@ref{,cross ref name,title,file name}' see cross ref name: (file name)
+'@ref{,cross ref name,title,,manual}' see cross ref name: ()
+'@ref{,cross ref name,title, file name, manual}' see cross ref name:
+(file name) '@ref{,,title,file name}' see title: (file name)
+'@ref{,,title,,manual}' see title: () '@ref{,,title, file name, manual}'
+see title: (file name) '@ref{,,,file name,manual}' see (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 ::
 
    Normal text
 
@@ -1148,74 +1143,71 @@ s-mallformat
      fff2
 
    '@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file n---ame@@,
-ma---nual@@}' *Note cross r--ef name@: (file n---ame@)c---hapter@.
-'@ref{chapter, cross ref name, title, file name, manual}' *note cross
-ref name: (file name)chapter '@pxref{chapter, cross ref name, title,
-file name, manual}' *note cross ref name: (file name)chapter
-'@inforef{chapter, cross ref name, file name}' *note cross ref name:
-(file name)chapter
-
-   '@ref{chapter}' *note chapter:: '@xref{chapter}' *Note chapter::.
-'@pxref{chapter}' *note chapter:: '@ref{s--ect@comma{}ion}' *note
+ma---nual@@}' See cross r--ef name@: (file n---ame@)c---hapter@.
+'@ref{chapter, cross ref name, title, file name, manual}' see cross ref
+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}' see chapter:: '@xref{chapter}' See chapter::.
+'@pxref{chapter}' see chapter:: '@ref{s--ect@comma{}ion}' see
 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 }' *note a ,
-in cross ref: (a comma, in file)s--ect,ion
-
-   '@ref{chapter,cross ref name}' *note cross ref name: chapter
-'@ref{chapter,,title}' *note title: chapter '@ref{chapter,,,file name}'
-*note (file name)chapter:: '@ref{chapter,,,,manual}' *note ()chapter::
-'@ref{chapter,cross ref name,title,}' *note cross ref name: chapter
-'@ref{chapter,cross ref name,,file name}' *note cross ref name: (file
-name)chapter '@ref{chapter,cross ref name,,,manual}' *note cross ref
-name: ()chapter '@ref{chapter,cross ref name,title,file name}' *note
-cross ref name: (file name)chapter '@ref{chapter,cross ref
-name,title,,manual}' *note cross ref name: ()chapter '@ref{chapter,cross
-ref name,title, file name, manual}' *note cross ref name: (file
-name)chapter '@ref{chapter,,title,file name}' *note title: (file
-name)chapter '@ref{chapter,,title,,manual}' *note title: ()chapter
-'@ref{chapter,,title, file name, manual}' *note title: (file
-name)chapter '@ref{chapter,,,file name,manual}' *note (file
-name)chapter::
-
-   '@ref{(pman)anode,cross ref name}' *note cross ref name: (pman)anode
-'@ref{(pman)anode,,title}' *note title: (pman)anode
-'@ref{(pman)anode,,,file name}' *note (file name)(pman)anode::
-'@ref{(pman)anode,,,,manual}' *note ()(pman)anode::
-'@ref{(pman)anode,cross ref name,title,}' *note cross ref name:
-(pman)anode '@ref{(pman)anode,cross ref name,,file name}' *note cross
-ref name: (file name)(pman)anode '@ref{(pman)anode,cross ref
-name,,,manual}' *note cross ref name: ()(pman)anode
-'@ref{(pman)anode,cross ref name,title,file name}' *note cross ref name:
-(file name)(pman)anode '@ref{(pman)anode,cross ref name,title,,manual}'
-*note cross ref name: ()(pman)anode '@ref{(pman)anode,cross ref
-name,title, file name, manual}' *note cross ref name: (file
-name)(pman)anode '@ref{(pman)anode,,title,file name}' *note title: (file
-name)(pman)anode '@ref{(pman)anode,,title,,manual}' *note title:
-()(pman)anode '@ref{(pman)anode,,title, file name, manual}' *note title:
-(file name)(pman)anode '@ref{(pman)anode,,,file name,manual}' *note
-(file name)(pman)anode::
-
-   '@inforef{chapter, cross ref name, file name}' *note cross ref name:
-(file name)chapter '@inforef{chapter}' *note chapter::
-'@inforef{chapter, cross ref name}' *note cross ref name: chapter
-'@inforef{chapter,,file name}' *note (file name)chapter::
-'@inforef{node, cross ref name, file name}' *note cross ref name: (file
-name)node '@inforef{node}' *note node:: '@inforef{node, cross ref name}'
-*note cross ref name: node '@inforef{node,,file name}' *note (file
-name)node:: '@inforef{chapter, cross ref name, file name, spurious arg}'
-*note cross ref name: (file name, spurious arg)chapter
+title, a comma@comma{} in file, a @comma{} in manual name }' see a , in
+cross ref: (a comma, in file)s--ect,ion
+
+   '@ref{chapter,cross ref name}' see cross ref name: chapter
+'@ref{chapter,,title}' see title: chapter '@ref{chapter,,,file name}'
+see (file name)chapter:: '@ref{chapter,,,,manual}' see ()chapter::
+'@ref{chapter,cross ref name,title,}' see cross ref name: chapter
+'@ref{chapter,cross ref name,,file name}' see cross ref name: (file
+name)chapter '@ref{chapter,cross ref name,,,manual}' see cross ref name:
+()chapter '@ref{chapter,cross ref name,title,file name}' see cross ref
+name: (file name)chapter '@ref{chapter,cross ref name,title,,manual}'
+see cross ref name: ()chapter '@ref{chapter,cross ref name,title, file
+name, manual}' see cross ref name: (file name)chapter
+'@ref{chapter,,title,file name}' see title: (file name)chapter
+'@ref{chapter,,title,,manual}' see title: ()chapter
+'@ref{chapter,,title, file name, manual}' see title: (file name)chapter
+'@ref{chapter,,,file name,manual}' see (file name)chapter::
+
+   '@ref{(pman)anode,cross ref name}' see cross ref name: (pman)anode
+'@ref{(pman)anode,,title}' see title: (pman)anode
+'@ref{(pman)anode,,,file name}' see (file name)(pman)anode::
+'@ref{(pman)anode,,,,manual}' see ()(pman)anode::
+'@ref{(pman)anode,cross ref name,title,}' see cross ref name:
+(pman)anode '@ref{(pman)anode,cross ref name,,file name}' see cross ref
+name: (file name)(pman)anode '@ref{(pman)anode,cross ref name,,,manual}'
+see cross ref name: ()(pman)anode '@ref{(pman)anode,cross ref
+name,title,file name}' see cross ref name: (file name)(pman)anode
+'@ref{(pman)anode,cross ref name,title,,manual}' see cross ref name:
+()(pman)anode '@ref{(pman)anode,cross ref name,title, file name,
+manual}' see cross ref name: (file name)(pman)anode
+'@ref{(pman)anode,,title,file name}' see title: (file name)(pman)anode
+'@ref{(pman)anode,,title,,manual}' see title: ()(pman)anode
+'@ref{(pman)anode,,title, file name, manual}' see title: (file
+name)(pman)anode '@ref{(pman)anode,,,file name,manual}' see (file
+name)(pman)anode::
+
+   '@inforef{chapter, cross ref name, file name}' see cross ref name:
+(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::
+'@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{s--ect@comma{}ion, a @comma{} in cross ref, a comma@comma{}
-in file}' *note a , in cross ref: (a comma, in file)s--ect,ion
+in file}' see a , in cross ref: (a comma, in file)s--ect,ion
 
-   '*note chapter::'.
+   'see chapter::'.
 
-   *note cross ref with uref uref1 (href://http/myhost.com/index.html):
-(info file with uref3 uref3 (href://http/myhost.com/index3.html))ext
-*note cross ref with uref uref1 (href://http/myhost.com/index.html):
-chapter
+   see cross ref with uref uref1 (href://http/myhost.com/index.html):
+(info file with uref3 uref3 (href://http/myhost.com/index3.html))ext see
+cross ref with uref uref1 (href://http/myhost.com/index.html): chapter
 
 *a-strong*
      l-ine
@@ -1375,38 +1367,36 @@ b
 
    g-roupe
 
-   '@ref{node}' *note node::
-
-   '@ref{,cross ref name}' *note cross ref name: '@ref{,,title}' *note
-title: '@ref{,,,file name}' *note (file name):: '@ref{,,,,manual}' *note
-():: '@ref{node,cross ref name}' *note cross ref name: node
-'@ref{node,,title}' *note title: node '@ref{node,,,file name}' *note
-(file name)node:: '@ref{node,,,,manual}' *note ()node:: '@ref{node,cross
-ref name,title,}' *note cross ref name: node '@ref{node,cross ref
-name,,file name}' *note cross ref name: (file name)node '@ref{node,cross
-ref name,,,manual}' *note cross ref name: ()node '@ref{node,cross ref
-name,title,file name}' *note cross ref name: (file name)node
-'@ref{node,cross ref name,title,,manual}' *note cross ref name: ()node
-'@ref{node,cross ref name,title, file name, manual}' *note cross ref
-name: (file name)node '@ref{node,,title,file name}' *note title: (file
-name)node '@ref{node,,title,,manual}' *note title: ()node
-'@ref{chapter,,title, file name, manual}' *note title: (file
-name)chapter '@ref{node,,title, file name, manual}' *note title: (file
-name)node '@ref{node,,,file name,manual}' *note (file name)node::
-'@ref{,cross ref name,title,}' *note cross ref name: '@ref{,cross ref
-name,,file name}' *note cross ref name: (file name) '@ref{,cross ref
-name,,,manual}' *note cross ref name: () '@ref{,cross ref
-name,title,file name}' *note cross ref name: (file name) '@ref{,cross
-ref name,title,,manual}' *note cross ref name: () '@ref{,cross ref
-name,title, file name, manual}' *note cross ref name: (file name)
-'@ref{,,title,file name}' *note title: (file name)
-'@ref{,,title,,manual}' *note title: () '@ref{,,title, file name,
-manual}' *note title: (file name) '@ref{,,,file name,manual}' *note
-(file name)::
-
-   '@inforef{,cross ref name }' *note cross ref name: '@inforef{,,file
-name}' *note (file name):: '@inforef{,cross ref name, file name}' *note
-cross ref name: (file name) '@inforef{}' *note ::
+   '@ref{node}' see node::
+
+   '@ref{,cross ref name}' see cross ref name: '@ref{,,title}' see
+title: '@ref{,,,file name}' see (file name):: '@ref{,,,,manual}' see
+():: '@ref{node,cross ref name}' see cross ref name: node
+'@ref{node,,title}' see title: node '@ref{node,,,file name}' see (file
+name)node:: '@ref{node,,,,manual}' see ()node:: '@ref{node,cross ref
+name,title,}' see cross ref name: node '@ref{node,cross ref name,,file
+name}' see cross ref name: (file name)node '@ref{node,cross ref
+name,,,manual}' see cross ref name: ()node '@ref{node,cross ref
+name,title,file name}' see cross ref name: (file name)node
+'@ref{node,cross ref name,title,,manual}' see cross ref name: ()node
+'@ref{node,cross ref name,title, file name, manual}' see cross ref name:
+(file name)node '@ref{node,,title,file name}' see title: (file name)node
+'@ref{node,,title,,manual}' see title: ()node '@ref{chapter,,title, file
+name, manual}' see title: (file name)chapter '@ref{node,,title, file
+name, manual}' see title: (file name)node '@ref{node,,,file
+name,manual}' see (file name)node:: '@ref{,cross ref name,title,}' see
+cross ref name: '@ref{,cross ref name,,file name}' see cross ref name:
+(file name) '@ref{,cross ref name,,,manual}' see cross ref name: ()
+'@ref{,cross ref name,title,file name}' see cross ref name: (file name)
+'@ref{,cross ref name,title,,manual}' see cross ref name: ()
+'@ref{,cross ref name,title, file name, manual}' see cross ref name:
+(file name) '@ref{,,title,file name}' see title: (file name)
+'@ref{,,title,,manual}' see title: () '@ref{,,title, file name, manual}'
+see title: (file name) '@ref{,,,file name,manual}' see (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 ::
 
    In example.
 
@@ -1983,72 +1973,72 @@ cross ref name: (file name) '@inforef{}' *note ::
           fff2
 
 
-     @xref{c---hapter@@, cross r---ef name@@, t---itle@@, file n---ame@@, 
ma---nual@@} *Note cross r---ef name@: (file n---ame@)c---hapter@.
-     @ref{chapter, cross ref name, title, file name, manual} *note cross ref 
name: (file name)chapter
-     @pxref{chapter, cross ref name, title, file name, manual} *note cross ref 
name: (file name)chapter
-     @inforef{chapter, cross ref name, file name} *note cross ref name: (file 
name)chapter
+     @xref{c---hapter@@, cross r---ef name@@, t---itle@@, file n---ame@@, 
ma---nual@@} See cross r---ef name@: (file n---ame@)c---hapter@.
+     @ref{chapter, cross ref name, title, file name, manual} see cross ref 
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} *note chapter::
-     @xref{chapter} *Note chapter::.
-     @pxref{chapter} *note chapter::
-     @ref{s--ect@comma{}ion} *note s--ect,ion::
+     @ref{chapter} see chapter::
+     @xref{chapter} See chapter::.
+     @pxref{chapter} see chapter::
+     @ref{s--ect@comma{}ion} see 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 }
-     *note a , in cross
+     see a , in cross
      ref: (a comma, in file)s--ect,ion
 
-     @ref{chapter,cross ref name} *note cross ref name: chapter
-     @ref{chapter,,title} *note title: chapter
-     @ref{chapter,,,file name} *note (file name)chapter::
-     @ref{chapter,,,,manual} *note ()chapter::
-     @ref{chapter,cross ref name,title,} *note cross ref name: chapter
-     @ref{chapter,cross ref name,,file name} *note cross ref name: (file 
name)chapter
-     @ref{chapter,cross ref name,,,manual} *note cross ref name: ()chapter
-     @ref{chapter,cross ref name,title,file name} *note cross ref name: (file 
name)chapter
-     @ref{chapter,cross ref name,title,,manual} *note cross ref name: ()chapter
-     @ref{chapter,cross ref name,title, file name, manual} *note cross ref 
name: (file name)chapter
-     @ref{chapter,,title,file name} *note title: (file name)chapter
-     @ref{chapter,,title,,manual} *note title: ()chapter
-     @ref{chapter,,title, file name, manual} *note title: (file name)chapter
-     @ref{chapter,,,file name,manual} *note (file name)chapter::
-
-
-     @ref{(pman)anode,cross ref name} *note cross ref name: (pman)anode
-     @ref{(pman)anode,,title} *note title: (pman)anode
-     @ref{(pman)anode,,,file name} *note (file name)(pman)anode::
-     @ref{(pman)anode,,,,manual} *note ()(pman)anode::
-     @ref{(pman)anode,cross ref name,title,} *note cross ref name: (pman)anode
-     @ref{(pman)anode,cross ref name,,file name} *note cross ref name: (file 
name)(pman)anode
-     @ref{(pman)anode,cross ref name,,,manual} *note cross ref name: 
()(pman)anode
-     @ref{(pman)anode,cross ref name,title,file name} *note cross ref name: 
(file name)(pman)anode
-     @ref{(pman)anode,cross ref name,title,,manual} *note cross ref name: 
()(pman)anode
-     @ref{(pman)anode,cross ref name,title, file name, manual} *note cross ref 
name: (file name)(pman)anode
-     @ref{(pman)anode,,title,file name} *note title: (file name)(pman)anode
-     @ref{(pman)anode,,title,,manual} *note title: ()(pman)anode
-     @ref{(pman)anode,,title, file name, manual} *note title: (file 
name)(pman)anode
-     @ref{(pman)anode,,,file name,manual} *note (file name)(pman)anode::
-
-
-     @inforef{chapter, cross ref name, file name} *note cross ref name: (file 
name)chapter
-     @inforef{chapter} *note chapter::
-     @inforef{chapter, cross ref name} *note cross ref name: chapter
-     @inforef{chapter,,file name} *note (file name)chapter::
-     @inforef{node, cross ref name, file name} *note cross ref name: (file 
name)node
-     @inforef{node} *note node::
-     @inforef{node, cross ref name} *note cross ref name: node
-     @inforef{node,,file name} *note (file name)node::
-     @inforef{chapter, cross ref name, file name, spurious arg} *note cross 
ref name: (file name, spurious arg)chapter
+     @ref{chapter,cross ref name} see cross ref name: chapter
+     @ref{chapter,,title} see title: chapter
+     @ref{chapter,,,file name} see (file name)chapter::
+     @ref{chapter,,,,manual} see ()chapter::
+     @ref{chapter,cross ref name,title,} see cross ref name: chapter
+     @ref{chapter,cross ref name,,file name} see cross ref name: (file 
name)chapter
+     @ref{chapter,cross ref name,,,manual} see cross ref name: ()chapter
+     @ref{chapter,cross ref name,title,file name} see cross ref name: (file 
name)chapter
+     @ref{chapter,cross ref name,title,,manual} see cross ref name: ()chapter
+     @ref{chapter,cross ref name,title, file name, manual} see cross ref name: 
(file name)chapter
+     @ref{chapter,,title,file name} see title: (file name)chapter
+     @ref{chapter,,title,,manual} see title: ()chapter
+     @ref{chapter,,title, file name, manual} see title: (file name)chapter
+     @ref{chapter,,,file name,manual} see (file name)chapter::
+
+
+     @ref{(pman)anode,cross ref name} see cross ref name: (pman)anode
+     @ref{(pman)anode,,title} see title: (pman)anode
+     @ref{(pman)anode,,,file name} see (file name)(pman)anode::
+     @ref{(pman)anode,,,,manual} see ()(pman)anode::
+     @ref{(pman)anode,cross ref name,title,} see cross ref name: (pman)anode
+     @ref{(pman)anode,cross ref name,,file name} see cross ref name: (file 
name)(pman)anode
+     @ref{(pman)anode,cross ref name,,,manual} see cross ref name: 
()(pman)anode
+     @ref{(pman)anode,cross ref name,title,file name} see cross ref name: 
(file name)(pman)anode
+     @ref{(pman)anode,cross ref name,title,,manual} see cross ref name: 
()(pman)anode
+     @ref{(pman)anode,cross ref name,title, file name, manual} see cross ref 
name: (file name)(pman)anode
+     @ref{(pman)anode,,title,file name} see title: (file name)(pman)anode
+     @ref{(pman)anode,,title,,manual} see title: ()(pman)anode
+     @ref{(pman)anode,,title, file name, manual} see title: (file 
name)(pman)anode
+     @ref{(pman)anode,,,file name,manual} see (file name)(pman)anode::
+
+
+     @inforef{chapter, cross ref name, file name} see cross ref name: (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::
+     @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{s--ect@comma{}ion, a @comma{} in cross
      ref, a comma@comma{} in file}
-     *note a , in cross
+     see a , in cross
      ref: (a comma, in file)s--ect,ion
 
-     '*note chapter::'.
+     'see chapter::'.
 
-     *note cross ref with uref uref1 (href://http/myhost.com/index.html): 
(info file with uref3 uref3 (href://http/myhost.com/index3.html))ext
-     *note cross ref with uref uref1 (href://http/myhost.com/index.html): 
chapter
+     see cross ref with uref uref1 (href://http/myhost.com/index.html): (info 
file with uref3 uref3 (href://http/myhost.com/index3.html))ext
+     see cross ref with uref uref1 (href://http/myhost.com/index.html): chapter
 
      *a-strong*
           l--ine
@@ -2241,42 +2231,42 @@ aaa
 
      g--roupe
 
-     @ref{node} *note node::
-
-     @ref{,cross ref name} *note cross ref name:
-     @ref{,,title} *note title:
-     @ref{,,,file name} *note (file name)::
-     @ref{,,,,manual} *note ()::
-     @ref{node,cross ref name} *note cross ref name: node
-     @ref{node,,title} *note title: node
-     @ref{node,,,file name} *note (file name)node::
-     @ref{node,,,,manual} *note ()node::
-     @ref{node,cross ref name,title,} *note cross ref name: node
-     @ref{node,cross ref name,,file name} *note cross ref name: (file name)node
-     @ref{node,cross ref name,,,manual} *note cross ref name: ()node
-     @ref{node,cross ref name,title,file name} *note cross ref name: (file 
name)node
-     @ref{node,cross ref name,title,,manual} *note cross ref name: ()node
-     @ref{node,cross ref name,title, file name, manual} *note cross ref name: 
(file name)node
-     @ref{node,,title,file name} *note title: (file name)node
-     @ref{node,,title,,manual} *note title: ()node
-     @ref{chapter,,title, file name, manual} *note title: (file name)chapter
-     @ref{node,,title, file name, manual} *note title: (file name)node
-     @ref{node,,,file name,manual} *note (file name)node::
-     @ref{,cross ref name,title,} *note cross ref name:
-     @ref{,cross ref name,,file name} *note cross ref name: (file name)
-     @ref{,cross ref name,,,manual} *note cross ref name: ()
-     @ref{,cross ref name,title,file name} *note cross ref name: (file name)
-     @ref{,cross ref name,title,,manual} *note cross ref name: ()
-     @ref{,cross ref name,title, file name, manual} *note cross ref name: 
(file name)
-     @ref{,,title,file name} *note title: (file name)
-     @ref{,,title,,manual} *note title: ()
-     @ref{,,title, file name, manual} *note title: (file name)
-     @ref{,,,file name,manual} *note (file name)::
-
-     @inforef{,cross ref name } *note cross ref name:
-     @inforef{,,file name} *note (file name)::
-     @inforef{,cross ref name, file name} *note cross ref name: (file name)
-     @inforef{} *note ::
+     @ref{node} see node::
+
+     @ref{,cross ref name} see cross ref name:
+     @ref{,,title} see title:
+     @ref{,,,file name} see (file name)::
+     @ref{,,,,manual} see ()::
+     @ref{node,cross ref name} see cross ref name: node
+     @ref{node,,title} see title: node
+     @ref{node,,,file name} see (file name)node::
+     @ref{node,,,,manual} see ()node::
+     @ref{node,cross ref name,title,} see cross ref name: node
+     @ref{node,cross ref name,,file name} see cross ref name: (file name)node
+     @ref{node,cross ref name,,,manual} see cross ref name: ()node
+     @ref{node,cross ref name,title,file name} see cross ref name: (file 
name)node
+     @ref{node,cross ref name,title,,manual} see cross ref name: ()node
+     @ref{node,cross ref name,title, file name, manual} see cross ref name: 
(file name)node
+     @ref{node,,title,file name} see title: (file name)node
+     @ref{node,,title,,manual} see title: ()node
+     @ref{chapter,,title, file name, manual} see title: (file name)chapter
+     @ref{node,,title, file name, manual} see title: (file name)node
+     @ref{node,,,file name,manual} see (file name)node::
+     @ref{,cross ref name,title,} see cross ref name:
+     @ref{,cross ref name,,file name} see cross ref name: (file name)
+     @ref{,cross ref name,,,manual} see cross ref name: ()
+     @ref{,cross ref name,title,file name} see cross ref name: (file name)
+     @ref{,cross ref name,title,,manual} see cross ref name: ()
+     @ref{,cross ref name,title, file name, manual} see cross ref name: (file 
name)
+     @ref{,,title,file name} see title: (file name)
+     @ref{,,title,,manual} see title: ()
+     @ref{,,title, file name, manual} see title: (file name)
+     @ref{,,,file name,manual} see (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 ::
 
 
    Text(7)
@@ -2285,306 +2275,306 @@ aaa
 
 * Menu:
 
-* truc:                                  chapter.            (line 2281)
+* truc:                                  chapter.            (line 2271)
 
    codeidx
 
 * Menu:
 
-* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2281)
+* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2271)
 
    cp
 
 * Menu:
 
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  725)
-* -option <2>:                           chapter.            (line 1433)
-* ?:                                     chapter.            (line 2281)
-* .:                                     chapter.            (line 2281)
+* -option <1>:                           chapter.            (line  720)
+* -option <2>:                           chapter.            (line 1423)
+* ?:                                     chapter.            (line 2271)
+* .:                                     chapter.            (line 2271)
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  725)
-* " <2>:                                 chapter.            (line 1433)
-* a:                                     chapter.            (line 2281)
-* aaa, bbb:                              chapter.            (line 2281)
-* a--a:                                  chapter.            (line 2281)
-* a--asis:                               chapter.            (line  525)
-* a--asis <1>:                           chapter.            (line 1222)
-* a--asis <2>:                           chapter.            (line 2055)
+* " <1>:                                 chapter.            (line  720)
+* " <2>:                                 chapter.            (line 1423)
+* a:                                     chapter.            (line 2271)
+* aaa, bbb:                              chapter.            (line 2271)
+* a--a:                                  chapter.            (line 2271)
+* a--asis:                               chapter.            (line  522)
+* a--asis <1>:                           chapter.            (line 1214)
+* a--asis <2>:                           chapter.            (line 2045)
   aaa, See bbb.
-* b:                                     chapter.            (line  526)
-* b <1>:                                 chapter.            (line 1223)
-* b <2>:                                 chapter.            (line 2056)
-* b--b, c--c:                            chapter.            (line 2281)
+* b:                                     chapter.            (line  523)
+* b <1>:                                 chapter.            (line 1215)
+* b <2>:                                 chapter.            (line 2046)
+* b--b, c--c:                            chapter.            (line 2271)
 * counting entry:                        chapter.            (line    0)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2281)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2271)
 * d--efcv_name:                          chapter.            (line  366)
 * d--efcv_name <1>:                      chapter.            (line  369)
-* d--efcv_name <2>:                      chapter.            (line 1063)
-* d--efcv_name <3>:                      chapter.            (line 1066)
-* d--efcv_name <4>:                      chapter.            (line 1896)
-* d--efcv_name <5>:                      chapter.            (line 1899)
+* d--efcv_name <2>:                      chapter.            (line 1058)
+* d--efcv_name <3>:                      chapter.            (line 1061)
+* d--efcv_name <4>:                      chapter.            (line 1886)
+* d--efcv_name <5>:                      chapter.            (line 1889)
 * d--efivar_name of c--lass:             chapter.            (line  411)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1108)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1941)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1103)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1931)
 * d--efopt_name:                         chapter.            (line  402)
-* d--efopt_name <1>:                     chapter.            (line 1099)
-* d--efopt_name <2>:                     chapter.            (line 1932)
+* d--efopt_name <1>:                     chapter.            (line 1094)
+* d--efopt_name <2>:                     chapter.            (line 1922)
 * 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 1069)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1072)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1902)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1905)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1064)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1067)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1892)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1895)
 * 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 1140)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1143)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1974)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1977)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1135)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1138)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1964)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1967)
 * d--eftypeivar_name of c--lass:         chapter.            (line  414)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1111)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1944)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1106)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1934)
 * d--eftypevar_name:                     chapter.            (line  408)
-* d--eftypevar_name <1>:                 chapter.            (line 1105)
-* d--eftypevar_name <2>:                 chapter.            (line 1938)
+* d--eftypevar_name <1>:                 chapter.            (line 1100)
+* d--eftypevar_name <2>:                 chapter.            (line 1928)
 * d--eftypevr_name:                      chapter.            (line  363)
-* d--eftypevr_name <1>:                  chapter.            (line 1060)
-* d--eftypevr_name <2>:                  chapter.            (line 1893)
+* d--eftypevr_name <1>:                  chapter.            (line 1055)
+* d--eftypevr_name <2>:                  chapter.            (line 1883)
 * d--efvar_name:                         chapter.            (line  396)
 * d--efvar_name <1>:                     chapter.            (line  399)
-* d--efvar_name <2>:                     chapter.            (line 1093)
-* d--efvar_name <3>:                     chapter.            (line 1096)
-* d--efvar_name <4>:                     chapter.            (line 1926)
-* d--efvar_name <5>:                     chapter.            (line 1929)
+* d--efvar_name <2>:                     chapter.            (line 1088)
+* d--efvar_name <3>:                     chapter.            (line 1091)
+* d--efvar_name <4>:                     chapter.            (line 1916)
+* d--efvar_name <5>:                     chapter.            (line 1919)
 * d--efvr_name:                          chapter.            (line  342)
-* d--efvr_name <1>:                      chapter.            (line 1039)
-* d--efvr_name <2>:                      chapter.            (line 1872)
+* d--efvr_name <1>:                      chapter.            (line 1034)
+* d--efvr_name <2>:                      chapter.            (line 1862)
   ddd:                                   See also ccc.
   ddd:                                   See also ccc.
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2281)
-* index entry between item and itemx:    chapter.            (line  530)
-* index entry between item and itemx <1>: chapter.           (line  660)
-* index entry between item and itemx <2>: chapter.           (line 1227)
-* index entry between item and itemx <3>: chapter.           (line 1357)
-* index entry between item and itemx <4>: chapter.           (line 2060)
-* index entry between item and itemx <5>: chapter.           (line 2223)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2271)
+* index entry between item and itemx:    chapter.            (line  527)
+* index entry between item and itemx <1>: chapter.           (line  657)
+* index entry between item and itemx <2>: chapter.           (line 1219)
+* index entry between item and itemx <3>: chapter.           (line 1349)
+* index entry between item and itemx <4>: chapter.           (line 2050)
+* index entry between item and itemx <5>: chapter.           (line 2213)
 * index entry in footnote:               chapter.            (line    0)
 * index entry within deffn:              chapter.            (line  317)
-* index entry within deffn <1>:          chapter.            (line 1014)
-* index entry within deffn <2>:          chapter.            (line 1845)
+* index entry within deffn <1>:          chapter.            (line 1009)
+* index entry within deffn <2>:          chapter.            (line 1835)
 * index entry within itemize:            chapter.            (line  228)
-* index entry within itemize <1>:        chapter.            (line  925)
-* index entry within itemize <2>:        chapter.            (line 1756)
+* index entry within itemize <1>:        chapter.            (line  920)
+* index entry within itemize <2>:        chapter.            (line 1746)
 * index entry within multitable:         chapter.            (line  250)
-* index entry within multitable <1>:     chapter.            (line  947)
-* index entry within multitable <2>:     chapter.            (line 1779)
-* t-ruc:                                 chapter.            (line 2281)
-* T-ruc:                                 chapter.            (line 2281)
+* index entry within multitable <1>:     chapter.            (line  942)
+* index entry within multitable <2>:     chapter.            (line 1769)
+* t-ruc:                                 chapter.            (line 2271)
+* T-ruc:                                 chapter.            (line 2271)
 * vtable i--tem code kbdinputstyle:      chapter.            (line  152)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  849)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1679)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  844)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1669)
 * vtable i--tem default kbdinputstyle:   chapter.            (line  147)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  844)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1674)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  839)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1664)
 * vtable i--tem distinct kbdinputstyle:  chapter.            (line  162)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  859)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1689)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  854)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1679)
 * vtable i--tem example kbdinputstyle:   chapter.            (line  157)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  854)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1684)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  849)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1674)
 * vtable i--tem in example code kbdinputstyle: chapter.      (line  154)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  851)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1681)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  846)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1671)
 * vtable i--tem in example default kbdinputstyle: chapter.   (line  149)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  846)
+                                                             (line  841)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1676)
+                                                             (line 1666)
 * vtable i--tem in example distinct kbdinputstyle: chapter.  (line  164)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  861)
+                                                             (line  856)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1691)
+                                                             (line 1681)
 * vtable i--tem in example example kbdinputstyle: chapter.   (line  159)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  856)
+                                                             (line  851)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1686)
+                                                             (line 1676)
 
    fn
 
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  725)
-* --foption <2>:                         chapter.            (line 1433)
-* ?:                                     chapter.            (line 2281)
-* .:                                     chapter.            (line 2281)
+* --foption <1>:                         chapter.            (line  720)
+* --foption <2>:                         chapter.            (line 1423)
+* ?:                                     chapter.            (line 2271)
+* .:                                     chapter.            (line 2271)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  725)
-* `` <2>:                                chapter.            (line 1433)
+* `` <1>:                                chapter.            (line  720)
+* `` <2>:                                chapter.            (line 1423)
 * a:                                     chapter.            (line  330)
-* a <1>:                                 chapter.            (line  529)
-* a <2>:                                 chapter.            (line  659)
-* a <3>:                                 chapter.            (line 1027)
-* a <4>:                                 chapter.            (line 1226)
-* a <5>:                                 chapter.            (line 1356)
-* a <6>:                                 chapter.            (line 1858)
-* a <7>:                                 chapter.            (line 2059)
-* a <8>:                                 chapter.            (line 2222)
-* a <9>:                                 chapter.            (line 2281)
-* after:                                 chapter.            (line  670)
-* after <1>:                             chapter.            (line 1367)
-* after <2>:                             chapter.            (line 2233)
+* a <1>:                                 chapter.            (line  526)
+* a <2>:                                 chapter.            (line  656)
+* a <3>:                                 chapter.            (line 1022)
+* a <4>:                                 chapter.            (line 1218)
+* a <5>:                                 chapter.            (line 1348)
+* a <6>:                                 chapter.            (line 1848)
+* a <7>:                                 chapter.            (line 2049)
+* a <8>:                                 chapter.            (line 2212)
+* a <9>:                                 chapter.            (line 2271)
+* after:                                 chapter.            (line  667)
+* after <1>:                             chapter.            (line 1359)
+* after <2>:                             chapter.            (line 2223)
 * arg2:                                  chapter.            (line  449)
-* arg2 <1>:                              chapter.            (line 1146)
-* arg2 <2>:                              chapter.            (line 1981)
-* b:                                     chapter.            (line  530)
-* b <1>:                                 chapter.            (line  660)
-* b <2>:                                 chapter.            (line 1227)
-* b <3>:                                 chapter.            (line 1357)
-* b <4>:                                 chapter.            (line 2060)
-* b <5>:                                 chapter.            (line 2223)
+* arg2 <1>:                              chapter.            (line 1141)
+* arg2 <2>:                              chapter.            (line 1971)
+* b:                                     chapter.            (line  527)
+* b <1>:                                 chapter.            (line  657)
+* b <2>:                                 chapter.            (line 1219)
+* b <3>:                                 chapter.            (line 1349)
+* b <4>:                                 chapter.            (line 2050)
+* b <5>:                                 chapter.            (line 2213)
 * bidule machin:                         chapter.            (line  325)
-* bidule machin <1>:                     chapter.            (line 1022)
-* bidule machin <2>:                     chapter.            (line 1853)
+* bidule machin <1>:                     chapter.            (line 1017)
+* bidule machin <2>:                     chapter.            (line 1843)
 * d--effn_name:                          chapter.            (line  309)
-* d--effn_name <1>:                      chapter.            (line 1006)
-* d--effn_name <2>:                      chapter.            (line 1837)
+* d--effn_name <1>:                      chapter.            (line 1001)
+* d--effn_name <2>:                      chapter.            (line 1827)
 * d--efmac_name:                         chapter.            (line  390)
-* d--efmac_name <1>:                     chapter.            (line 1087)
-* d--efmac_name <2>:                     chapter.            (line 1920)
+* d--efmac_name <1>:                     chapter.            (line 1082)
+* d--efmac_name <2>:                     chapter.            (line 1910)
 * d--efmethod_name on c--lass:           chapter.            (line  417)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1114)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1947)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1109)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1937)
 * 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 1075)
-* d--efop_name on c--lass <3>:           chapter.            (line 1078)
-* d--efop_name on c--lass <4>:           chapter.            (line 1908)
-* d--efop_name on c--lass <5>:           chapter.            (line 1911)
+* d--efop_name on c--lass <2>:           chapter.            (line 1070)
+* d--efop_name on c--lass <3>:           chapter.            (line 1073)
+* d--efop_name on c--lass <4>:           chapter.            (line 1898)
+* d--efop_name on c--lass <5>:           chapter.            (line 1901)
 * d--efspec_name:                        chapter.            (line  393)
-* d--efspec_name <1>:                    chapter.            (line 1090)
-* d--efspec_name <2>:                    chapter.            (line 1923)
+* d--efspec_name <1>:                    chapter.            (line 1085)
+* d--efspec_name <2>:                    chapter.            (line 1913)
 * d--eftypefn_name:                      chapter.            (line  351)
 * d--eftypefn_name <1>:                  chapter.            (line  354)
-* d--eftypefn_name <2>:                  chapter.            (line 1048)
-* d--eftypefn_name <3>:                  chapter.            (line 1051)
-* d--eftypefn_name <4>:                  chapter.            (line 1881)
-* d--eftypefn_name <5>:                  chapter.            (line 1884)
+* d--eftypefn_name <2>:                  chapter.            (line 1043)
+* d--eftypefn_name <3>:                  chapter.            (line 1046)
+* d--eftypefn_name <4>:                  chapter.            (line 1871)
+* d--eftypefn_name <5>:                  chapter.            (line 1874)
 * d--eftypefn_name2:                     chapter.            (line  428)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1125)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1959)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1120)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1949)
 * d--eftypefun_name:                     chapter.            (line  405)
-* d--eftypefun_name <1>:                 chapter.            (line 1102)
-* d--eftypefun_name <2>:                 chapter.            (line 1935)
+* d--eftypefun_name <1>:                 chapter.            (line 1097)
+* d--eftypefun_name <2>:                 chapter.            (line 1925)
 * d--eftypemethod_name on c--lass:       chapter.            (line  420)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1117)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1950)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1112)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1940)
 * 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 1054)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1057)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1887)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1890)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1049)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1052)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1877)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1880)
 * 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 1130)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1135)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1964)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1969)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1125)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1130)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1954)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1959)
 * d--efun_name:                          chapter.            (line  387)
-* d--efun_name <1>:                      chapter.            (line 1084)
-* d--efun_name <2>:                      chapter.            (line 1917)
+* d--efun_name <1>:                      chapter.            (line 1079)
+* d--efun_name <2>:                      chapter.            (line 1907)
 * de--ffn_name:                          chapter.            (line  312)
-* de--ffn_name <1>:                      chapter.            (line 1009)
-* de--ffn_name <2>:                      chapter.            (line 1840)
+* de--ffn_name <1>:                      chapter.            (line 1004)
+* de--ffn_name <2>:                      chapter.            (line 1830)
 * deffn:                                 chapter.            (line  333)
 * deffn <1>:                             chapter.            (line  335)
-* deffn <2>:                             chapter.            (line 1030)
-* deffn <3>:                             chapter.            (line 1032)
-* deffn <4>:                             chapter.            (line 1862)
-* deffn <5>:                             chapter.            (line 1864)
+* deffn <2>:                             chapter.            (line 1025)
+* deffn <3>:                             chapter.            (line 1027)
+* deffn <4>:                             chapter.            (line 1852)
+* deffn <5>:                             chapter.            (line 1854)
 * deffnx:                                chapter.            (line  331)
 * deffnx <1>:                            chapter.            (line  336)
-* deffnx <2>:                            chapter.            (line 1028)
-* deffnx <3>:                            chapter.            (line 1033)
-* deffnx <4>:                            chapter.            (line 1859)
-* deffnx <5>:                            chapter.            (line 1865)
-* f---aa:                                chapter.            (line 2281)
+* deffnx <2>:                            chapter.            (line 1023)
+* deffnx <3>:                            chapter.            (line 1028)
+* deffnx <4>:                            chapter.            (line 1849)
+* deffnx <5>:                            chapter.            (line 1855)
+* f---aa:                                chapter.            (line 2271)
   f---aaa, See f---bbb.
-* f---bb, f---cc:                        chapter.            (line 2281)
+* f---bb, f---cc:                        chapter.            (line 2271)
   f---ddd:                               See also f---ccc.
   f---ddd:                               See also f---ccc.
-* f---ddd, f---eee, ffff:                chapter.            (line 2281)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2281)
+* f---ddd, f---eee, ffff:                chapter.            (line 2271)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2271)
 * followed:                              chapter.            (line  328)
-* followed <1>:                          chapter.            (line  668)
-* followed <2>:                          chapter.            (line 1025)
-* followed <3>:                          chapter.            (line 1365)
-* followed <4>:                          chapter.            (line 1856)
-* followed <5>:                          chapter.            (line 2231)
+* followed <1>:                          chapter.            (line  665)
+* followed <2>:                          chapter.            (line 1020)
+* followed <3>:                          chapter.            (line 1357)
+* followed <4>:                          chapter.            (line 1846)
+* followed <5>:                          chapter.            (line 2221)
 * I:                                     chapter.            (line  316)
 * I <1>:                                 chapter.            (line  338)
-* I <2>:                                 chapter.            (line 1013)
-* I <3>:                                 chapter.            (line 1035)
-* I <4>:                                 chapter.            (line 1844)
-* I <5>:                                 chapter.            (line 1867)
+* I <2>:                                 chapter.            (line 1008)
+* I <3>:                                 chapter.            (line 1030)
+* I <4>:                                 chapter.            (line 1834)
+* I <5>:                                 chapter.            (line 1857)
 * id i ule:                              chapter.            (line  322)
-* id i ule <1>:                          chapter.            (line 1019)
-* id i ule <2>:                          chapter.            (line 1850)
+* id i ule <1>:                          chapter.            (line 1014)
+* id i ule <2>:                          chapter.            (line 1840)
 * id ule:                                chapter.            (line  321)
-* id ule <1>:                            chapter.            (line 1018)
-* id ule <2>:                            chapter.            (line 1849)
-* INVALID:                               chapter.            (line  672)
-* INVALID <1>:                           chapter.            (line 1369)
-* INVALID <2>:                           chapter.            (line 2235)
+* id ule <1>:                            chapter.            (line 1013)
+* id ule <2>:                            chapter.            (line 1839)
+* INVALID:                               chapter.            (line  669)
+* INVALID <1>:                           chapter.            (line 1361)
+* INVALID <2>:                           chapter.            (line 2225)
 * log trap:                              chapter.            (line  318)
-* log trap <1>:                          chapter.            (line 1015)
-* log trap <2>:                          chapter.            (line 1846)
+* log trap <1>:                          chapter.            (line 1010)
+* log trap <2>:                          chapter.            (line 1836)
 * log trap1:                             chapter.            (line  319)
-* log trap1 <1>:                         chapter.            (line 1016)
-* log trap1 <2>:                         chapter.            (line 1847)
+* log trap1 <1>:                         chapter.            (line 1011)
+* log trap1 <2>:                         chapter.            (line 1837)
 * log trap2:                             chapter.            (line  320)
-* log trap2 <1>:                         chapter.            (line 1017)
-* log trap2 <2>:                         chapter.            (line 1848)
+* log trap2 <1>:                         chapter.            (line 1012)
+* log trap2 <2>:                         chapter.            (line 1838)
 * machin:                                chapter.            (line  324)
 * machin <1>:                            chapter.            (line  326)
-* machin <2>:                            chapter.            (line  664)
-* machin <3>:                            chapter.            (line  665)
-* machin <4>:                            chapter.            (line  666)
-* machin <5>:                            chapter.            (line  667)
-* machin <6>:                            chapter.            (line 1021)
-* machin <7>:                            chapter.            (line 1023)
-* machin <8>:                            chapter.            (line 1361)
-* machin <9>:                            chapter.            (line 1362)
-* machin <10>:                           chapter.            (line 1363)
-* machin <11>:                           chapter.            (line 1364)
-* machin <12>:                           chapter.            (line 1852)
-* machin <13>:                           chapter.            (line 1854)
-* machin <14>:                           chapter.            (line 2227)
-* machin <15>:                           chapter.            (line 2228)
-* machin <16>:                           chapter.            (line 2229)
-* machin <17>:                           chapter.            (line 2230)
+* machin <2>:                            chapter.            (line  661)
+* machin <3>:                            chapter.            (line  662)
+* machin <4>:                            chapter.            (line  663)
+* machin <5>:                            chapter.            (line  664)
+* machin <6>:                            chapter.            (line 1016)
+* machin <7>:                            chapter.            (line 1018)
+* machin <8>:                            chapter.            (line 1353)
+* machin <9>:                            chapter.            (line 1354)
+* machin <10>:                           chapter.            (line 1355)
+* machin <11>:                           chapter.            (line 1356)
+* machin <12>:                           chapter.            (line 1842)
+* machin <13>:                           chapter.            (line 1844)
+* machin <14>:                           chapter.            (line 2217)
+* machin <15>:                           chapter.            (line 2218)
+* machin <16>:                           chapter.            (line 2219)
+* machin <17>:                           chapter.            (line 2220)
 * n--ame:                                chapter.            (line  345)
 * n--ame <1>:                            chapter.            (line  348)
-* n--ame <2>:                            chapter.            (line 1042)
-* n--ame <3>:                            chapter.            (line 1045)
-* n--ame <4>:                            chapter.            (line 1875)
-* n--ame <5>:                            chapter.            (line 1878)
+* n--ame <2>:                            chapter.            (line 1037)
+* n--ame <3>:                            chapter.            (line 1040)
+* n--ame <4>:                            chapter.            (line 1865)
+* n--ame <5>:                            chapter.            (line 1868)
 * name2:                                 chapter.            (line  423)
-* name2 <1>:                             chapter.            (line 1120)
-* name2 <2>:                             chapter.            (line 1954)
-* t--ruc:                                chapter.            (line 2281)
-* T--ruc:                                chapter.            (line 2281)
+* name2 <1>:                             chapter.            (line 1115)
+* name2 <2>:                             chapter.            (line 1944)
+* t--ruc:                                chapter.            (line 2271)
+* T--ruc:                                chapter.            (line 2271)
 * truc:                                  chapter.            (line  317)
 * truc <1>:                              chapter.            (line  339)
-* truc <2>:                              chapter.            (line 1014)
-* truc <3>:                              chapter.            (line 1036)
-* truc <4>:                              chapter.            (line 1845)
-* truc <5>:                              chapter.            (line 1868)
-* xxx, zzz:                              chapter.            (line 2281)
+* truc <2>:                              chapter.            (line 1009)
+* truc <3>:                              chapter.            (line 1031)
+* truc <4>:                              chapter.            (line 1835)
+* truc <5>:                              chapter.            (line 1858)
+* xxx, zzz:                              chapter.            (line 2271)
 
    vr
 
@@ -2597,8 +2587,8 @@ aaa
 * Menu:
 
 * d--eftp_name:                          chapter.            (line  384)
-* d--eftp_name <1>:                      chapter.            (line 1081)
-* d--eftp_name <2>:                      chapter.            (line 1914)
+* d--eftp_name <1>:                      chapter.            (line 1076)
+* d--eftp_name <2>:                      chapter.            (line 1904)
 
    (8)
 
@@ -2642,291 +2632,291 @@ chapter 2
 * Menu:
 
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  725)
-* -option <2>:                           chapter.            (line 1433)
-* ?:                                     chapter.            (line 2281)
-* .:                                     chapter.            (line 2281)
+* -option <1>:                           chapter.            (line  720)
+* -option <2>:                           chapter.            (line 1423)
+* ?:                                     chapter.            (line 2271)
+* .:                                     chapter.            (line 2271)
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  725)
-* " <2>:                                 chapter.            (line 1433)
-* a:                                     chapter.            (line 2281)
-* aaa, bbb:                              chapter.            (line 2281)
-* a--a:                                  chapter.            (line 2281)
-* a--asis:                               chapter.            (line  525)
-* a--asis <1>:                           chapter.            (line 1222)
-* a--asis <2>:                           chapter.            (line 2055)
+* " <1>:                                 chapter.            (line  720)
+* " <2>:                                 chapter.            (line 1423)
+* a:                                     chapter.            (line 2271)
+* aaa, bbb:                              chapter.            (line 2271)
+* a--a:                                  chapter.            (line 2271)
+* a--asis:                               chapter.            (line  522)
+* a--asis <1>:                           chapter.            (line 1214)
+* a--asis <2>:                           chapter.            (line 2045)
   aaa, See bbb.
-* b:                                     chapter.            (line  526)
-* b <1>:                                 chapter.            (line 1223)
-* b <2>:                                 chapter.            (line 2056)
-* b--b, c--c:                            chapter.            (line 2281)
-* counting entry:                        chapter.            (line 2623)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2281)
+* b:                                     chapter.            (line  523)
+* b <1>:                                 chapter.            (line 1215)
+* b <2>:                                 chapter.            (line 2046)
+* b--b, c--c:                            chapter.            (line 2271)
+* counting entry:                        chapter.            (line 2613)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2271)
 * d--efcv_name:                          chapter.            (line  366)
 * d--efcv_name <1>:                      chapter.            (line  369)
-* d--efcv_name <2>:                      chapter.            (line 1063)
-* d--efcv_name <3>:                      chapter.            (line 1066)
-* d--efcv_name <4>:                      chapter.            (line 1896)
-* d--efcv_name <5>:                      chapter.            (line 1899)
+* d--efcv_name <2>:                      chapter.            (line 1058)
+* d--efcv_name <3>:                      chapter.            (line 1061)
+* d--efcv_name <4>:                      chapter.            (line 1886)
+* d--efcv_name <5>:                      chapter.            (line 1889)
 * d--efivar_name of c--lass:             chapter.            (line  411)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1108)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1941)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1103)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1931)
 * d--efopt_name:                         chapter.            (line  402)
-* d--efopt_name <1>:                     chapter.            (line 1099)
-* d--efopt_name <2>:                     chapter.            (line 1932)
+* d--efopt_name <1>:                     chapter.            (line 1094)
+* d--efopt_name <2>:                     chapter.            (line 1922)
 * 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 1069)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1072)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1902)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1905)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1064)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1067)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1892)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1895)
 * 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 1140)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1143)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1974)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1977)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1135)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1138)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1964)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1967)
 * d--eftypeivar_name of c--lass:         chapter.            (line  414)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1111)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1944)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1106)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1934)
 * d--eftypevar_name:                     chapter.            (line  408)
-* d--eftypevar_name <1>:                 chapter.            (line 1105)
-* d--eftypevar_name <2>:                 chapter.            (line 1938)
+* d--eftypevar_name <1>:                 chapter.            (line 1100)
+* d--eftypevar_name <2>:                 chapter.            (line 1928)
 * d--eftypevr_name:                      chapter.            (line  363)
-* d--eftypevr_name <1>:                  chapter.            (line 1060)
-* d--eftypevr_name <2>:                  chapter.            (line 1893)
+* d--eftypevr_name <1>:                  chapter.            (line 1055)
+* d--eftypevr_name <2>:                  chapter.            (line 1883)
 * d--efvar_name:                         chapter.            (line  396)
 * d--efvar_name <1>:                     chapter.            (line  399)
-* d--efvar_name <2>:                     chapter.            (line 1093)
-* d--efvar_name <3>:                     chapter.            (line 1096)
-* d--efvar_name <4>:                     chapter.            (line 1926)
-* d--efvar_name <5>:                     chapter.            (line 1929)
+* d--efvar_name <2>:                     chapter.            (line 1088)
+* d--efvar_name <3>:                     chapter.            (line 1091)
+* d--efvar_name <4>:                     chapter.            (line 1916)
+* d--efvar_name <5>:                     chapter.            (line 1919)
 * d--efvr_name:                          chapter.            (line  342)
-* d--efvr_name <1>:                      chapter.            (line 1039)
-* d--efvr_name <2>:                      chapter.            (line 1872)
+* d--efvr_name <1>:                      chapter.            (line 1034)
+* d--efvr_name <2>:                      chapter.            (line 1862)
   ddd:                                   See also ccc.
   ddd:                                   See also ccc.
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2281)
-* index entry between item and itemx:    chapter.            (line  530)
-* index entry between item and itemx <1>: chapter.           (line  660)
-* index entry between item and itemx <2>: chapter.           (line 1227)
-* index entry between item and itemx <3>: chapter.           (line 1357)
-* index entry between item and itemx <4>: chapter.           (line 2060)
-* index entry between item and itemx <5>: chapter.           (line 2223)
-* index entry in footnote:               chapter.            (line 2618)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2271)
+* index entry between item and itemx:    chapter.            (line  527)
+* index entry between item and itemx <1>: chapter.           (line  657)
+* index entry between item and itemx <2>: chapter.           (line 1219)
+* index entry between item and itemx <3>: chapter.           (line 1349)
+* index entry between item and itemx <4>: chapter.           (line 2050)
+* index entry between item and itemx <5>: chapter.           (line 2213)
+* index entry in footnote:               chapter.            (line 2608)
 * index entry within deffn:              chapter.            (line  317)
-* index entry within deffn <1>:          chapter.            (line 1014)
-* index entry within deffn <2>:          chapter.            (line 1845)
+* index entry within deffn <1>:          chapter.            (line 1009)
+* index entry within deffn <2>:          chapter.            (line 1835)
 * index entry within itemize:            chapter.            (line  228)
-* index entry within itemize <1>:        chapter.            (line  925)
-* index entry within itemize <2>:        chapter.            (line 1756)
+* index entry within itemize <1>:        chapter.            (line  920)
+* index entry within itemize <2>:        chapter.            (line 1746)
 * index entry within multitable:         chapter.            (line  250)
-* index entry within multitable <1>:     chapter.            (line  947)
-* index entry within multitable <2>:     chapter.            (line 1779)
-* t-ruc:                                 chapter.            (line 2281)
-* T-ruc:                                 chapter.            (line 2281)
+* index entry within multitable <1>:     chapter.            (line  942)
+* index entry within multitable <2>:     chapter.            (line 1769)
+* t-ruc:                                 chapter.            (line 2271)
+* T-ruc:                                 chapter.            (line 2271)
 * vtable i--tem code kbdinputstyle:      chapter.            (line  152)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  849)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1679)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  844)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1669)
 * vtable i--tem default kbdinputstyle:   chapter.            (line  147)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  844)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1674)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  839)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1664)
 * vtable i--tem distinct kbdinputstyle:  chapter.            (line  162)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  859)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1689)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  854)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1679)
 * vtable i--tem example kbdinputstyle:   chapter.            (line  157)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  854)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1684)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  849)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1674)
 * vtable i--tem in example code kbdinputstyle: chapter.      (line  154)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  851)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1681)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  846)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1671)
 * vtable i--tem in example default kbdinputstyle: chapter.   (line  149)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  846)
+                                                             (line  841)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1676)
+                                                             (line 1666)
 * vtable i--tem in example distinct kbdinputstyle: chapter.  (line  164)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  861)
+                                                             (line  856)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1691)
+                                                             (line 1681)
 * vtable i--tem in example example kbdinputstyle: chapter.   (line  159)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  856)
+                                                             (line  851)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1686)
+                                                             (line 1676)
 
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  725)
-* --foption <2>:                         chapter.            (line 1433)
-* ?:                                     chapter.            (line 2281)
-* .:                                     chapter.            (line 2281)
+* --foption <1>:                         chapter.            (line  720)
+* --foption <2>:                         chapter.            (line 1423)
+* ?:                                     chapter.            (line 2271)
+* .:                                     chapter.            (line 2271)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  725)
-* `` <2>:                                chapter.            (line 1433)
+* `` <1>:                                chapter.            (line  720)
+* `` <2>:                                chapter.            (line 1423)
 * a:                                     chapter.            (line  330)
-* a <1>:                                 chapter.            (line  529)
-* a <2>:                                 chapter.            (line  659)
-* a <3>:                                 chapter.            (line 1027)
-* a <4>:                                 chapter.            (line 1226)
-* a <5>:                                 chapter.            (line 1356)
-* a <6>:                                 chapter.            (line 1858)
-* a <7>:                                 chapter.            (line 2059)
-* a <8>:                                 chapter.            (line 2222)
-* a <9>:                                 chapter.            (line 2281)
-* after:                                 chapter.            (line  670)
-* after <1>:                             chapter.            (line 1367)
-* after <2>:                             chapter.            (line 2233)
+* a <1>:                                 chapter.            (line  526)
+* a <2>:                                 chapter.            (line  656)
+* a <3>:                                 chapter.            (line 1022)
+* a <4>:                                 chapter.            (line 1218)
+* a <5>:                                 chapter.            (line 1348)
+* a <6>:                                 chapter.            (line 1848)
+* a <7>:                                 chapter.            (line 2049)
+* a <8>:                                 chapter.            (line 2212)
+* a <9>:                                 chapter.            (line 2271)
+* after:                                 chapter.            (line  667)
+* after <1>:                             chapter.            (line 1359)
+* after <2>:                             chapter.            (line 2223)
 * arg2:                                  chapter.            (line  449)
-* arg2 <1>:                              chapter.            (line 1146)
-* arg2 <2>:                              chapter.            (line 1981)
-* b:                                     chapter.            (line  530)
-* b <1>:                                 chapter.            (line  660)
-* b <2>:                                 chapter.            (line 1227)
-* b <3>:                                 chapter.            (line 1357)
-* b <4>:                                 chapter.            (line 2060)
-* b <5>:                                 chapter.            (line 2223)
+* arg2 <1>:                              chapter.            (line 1141)
+* arg2 <2>:                              chapter.            (line 1971)
+* b:                                     chapter.            (line  527)
+* b <1>:                                 chapter.            (line  657)
+* b <2>:                                 chapter.            (line 1219)
+* b <3>:                                 chapter.            (line 1349)
+* b <4>:                                 chapter.            (line 2050)
+* b <5>:                                 chapter.            (line 2213)
 * bidule machin:                         chapter.            (line  325)
-* bidule machin <1>:                     chapter.            (line 1022)
-* bidule machin <2>:                     chapter.            (line 1853)
+* bidule machin <1>:                     chapter.            (line 1017)
+* bidule machin <2>:                     chapter.            (line 1843)
 * d--effn_name:                          chapter.            (line  309)
-* d--effn_name <1>:                      chapter.            (line 1006)
-* d--effn_name <2>:                      chapter.            (line 1837)
+* d--effn_name <1>:                      chapter.            (line 1001)
+* d--effn_name <2>:                      chapter.            (line 1827)
 * d--efmac_name:                         chapter.            (line  390)
-* d--efmac_name <1>:                     chapter.            (line 1087)
-* d--efmac_name <2>:                     chapter.            (line 1920)
+* d--efmac_name <1>:                     chapter.            (line 1082)
+* d--efmac_name <2>:                     chapter.            (line 1910)
 * d--efmethod_name on c--lass:           chapter.            (line  417)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1114)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1947)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1109)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1937)
 * 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 1075)
-* d--efop_name on c--lass <3>:           chapter.            (line 1078)
-* d--efop_name on c--lass <4>:           chapter.            (line 1908)
-* d--efop_name on c--lass <5>:           chapter.            (line 1911)
+* d--efop_name on c--lass <2>:           chapter.            (line 1070)
+* d--efop_name on c--lass <3>:           chapter.            (line 1073)
+* d--efop_name on c--lass <4>:           chapter.            (line 1898)
+* d--efop_name on c--lass <5>:           chapter.            (line 1901)
 * d--efspec_name:                        chapter.            (line  393)
-* d--efspec_name <1>:                    chapter.            (line 1090)
-* d--efspec_name <2>:                    chapter.            (line 1923)
+* d--efspec_name <1>:                    chapter.            (line 1085)
+* d--efspec_name <2>:                    chapter.            (line 1913)
 * d--eftypefn_name:                      chapter.            (line  351)
 * d--eftypefn_name <1>:                  chapter.            (line  354)
-* d--eftypefn_name <2>:                  chapter.            (line 1048)
-* d--eftypefn_name <3>:                  chapter.            (line 1051)
-* d--eftypefn_name <4>:                  chapter.            (line 1881)
-* d--eftypefn_name <5>:                  chapter.            (line 1884)
+* d--eftypefn_name <2>:                  chapter.            (line 1043)
+* d--eftypefn_name <3>:                  chapter.            (line 1046)
+* d--eftypefn_name <4>:                  chapter.            (line 1871)
+* d--eftypefn_name <5>:                  chapter.            (line 1874)
 * d--eftypefn_name2:                     chapter.            (line  428)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1125)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1959)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1120)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1949)
 * d--eftypefun_name:                     chapter.            (line  405)
-* d--eftypefun_name <1>:                 chapter.            (line 1102)
-* d--eftypefun_name <2>:                 chapter.            (line 1935)
+* d--eftypefun_name <1>:                 chapter.            (line 1097)
+* d--eftypefun_name <2>:                 chapter.            (line 1925)
 * d--eftypemethod_name on c--lass:       chapter.            (line  420)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1117)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1950)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1112)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1940)
 * 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 1054)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1057)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1887)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1890)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1049)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1052)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1877)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1880)
 * 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 1130)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1135)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1964)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1969)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1125)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1130)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1954)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1959)
 * d--efun_name:                          chapter.            (line  387)
-* d--efun_name <1>:                      chapter.            (line 1084)
-* d--efun_name <2>:                      chapter.            (line 1917)
+* d--efun_name <1>:                      chapter.            (line 1079)
+* d--efun_name <2>:                      chapter.            (line 1907)
 * de--ffn_name:                          chapter.            (line  312)
-* de--ffn_name <1>:                      chapter.            (line 1009)
-* de--ffn_name <2>:                      chapter.            (line 1840)
+* de--ffn_name <1>:                      chapter.            (line 1004)
+* de--ffn_name <2>:                      chapter.            (line 1830)
 * deffn:                                 chapter.            (line  333)
 * deffn <1>:                             chapter.            (line  335)
-* deffn <2>:                             chapter.            (line 1030)
-* deffn <3>:                             chapter.            (line 1032)
-* deffn <4>:                             chapter.            (line 1862)
-* deffn <5>:                             chapter.            (line 1864)
+* deffn <2>:                             chapter.            (line 1025)
+* deffn <3>:                             chapter.            (line 1027)
+* deffn <4>:                             chapter.            (line 1852)
+* deffn <5>:                             chapter.            (line 1854)
 * deffnx:                                chapter.            (line  331)
 * deffnx <1>:                            chapter.            (line  336)
-* deffnx <2>:                            chapter.            (line 1028)
-* deffnx <3>:                            chapter.            (line 1033)
-* deffnx <4>:                            chapter.            (line 1859)
-* deffnx <5>:                            chapter.            (line 1865)
-* f---aa:                                chapter.            (line 2281)
+* deffnx <2>:                            chapter.            (line 1023)
+* deffnx <3>:                            chapter.            (line 1028)
+* deffnx <4>:                            chapter.            (line 1849)
+* deffnx <5>:                            chapter.            (line 1855)
+* f---aa:                                chapter.            (line 2271)
   f---aaa, See f---bbb.
-* f---bb, f---cc:                        chapter.            (line 2281)
+* f---bb, f---cc:                        chapter.            (line 2271)
   f---ddd:                               See also f---ccc.
   f---ddd:                               See also f---ccc.
-* f---ddd, f---eee, ffff:                chapter.            (line 2281)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2281)
+* f---ddd, f---eee, ffff:                chapter.            (line 2271)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2271)
 * followed:                              chapter.            (line  328)
-* followed <1>:                          chapter.            (line  668)
-* followed <2>:                          chapter.            (line 1025)
-* followed <3>:                          chapter.            (line 1365)
-* followed <4>:                          chapter.            (line 1856)
-* followed <5>:                          chapter.            (line 2231)
+* followed <1>:                          chapter.            (line  665)
+* followed <2>:                          chapter.            (line 1020)
+* followed <3>:                          chapter.            (line 1357)
+* followed <4>:                          chapter.            (line 1846)
+* followed <5>:                          chapter.            (line 2221)
 * I:                                     chapter.            (line  316)
 * I <1>:                                 chapter.            (line  338)
-* I <2>:                                 chapter.            (line 1013)
-* I <3>:                                 chapter.            (line 1035)
-* I <4>:                                 chapter.            (line 1844)
-* I <5>:                                 chapter.            (line 1867)
+* I <2>:                                 chapter.            (line 1008)
+* I <3>:                                 chapter.            (line 1030)
+* I <4>:                                 chapter.            (line 1834)
+* I <5>:                                 chapter.            (line 1857)
 * id i ule:                              chapter.            (line  322)
-* id i ule <1>:                          chapter.            (line 1019)
-* id i ule <2>:                          chapter.            (line 1850)
+* id i ule <1>:                          chapter.            (line 1014)
+* id i ule <2>:                          chapter.            (line 1840)
 * id ule:                                chapter.            (line  321)
-* id ule <1>:                            chapter.            (line 1018)
-* id ule <2>:                            chapter.            (line 1849)
-* INVALID:                               chapter.            (line  672)
-* INVALID <1>:                           chapter.            (line 1369)
-* INVALID <2>:                           chapter.            (line 2235)
+* id ule <1>:                            chapter.            (line 1013)
+* id ule <2>:                            chapter.            (line 1839)
+* INVALID:                               chapter.            (line  669)
+* INVALID <1>:                           chapter.            (line 1361)
+* INVALID <2>:                           chapter.            (line 2225)
 * log trap:                              chapter.            (line  318)
-* log trap <1>:                          chapter.            (line 1015)
-* log trap <2>:                          chapter.            (line 1846)
+* log trap <1>:                          chapter.            (line 1010)
+* log trap <2>:                          chapter.            (line 1836)
 * log trap1:                             chapter.            (line  319)
-* log trap1 <1>:                         chapter.            (line 1016)
-* log trap1 <2>:                         chapter.            (line 1847)
+* log trap1 <1>:                         chapter.            (line 1011)
+* log trap1 <2>:                         chapter.            (line 1837)
 * log trap2:                             chapter.            (line  320)
-* log trap2 <1>:                         chapter.            (line 1017)
-* log trap2 <2>:                         chapter.            (line 1848)
+* log trap2 <1>:                         chapter.            (line 1012)
+* log trap2 <2>:                         chapter.            (line 1838)
 * machin:                                chapter.            (line  324)
 * machin <1>:                            chapter.            (line  326)
-* machin <2>:                            chapter.            (line  664)
-* machin <3>:                            chapter.            (line  665)
-* machin <4>:                            chapter.            (line  666)
-* machin <5>:                            chapter.            (line  667)
-* machin <6>:                            chapter.            (line 1021)
-* machin <7>:                            chapter.            (line 1023)
-* machin <8>:                            chapter.            (line 1361)
-* machin <9>:                            chapter.            (line 1362)
-* machin <10>:                           chapter.            (line 1363)
-* machin <11>:                           chapter.            (line 1364)
-* machin <12>:                           chapter.            (line 1852)
-* machin <13>:                           chapter.            (line 1854)
-* machin <14>:                           chapter.            (line 2227)
-* machin <15>:                           chapter.            (line 2228)
-* machin <16>:                           chapter.            (line 2229)
-* machin <17>:                           chapter.            (line 2230)
+* machin <2>:                            chapter.            (line  661)
+* machin <3>:                            chapter.            (line  662)
+* machin <4>:                            chapter.            (line  663)
+* machin <5>:                            chapter.            (line  664)
+* machin <6>:                            chapter.            (line 1016)
+* machin <7>:                            chapter.            (line 1018)
+* machin <8>:                            chapter.            (line 1353)
+* machin <9>:                            chapter.            (line 1354)
+* machin <10>:                           chapter.            (line 1355)
+* machin <11>:                           chapter.            (line 1356)
+* machin <12>:                           chapter.            (line 1842)
+* machin <13>:                           chapter.            (line 1844)
+* machin <14>:                           chapter.            (line 2217)
+* machin <15>:                           chapter.            (line 2218)
+* machin <16>:                           chapter.            (line 2219)
+* machin <17>:                           chapter.            (line 2220)
 * n--ame:                                chapter.            (line  345)
 * n--ame <1>:                            chapter.            (line  348)
-* n--ame <2>:                            chapter.            (line 1042)
-* n--ame <3>:                            chapter.            (line 1045)
-* n--ame <4>:                            chapter.            (line 1875)
-* n--ame <5>:                            chapter.            (line 1878)
+* n--ame <2>:                            chapter.            (line 1037)
+* n--ame <3>:                            chapter.            (line 1040)
+* n--ame <4>:                            chapter.            (line 1865)
+* n--ame <5>:                            chapter.            (line 1868)
 * name2:                                 chapter.            (line  423)
-* name2 <1>:                             chapter.            (line 1120)
-* name2 <2>:                             chapter.            (line 1954)
-* t--ruc:                                chapter.            (line 2281)
-* T--ruc:                                chapter.            (line 2281)
+* name2 <1>:                             chapter.            (line 1115)
+* name2 <2>:                             chapter.            (line 1944)
+* t--ruc:                                chapter.            (line 2271)
+* T--ruc:                                chapter.            (line 2271)
 * truc:                                  chapter.            (line  317)
 * truc <1>:                              chapter.            (line  339)
-* truc <2>:                              chapter.            (line 1014)
-* truc <3>:                              chapter.            (line 1036)
-* truc <4>:                              chapter.            (line 1845)
-* truc <5>:                              chapter.            (line 1868)
-* xxx, zzz:                              chapter.            (line 2281)
+* truc <2>:                              chapter.            (line 1009)
+* truc <3>:                              chapter.            (line 1031)
+* truc <4>:                              chapter.            (line 1835)
+* truc <5>:                              chapter.            (line 1858)
+* xxx, zzz:                              chapter.            (line 2271)
 
 Top section
 1 chapter



reply via email to

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