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, 31 Jul 2022 07:09:20 -0400 (EDT)

branch: master
commit f37678d66cf288a3a6fc831fda7909bc22cfa554
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Jul 31 13:09:05 2022 +0200

    No @deftypefnnewline effect on typed variable definitions in Info
    
    * tp/Texinfo/Convert/Plaintext.pm (_convert): effect of
    @deftypefnnewline on for deftypefn and deftypeop only.
---
 ChangeLog                                          |   7 +
 tp/Texinfo/Convert/Plaintext.pm                    |  36 +-
 .../converters_tests/test_deftypefnnewline.pl      |   8 +-
 .../res_parser/formatting_info/formatting.info     | 889 ++++++++++-----------
 .../res_parser/formatting_plaintext/formatting.txt | 849 ++++++++++----------
 5 files changed, 878 insertions(+), 911 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f122c2c70d..8a1b1e20f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2022-07-31  Patrice Dumas  <pertusus@free.fr>
+
+       No @deftypefnnewline effect on typed variable definitions in Info
+
+       * tp/Texinfo/Convert/Plaintext.pm (_convert): effect of
+       @deftypefnnewline on for deftypefn and deftypeop only.
+
 2022-07-31  Patrice Dumas  <pertusus@free.fr>
 
        No @deftypefnnewline effect on typed variable definitions in LaTeX
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 4e40bd598c..68813ad199 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -2821,7 +2821,8 @@ sub _convert($$)
                     'name' => $name,
                     'type' => 
$element->{'extra'}->{'def_parsed_hash'}->{'type'},
                     'arguments' => $arguments};
-            if ($self->get_conf('deftypefnnewline') eq 'on') {
+            if ($self->get_conf('deftypefnnewline') eq 'on'
+                and $command eq 'deftypefn') {
               $tree = $self->gdt("\@tie{}-- {category}:\@*{type}\@*{name} 
{arguments}",
                                  $strings);
             } else {
@@ -2833,7 +2834,8 @@ sub _convert($$)
                     'category' => 
$element->{'extra'}->{'def_parsed_hash'}->{'category'},
                     'type' => 
$element->{'extra'}->{'def_parsed_hash'}->{'type'},
                     'name' => $name};
-            if ($self->get_conf('deftypefnnewline') eq 'on') {
+            if ($self->get_conf('deftypefnnewline') eq 'on'
+                and $command eq 'deftypefn') {
               $tree = $self->gdt("\@tie{}-- {category}:\@*{type}\@*{name}",
                                  $strings);
             } else {
@@ -2880,11 +2882,11 @@ sub _convert($$)
                     'type' => 
$element->{'extra'}->{'def_parsed_hash'}->{'type'},
                     'arguments' => $arguments};
             if ($self->get_conf('deftypefnnewline') eq 'on') {
-              $tree 
+              $tree
                 = $self->gdt("\@tie{}-- {category} on 
{class}:\@*{type}\@*{name} {arguments}",
                              $strings);
             } else {
-              $tree 
+              $tree
                 = $self->gdt("\@tie{}-- {category} on {class}: {type} {name} 
{arguments}",
                              $strings);
             }
@@ -2895,11 +2897,11 @@ sub _convert($$)
                     'class' => 
$element->{'extra'}->{'def_parsed_hash'}->{'class'},
                     'name' => $name};
             if ($self->get_conf('deftypefnnewline') eq 'on') {
-              $tree 
+              $tree
                 = $self->gdt("\@tie{}-- {category} on 
{class}:\@*{type}\@*{name}",
                              $strings);
             } else {
-              $tree 
+              $tree
                 = $self->gdt("\@tie{}-- {category} on {class}: {type} {name}",
                              $strings);
             }
@@ -2912,30 +2914,18 @@ sub _convert($$)
                     'class' => 
$element->{'extra'}->{'def_parsed_hash'}->{'class'},
                     'type' => 
$element->{'extra'}->{'def_parsed_hash'}->{'type'},
                     'arguments' => $arguments};
-            if ($self->get_conf('deftypefnnewline') eq 'on') {
-              $tree 
-                = $self->gdt("\@tie{}-- {category} of 
{class}:\@*{type}\@*{name} {arguments}",
-                             $strings);
-            } else {
-              $tree 
-                = $self->gdt("\@tie{}-- {category} of {class}: {type} {name} 
{arguments}",
-                             $strings);
-            }
+            $tree
+              = $self->gdt("\@tie{}-- {category} of {class}: {type} {name} 
{arguments}",
+                           $strings);
           } else {
             my $strings = {
                     'category' => 
$element->{'extra'}->{'def_parsed_hash'}->{'category'},
                     'type' => 
$element->{'extra'}->{'def_parsed_hash'}->{'type'},
                     'class' => 
$element->{'extra'}->{'def_parsed_hash'}->{'class'},
                     'name' => $name};
-            if ($self->get_conf('deftypefnnewline') eq 'on') {
-              $tree 
-                = $self->gdt("\@tie{}-- {category} of 
{class}:\@*{type}\@*{name}",
+            $tree
+              = $self->gdt("\@tie{}-- {category} of {class}: {type} {name}",
                              $strings);
-            } else {
-              $tree 
-                = $self->gdt("\@tie{}-- {category} of {class}: {type} {name}",
-                             $strings);
-            }
           }
         }
 
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl 
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index 58ef3d6b7e..50a88803d8 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -3369,14 +3369,10 @@ 
$result_converted{'plaintext'}->{'test_deftypefnnewline'} = 'top
           d--eftypeop_name
      d–eftypeop no arg
 
- -- c--ategory of c--lass:
-          t--ype
-          d--eftypecv_name
+ -- c--ategory of c--lass: t--ype d--eftypecv_name
      d–eftypecv
 
- -- c--ategory of c--lass:
-          t--ype
-          d--eftypecv_name a--rguments...
+ -- c--ategory of c--lass: t--ype d--eftypecv_name a--rguments...
      d–eftypecv with arguments
 
  -- fun: arg
diff --git a/tp/tests/layout/res_parser/formatting_info/formatting.info 
b/tp/tests/layout/res_parser/formatting_info/formatting.info
index bfda32e76a..06e7a804f5 100644
--- a/tp/tests/layout/res_parser/formatting_info/formatting.info
+++ b/tp/tests/layout/res_parser/formatting_info/formatting.info
@@ -403,14 +403,10 @@ s-mallformat
           d--eftypeop_name2
      d-eftypeop no arg2
 
- -- c--ategory2 of c--lass2:
-          t--ype2
-          d--eftypecv_name2
+ -- c--ategory2 of c--lass2: t--ype2 d--eftypecv_name2
      d-eftypecv2
 
- -- c--ategory2 of c--lass2:
-          t--ype2
-          d--eftypecv_name2 a--rguments2...
+ -- c--ategory2 of c--lass2: t--ype2 d--eftypecv_name2 a--rguments2...
      d-eftypecv with arguments2
 
  -- fun2: arg2
@@ -1117,14 +1113,10 @@ s-mallformat
           d--eftypeop_name2
      d-eftypeop no arg2
 
- -- c--ategory2 of c--lass2:
-          t--ype2
-          d--eftypecv_name2
+ -- c--ategory2 of c--lass2: t--ype2 d--eftypecv_name2
      d-eftypecv2
 
- -- c--ategory2 of c--lass2:
-          t--ype2
-          d--eftypecv_name2 a--rguments2...
+ -- c--ategory2 of c--lass2: t--ype2 d--eftypecv_name2 a--rguments2...
      d-eftypecv with arguments2
 
  -- fun2: arg2
@@ -1788,14 +1780,10 @@ s-mallformat
           d--eftypeop_name2
      d-eftypeop no arg2
 
- -- c--ategory2 of c--lass2:
-          t--ype2
-          d--eftypecv_name2
+ -- c--ategory2 of c--lass2: t--ype2 d--eftypecv_name2
      d-eftypecv2
 
- -- c--ategory2 of c--lass2:
-          t--ype2
-          d--eftypecv_name2 a--rguments2...
+ -- c--ategory2 of c--lass2: t--ype2 d--eftypecv_name2 a--rguments2...
      d-eftypecv with arguments2
 
  -- fun2: arg2
@@ -2598,14 +2586,11 @@ cross ref name: (file name). '@inforef{}' *note ::
                d--eftypeop_name2
           d--eftypeop no arg2
 
-      -- c--ategory2 of c--lass2:
-               t--ype2
-               d--eftypecv_name2
+      -- c--ategory2 of c--lass2: t--ype2 d--eftypecv_name2
           d--eftypecv2
 
-      -- c--ategory2 of c--lass2:
-               t--ype2
-               d--eftypecv_name2 a--rguments2...
+      -- c--ategory2 of c--lass2: t--ype2 d--eftypecv_name2
+               a--rguments2...
           d--eftypecv with arguments2
 
       -- fun2: arg2
@@ -2911,14 +2896,14 @@ aaa"]
 [index]
 * Menu:
 
-* truc:                                  chapter.            (line 2184)
+* truc:                                  chapter.            (line 2173)
 
    codeidx
 
 [index]
 * Menu:
 
-* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2184)
+* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2173)
 
    cp
 
@@ -2926,116 +2911,116 @@ aaa"]
 * Menu:
 
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  692)
-* " <2>:                                 chapter.            (line 1367)
+* " <1>:                                 chapter.            (line  688)
+* " <2>:                                 chapter.            (line 1359)
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  692)
-* -option <2>:                           chapter.            (line 1367)
-* .:                                     chapter.            (line 2184)
-* ?:                                     chapter.            (line 2184)
-* a:                                     chapter.            (line 2184)
-* aaa, bbb:                              chapter.            (line 2184)
-* a--a:                                  chapter.            (line 2184)
-* a--asis:                               chapter.            (line  504)
-* a--asis <1>:                           chapter.            (line 1168)
-* a--asis <2>:                           chapter.            (line 1969)
-* b:                                     chapter.            (line  505)
-* b <1>:                                 chapter.            (line 1169)
-* b <2>:                                 chapter.            (line 1970)
-* b--b, c--c:                            chapter.            (line 2184)
+* -option <1>:                           chapter.            (line  688)
+* -option <2>:                           chapter.            (line 1359)
+* .:                                     chapter.            (line 2173)
+* ?:                                     chapter.            (line 2173)
+* a:                                     chapter.            (line 2173)
+* aaa, bbb:                              chapter.            (line 2173)
+* a--a:                                  chapter.            (line 2173)
+* a--asis:                               chapter.            (line  500)
+* a--asis <1>:                           chapter.            (line 1160)
+* a--asis <2>:                           chapter.            (line 1958)
+* b:                                     chapter.            (line  501)
+* b <1>:                                 chapter.            (line 1161)
+* b <2>:                                 chapter.            (line 1959)
+* b--b, c--c:                            chapter.            (line 2173)
 * counting entry:                        chapter.            (line    4)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2184)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2173)
 * d--efcv_name:                          chapter.            (line  341)
 * d--efcv_name <1>:                      chapter.            (line  344)
-* d--efcv_name <2>:                      chapter.            (line 1005)
-* d--efcv_name <3>:                      chapter.            (line 1008)
-* d--efcv_name <4>:                      chapter.            (line 1807)
-* d--efcv_name <5>:                      chapter.            (line 1810)
+* d--efcv_name <2>:                      chapter.            (line 1001)
+* d--efcv_name <3>:                      chapter.            (line 1004)
+* d--efcv_name <4>:                      chapter.            (line 1799)
+* d--efcv_name <5>:                      chapter.            (line 1802)
 * d--efivar_name of c--lass:             chapter.            (line  386)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1050)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1852)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1046)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1844)
 * d--efopt_name:                         chapter.            (line  377)
-* d--efopt_name <1>:                     chapter.            (line 1041)
-* d--efopt_name <2>:                     chapter.            (line 1843)
+* d--efopt_name <1>:                     chapter.            (line 1037)
+* d--efopt_name <2>:                     chapter.            (line 1835)
 * d--eftypecv_name of c--lass:           chapter.            (line  347)
 * d--eftypecv_name of c--lass <1>:       chapter.            (line  350)
-* d--eftypecv_name of c--lass <2>:       chapter.            (line 1011)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1014)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1813)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1816)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1007)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1010)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1805)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1808)
 * d--eftypecv_name2 of c--lass2:         chapter.            (line  418)
-* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  423)
-* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1082)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1087)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1885)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1890)
+* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  421)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1078)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1081)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1877)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1880)
 * d--eftypeivar_name of c--lass:         chapter.            (line  389)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1053)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1855)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1049)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1847)
 * d--eftypevar_name:                     chapter.            (line  383)
-* d--eftypevar_name <1>:                 chapter.            (line 1047)
-* d--eftypevar_name <2>:                 chapter.            (line 1849)
+* d--eftypevar_name <1>:                 chapter.            (line 1043)
+* d--eftypevar_name <2>:                 chapter.            (line 1841)
 * d--eftypevr_name:                      chapter.            (line  338)
-* d--eftypevr_name <1>:                  chapter.            (line 1002)
-* d--eftypevr_name <2>:                  chapter.            (line 1804)
+* d--eftypevr_name <1>:                  chapter.            (line  998)
+* d--eftypevr_name <2>:                  chapter.            (line 1796)
 * d--efvar_name:                         chapter.            (line  371)
 * d--efvar_name <1>:                     chapter.            (line  374)
-* d--efvar_name <2>:                     chapter.            (line 1035)
-* d--efvar_name <3>:                     chapter.            (line 1038)
-* d--efvar_name <4>:                     chapter.            (line 1837)
-* d--efvar_name <5>:                     chapter.            (line 1840)
+* d--efvar_name <2>:                     chapter.            (line 1031)
+* d--efvar_name <3>:                     chapter.            (line 1034)
+* d--efvar_name <4>:                     chapter.            (line 1829)
+* d--efvar_name <5>:                     chapter.            (line 1832)
 * d--efvr_name:                          chapter.            (line  317)
-* d--efvr_name <1>:                      chapter.            (line  981)
-* d--efvr_name <2>:                      chapter.            (line 1783)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2184)
-* index entry between item and itemx:    chapter.            (line  509)
-* index entry between item and itemx <1>: chapter.           (line  627)
-* index entry between item and itemx <2>: chapter.           (line 1173)
-* index entry between item and itemx <3>: chapter.           (line 1291)
-* index entry between item and itemx <4>: chapter.           (line 1974)
-* index entry between item and itemx <5>: chapter.           (line 2125)
+* d--efvr_name <1>:                      chapter.            (line  977)
+* d--efvr_name <2>:                      chapter.            (line 1775)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2173)
+* index entry between item and itemx:    chapter.            (line  505)
+* index entry between item and itemx <1>: chapter.           (line  623)
+* index entry between item and itemx <2>: chapter.           (line 1165)
+* index entry between item and itemx <3>: chapter.           (line 1283)
+* index entry between item and itemx <4>: chapter.           (line 1963)
+* index entry between item and itemx <5>: chapter.           (line 2114)
 * index entry in footnote:               chapter.            (line    4)
 * index entry within deffn:              chapter.            (line  292)
-* index entry within deffn <1>:          chapter.            (line  956)
-* index entry within deffn <2>:          chapter.            (line 1756)
+* index entry within deffn <1>:          chapter.            (line  952)
+* index entry within deffn <2>:          chapter.            (line 1748)
 * index entry within itemize:            chapter.            (line  203)
-* index entry within itemize <1>:        chapter.            (line  867)
-* index entry within itemize <2>:        chapter.            (line 1667)
+* index entry within itemize <1>:        chapter.            (line  863)
+* index entry within itemize <2>:        chapter.            (line 1659)
 * index entry within multitable:         chapter.            (line  225)
-* index entry within multitable <1>:     chapter.            (line  889)
-* index entry within multitable <2>:     chapter.            (line 1690)
-* t-ruc:                                 chapter.            (line 2184)
-* T-ruc:                                 chapter.            (line 2184)
+* index entry within multitable <1>:     chapter.            (line  885)
+* index entry within multitable <2>:     chapter.            (line 1682)
+* t-ruc:                                 chapter.            (line 2173)
+* T-ruc:                                 chapter.            (line 2173)
 * vtable i--tem code kbdinputstyle:      chapter.            (line  127)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  791)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1590)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  787)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1582)
 * vtable i--tem default kbdinputstyle:   chapter.            (line  122)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  786)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1585)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  782)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1577)
 * vtable i--tem distinct kbdinputstyle:  chapter.            (line  137)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  801)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1600)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  797)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1592)
 * vtable i--tem example kbdinputstyle:   chapter.            (line  132)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  796)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1595)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  792)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1587)
 * vtable i--tem in example code kbdinputstyle: chapter.      (line  129)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  793)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1592)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  789)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1584)
 * vtable i--tem in example default kbdinputstyle: chapter.   (line  124)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  788)
+                                                             (line  784)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1587)
+                                                             (line 1579)
 * vtable i--tem in example distinct kbdinputstyle: chapter.  (line  139)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  803)
+                                                             (line  799)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1602)
+                                                             (line 1594)
 * vtable i--tem in example example kbdinputstyle: chapter.   (line  134)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  798)
+                                                             (line  794)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1597)
+                                                             (line 1589)
 
    fn
 
@@ -3043,171 +3028,171 @@ aaa"]
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  692)
-* --foption <2>:                         chapter.            (line 1367)
-* .:                                     chapter.            (line 2184)
-* ?:                                     chapter.            (line 2184)
+* --foption <1>:                         chapter.            (line  688)
+* --foption <2>:                         chapter.            (line 1359)
+* .:                                     chapter.            (line 2173)
+* ?:                                     chapter.            (line 2173)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  692)
-* `` <2>:                                chapter.            (line 1367)
+* `` <1>:                                chapter.            (line  688)
+* `` <2>:                                chapter.            (line 1359)
 * a:                                     chapter.            (line  305)
-* a <1>:                                 chapter.            (line  508)
-* a <2>:                                 chapter.            (line  626)
-* a <3>:                                 chapter.            (line  969)
-* a <4>:                                 chapter.            (line 1172)
-* a <5>:                                 chapter.            (line 1290)
-* a <6>:                                 chapter.            (line 1769)
-* a <7>:                                 chapter.            (line 1973)
-* a <8>:                                 chapter.            (line 2124)
-* a <9>:                                 chapter.            (line 2184)
-* after:                                 chapter.            (line  637)
-* after <1>:                             chapter.            (line 1301)
-* after <2>:                             chapter.            (line 2135)
-* arg2:                                  chapter.            (line  428)
-* arg2 <1>:                              chapter.            (line 1092)
-* arg2 <2>:                              chapter.            (line 1895)
-* b:                                     chapter.            (line  509)
-* b <1>:                                 chapter.            (line  627)
-* b <2>:                                 chapter.            (line 1173)
-* b <3>:                                 chapter.            (line 1291)
-* b <4>:                                 chapter.            (line 1974)
-* b <5>:                                 chapter.            (line 2125)
+* a <1>:                                 chapter.            (line  504)
+* a <2>:                                 chapter.            (line  622)
+* a <3>:                                 chapter.            (line  965)
+* a <4>:                                 chapter.            (line 1164)
+* a <5>:                                 chapter.            (line 1282)
+* a <6>:                                 chapter.            (line 1761)
+* a <7>:                                 chapter.            (line 1962)
+* a <8>:                                 chapter.            (line 2113)
+* a <9>:                                 chapter.            (line 2173)
+* after:                                 chapter.            (line  633)
+* after <1>:                             chapter.            (line 1293)
+* after <2>:                             chapter.            (line 2124)
+* arg2:                                  chapter.            (line  424)
+* arg2 <1>:                              chapter.            (line 1084)
+* arg2 <2>:                              chapter.            (line 1884)
+* b:                                     chapter.            (line  505)
+* b <1>:                                 chapter.            (line  623)
+* b <2>:                                 chapter.            (line 1165)
+* b <3>:                                 chapter.            (line 1283)
+* b <4>:                                 chapter.            (line 1963)
+* b <5>:                                 chapter.            (line 2114)
 * bidule machin:                         chapter.            (line  300)
-* bidule machin <1>:                     chapter.            (line  964)
-* bidule machin <2>:                     chapter.            (line 1764)
+* bidule machin <1>:                     chapter.            (line  960)
+* bidule machin <2>:                     chapter.            (line 1756)
 * d--effn_name:                          chapter.            (line  284)
-* d--effn_name <1>:                      chapter.            (line  948)
-* d--effn_name <2>:                      chapter.            (line 1748)
+* d--effn_name <1>:                      chapter.            (line  944)
+* d--effn_name <2>:                      chapter.            (line 1740)
 * d--efmac_name:                         chapter.            (line  365)
-* d--efmac_name <1>:                     chapter.            (line 1029)
-* d--efmac_name <2>:                     chapter.            (line 1831)
+* d--efmac_name <1>:                     chapter.            (line 1025)
+* d--efmac_name <2>:                     chapter.            (line 1823)
 * d--efmethod_name on c--lass:           chapter.            (line  392)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1056)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1858)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1052)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1850)
 * d--efop_name on c--lass:               chapter.            (line  353)
 * d--efop_name on c--lass <1>:           chapter.            (line  356)
-* d--efop_name on c--lass <2>:           chapter.            (line 1017)
-* d--efop_name on c--lass <3>:           chapter.            (line 1020)
-* d--efop_name on c--lass <4>:           chapter.            (line 1819)
-* d--efop_name on c--lass <5>:           chapter.            (line 1822)
+* d--efop_name on c--lass <2>:           chapter.            (line 1013)
+* d--efop_name on c--lass <3>:           chapter.            (line 1016)
+* d--efop_name on c--lass <4>:           chapter.            (line 1811)
+* d--efop_name on c--lass <5>:           chapter.            (line 1814)
 * d--efspec_name:                        chapter.            (line  368)
-* d--efspec_name <1>:                    chapter.            (line 1032)
-* d--efspec_name <2>:                    chapter.            (line 1834)
+* d--efspec_name <1>:                    chapter.            (line 1028)
+* d--efspec_name <2>:                    chapter.            (line 1826)
 * d--eftypefn_name:                      chapter.            (line  326)
 * d--eftypefn_name <1>:                  chapter.            (line  329)
-* d--eftypefn_name <2>:                  chapter.            (line  990)
-* d--eftypefn_name <3>:                  chapter.            (line  993)
-* d--eftypefn_name <4>:                  chapter.            (line 1792)
-* d--eftypefn_name <5>:                  chapter.            (line 1795)
+* d--eftypefn_name <2>:                  chapter.            (line  986)
+* d--eftypefn_name <3>:                  chapter.            (line  989)
+* d--eftypefn_name <4>:                  chapter.            (line 1784)
+* d--eftypefn_name <5>:                  chapter.            (line 1787)
 * d--eftypefn_name2:                     chapter.            (line  403)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1067)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1870)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1063)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1862)
 * d--eftypefun_name:                     chapter.            (line  380)
-* d--eftypefun_name <1>:                 chapter.            (line 1044)
-* d--eftypefun_name <2>:                 chapter.            (line 1846)
+* d--eftypefun_name <1>:                 chapter.            (line 1040)
+* d--eftypefun_name <2>:                 chapter.            (line 1838)
 * d--eftypemethod_name on c--lass:       chapter.            (line  395)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1059)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1861)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1055)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1853)
 * d--eftypeop_name on c--lass:           chapter.            (line  332)
 * d--eftypeop_name on c--lass <1>:       chapter.            (line  335)
-* d--eftypeop_name on c--lass <2>:       chapter.            (line  996)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line  999)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1798)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1801)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line  992)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line  995)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1790)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1793)
 * d--eftypeop_name2 on c--lass2:         chapter.            (line  408)
 * d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  413)
-* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1072)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1077)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1875)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1880)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1068)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1073)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1867)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1872)
 * d--efun_name:                          chapter.            (line  362)
-* d--efun_name <1>:                      chapter.            (line 1026)
-* d--efun_name <2>:                      chapter.            (line 1828)
+* d--efun_name <1>:                      chapter.            (line 1022)
+* d--efun_name <2>:                      chapter.            (line 1820)
 * de--ffn_name:                          chapter.            (line  287)
-* de--ffn_name <1>:                      chapter.            (line  951)
-* de--ffn_name <2>:                      chapter.            (line 1751)
+* de--ffn_name <1>:                      chapter.            (line  947)
+* de--ffn_name <2>:                      chapter.            (line 1743)
 * deffn:                                 chapter.            (line  308)
 * deffn <1>:                             chapter.            (line  310)
-* deffn <2>:                             chapter.            (line  972)
-* deffn <3>:                             chapter.            (line  974)
-* deffn <4>:                             chapter.            (line 1773)
-* deffn <5>:                             chapter.            (line 1775)
+* deffn <2>:                             chapter.            (line  968)
+* deffn <3>:                             chapter.            (line  970)
+* deffn <4>:                             chapter.            (line 1765)
+* deffn <5>:                             chapter.            (line 1767)
 * deffnx:                                chapter.            (line  306)
 * deffnx <1>:                            chapter.            (line  311)
-* deffnx <2>:                            chapter.            (line  970)
-* deffnx <3>:                            chapter.            (line  975)
-* deffnx <4>:                            chapter.            (line 1770)
-* deffnx <5>:                            chapter.            (line 1776)
-* f---aa:                                chapter.            (line 2184)
-* f---bb, f---cc:                        chapter.            (line 2184)
-* f---ddd, f---eee, ffff:                chapter.            (line 2184)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2184)
+* deffnx <2>:                            chapter.            (line  966)
+* deffnx <3>:                            chapter.            (line  971)
+* deffnx <4>:                            chapter.            (line 1762)
+* deffnx <5>:                            chapter.            (line 1768)
+* f---aa:                                chapter.            (line 2173)
+* f---bb, f---cc:                        chapter.            (line 2173)
+* f---ddd, f---eee, ffff:                chapter.            (line 2173)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2173)
 * followed:                              chapter.            (line  303)
-* followed <1>:                          chapter.            (line  635)
-* followed <2>:                          chapter.            (line  967)
-* followed <3>:                          chapter.            (line 1299)
-* followed <4>:                          chapter.            (line 1767)
-* followed <5>:                          chapter.            (line 2133)
+* followed <1>:                          chapter.            (line  631)
+* followed <2>:                          chapter.            (line  963)
+* followed <3>:                          chapter.            (line 1291)
+* followed <4>:                          chapter.            (line 1759)
+* followed <5>:                          chapter.            (line 2122)
 * I:                                     chapter.            (line  291)
 * I <1>:                                 chapter.            (line  313)
-* I <2>:                                 chapter.            (line  955)
-* I <3>:                                 chapter.            (line  977)
-* I <4>:                                 chapter.            (line 1755)
-* I <5>:                                 chapter.            (line 1778)
+* I <2>:                                 chapter.            (line  951)
+* I <3>:                                 chapter.            (line  973)
+* I <4>:                                 chapter.            (line 1747)
+* I <5>:                                 chapter.            (line 1770)
 * id i ule:                              chapter.            (line  297)
-* id i ule <1>:                          chapter.            (line  961)
-* id i ule <2>:                          chapter.            (line 1761)
+* id i ule <1>:                          chapter.            (line  957)
+* id i ule <2>:                          chapter.            (line 1753)
 * id ule:                                chapter.            (line  296)
-* id ule <1>:                            chapter.            (line  960)
-* id ule <2>:                            chapter.            (line 1760)
-* INVALID:                               chapter.            (line  639)
-* INVALID <1>:                           chapter.            (line 1303)
-* INVALID <2>:                           chapter.            (line 2137)
+* id ule <1>:                            chapter.            (line  956)
+* id ule <2>:                            chapter.            (line 1752)
+* INVALID:                               chapter.            (line  635)
+* INVALID <1>:                           chapter.            (line 1295)
+* INVALID <2>:                           chapter.            (line 2126)
 * log trap:                              chapter.            (line  293)
-* log trap <1>:                          chapter.            (line  957)
-* log trap <2>:                          chapter.            (line 1757)
+* log trap <1>:                          chapter.            (line  953)
+* log trap <2>:                          chapter.            (line 1749)
 * log trap1:                             chapter.            (line  294)
-* log trap1 <1>:                         chapter.            (line  958)
-* log trap1 <2>:                         chapter.            (line 1758)
+* log trap1 <1>:                         chapter.            (line  954)
+* log trap1 <2>:                         chapter.            (line 1750)
 * log trap2:                             chapter.            (line  295)
-* log trap2 <1>:                         chapter.            (line  959)
-* log trap2 <2>:                         chapter.            (line 1759)
+* log trap2 <1>:                         chapter.            (line  955)
+* log trap2 <2>:                         chapter.            (line 1751)
 * machin:                                chapter.            (line  299)
 * machin <1>:                            chapter.            (line  301)
-* machin <2>:                            chapter.            (line  631)
-* machin <3>:                            chapter.            (line  632)
-* machin <4>:                            chapter.            (line  633)
-* machin <5>:                            chapter.            (line  634)
-* machin <6>:                            chapter.            (line  963)
-* machin <7>:                            chapter.            (line  965)
-* machin <8>:                            chapter.            (line 1295)
-* machin <9>:                            chapter.            (line 1296)
-* machin <10>:                           chapter.            (line 1297)
-* machin <11>:                           chapter.            (line 1298)
-* machin <12>:                           chapter.            (line 1763)
-* machin <13>:                           chapter.            (line 1765)
-* machin <14>:                           chapter.            (line 2129)
-* machin <15>:                           chapter.            (line 2130)
-* machin <16>:                           chapter.            (line 2131)
-* machin <17>:                           chapter.            (line 2132)
+* machin <2>:                            chapter.            (line  627)
+* machin <3>:                            chapter.            (line  628)
+* machin <4>:                            chapter.            (line  629)
+* machin <5>:                            chapter.            (line  630)
+* machin <6>:                            chapter.            (line  959)
+* machin <7>:                            chapter.            (line  961)
+* machin <8>:                            chapter.            (line 1287)
+* machin <9>:                            chapter.            (line 1288)
+* machin <10>:                           chapter.            (line 1289)
+* machin <11>:                           chapter.            (line 1290)
+* machin <12>:                           chapter.            (line 1755)
+* machin <13>:                           chapter.            (line 1757)
+* machin <14>:                           chapter.            (line 2118)
+* machin <15>:                           chapter.            (line 2119)
+* machin <16>:                           chapter.            (line 2120)
+* machin <17>:                           chapter.            (line 2121)
 * n--ame:                                chapter.            (line  320)
 * n--ame <1>:                            chapter.            (line  323)
-* n--ame <2>:                            chapter.            (line  984)
-* n--ame <3>:                            chapter.            (line  987)
-* n--ame <4>:                            chapter.            (line 1786)
-* n--ame <5>:                            chapter.            (line 1789)
+* n--ame <2>:                            chapter.            (line  980)
+* n--ame <3>:                            chapter.            (line  983)
+* n--ame <4>:                            chapter.            (line 1778)
+* n--ame <5>:                            chapter.            (line 1781)
 * name2:                                 chapter.            (line  398)
-* name2 <1>:                             chapter.            (line 1062)
-* name2 <2>:                             chapter.            (line 1865)
-* t--ruc:                                chapter.            (line 2184)
-* T--ruc:                                chapter.            (line 2184)
+* name2 <1>:                             chapter.            (line 1058)
+* name2 <2>:                             chapter.            (line 1857)
+* t--ruc:                                chapter.            (line 2173)
+* T--ruc:                                chapter.            (line 2173)
 * truc:                                  chapter.            (line  292)
 * truc <1>:                              chapter.            (line  314)
-* truc <2>:                              chapter.            (line  956)
-* truc <3>:                              chapter.            (line  978)
-* truc <4>:                              chapter.            (line 1756)
-* truc <5>:                              chapter.            (line 1779)
-* xxx, zzz:                              chapter.            (line 2184)
+* truc <2>:                              chapter.            (line  952)
+* truc <3>:                              chapter.            (line  974)
+* truc <4>:                              chapter.            (line 1748)
+* truc <5>:                              chapter.            (line 1771)
+* xxx, zzz:                              chapter.            (line 2173)
 
    vr
 
@@ -3221,8 +3206,8 @@ aaa"]
 * Menu:
 
 * d--eftp_name:                          chapter.            (line  359)
-* d--eftp_name <1>:                      chapter.            (line 1023)
-* d--eftp_name <2>:                      chapter.            (line 1825)
+* d--eftp_name <1>:                      chapter.            (line 1019)
+* d--eftp_name <2>:                      chapter.            (line 1817)
 
    (8)
 
@@ -3305,306 +3290,306 @@ chapter 2
 * Menu:
 
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  692)
-* " <2>:                                 chapter.            (line 1367)
+* " <1>:                                 chapter.            (line  688)
+* " <2>:                                 chapter.            (line 1359)
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  692)
-* -option <2>:                           chapter.            (line 1367)
-* .:                                     chapter.            (line 2184)
-* ?:                                     chapter.            (line 2184)
-* a:                                     chapter.            (line 2184)
-* aaa, bbb:                              chapter.            (line 2184)
-* a--a:                                  chapter.            (line 2184)
-* a--asis:                               chapter.            (line  504)
-* a--asis <1>:                           chapter.            (line 1168)
-* a--asis <2>:                           chapter.            (line 1969)
-* b:                                     chapter.            (line  505)
-* b <1>:                                 chapter.            (line 1169)
-* b <2>:                                 chapter.            (line 1970)
-* b--b, c--c:                            chapter.            (line 2184)
-* counting entry:                        chapter.            (line 2534)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2184)
+* -option <1>:                           chapter.            (line  688)
+* -option <2>:                           chapter.            (line 1359)
+* .:                                     chapter.            (line 2173)
+* ?:                                     chapter.            (line 2173)
+* a:                                     chapter.            (line 2173)
+* aaa, bbb:                              chapter.            (line 2173)
+* a--a:                                  chapter.            (line 2173)
+* a--asis:                               chapter.            (line  500)
+* a--asis <1>:                           chapter.            (line 1160)
+* a--asis <2>:                           chapter.            (line 1958)
+* b:                                     chapter.            (line  501)
+* b <1>:                                 chapter.            (line 1161)
+* b <2>:                                 chapter.            (line 1959)
+* b--b, c--c:                            chapter.            (line 2173)
+* counting entry:                        chapter.            (line 2523)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2173)
 * d--efcv_name:                          chapter.            (line  341)
 * d--efcv_name <1>:                      chapter.            (line  344)
-* d--efcv_name <2>:                      chapter.            (line 1005)
-* d--efcv_name <3>:                      chapter.            (line 1008)
-* d--efcv_name <4>:                      chapter.            (line 1807)
-* d--efcv_name <5>:                      chapter.            (line 1810)
+* d--efcv_name <2>:                      chapter.            (line 1001)
+* d--efcv_name <3>:                      chapter.            (line 1004)
+* d--efcv_name <4>:                      chapter.            (line 1799)
+* d--efcv_name <5>:                      chapter.            (line 1802)
 * d--efivar_name of c--lass:             chapter.            (line  386)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1050)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1852)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1046)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1844)
 * d--efopt_name:                         chapter.            (line  377)
-* d--efopt_name <1>:                     chapter.            (line 1041)
-* d--efopt_name <2>:                     chapter.            (line 1843)
+* d--efopt_name <1>:                     chapter.            (line 1037)
+* d--efopt_name <2>:                     chapter.            (line 1835)
 * d--eftypecv_name of c--lass:           chapter.            (line  347)
 * d--eftypecv_name of c--lass <1>:       chapter.            (line  350)
-* d--eftypecv_name of c--lass <2>:       chapter.            (line 1011)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1014)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1813)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1816)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1007)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1010)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1805)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1808)
 * d--eftypecv_name2 of c--lass2:         chapter.            (line  418)
-* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  423)
-* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1082)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1087)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1885)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1890)
+* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  421)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1078)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1081)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1877)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1880)
 * d--eftypeivar_name of c--lass:         chapter.            (line  389)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1053)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1855)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1049)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1847)
 * d--eftypevar_name:                     chapter.            (line  383)
-* d--eftypevar_name <1>:                 chapter.            (line 1047)
-* d--eftypevar_name <2>:                 chapter.            (line 1849)
+* d--eftypevar_name <1>:                 chapter.            (line 1043)
+* d--eftypevar_name <2>:                 chapter.            (line 1841)
 * d--eftypevr_name:                      chapter.            (line  338)
-* d--eftypevr_name <1>:                  chapter.            (line 1002)
-* d--eftypevr_name <2>:                  chapter.            (line 1804)
+* d--eftypevr_name <1>:                  chapter.            (line  998)
+* d--eftypevr_name <2>:                  chapter.            (line 1796)
 * d--efvar_name:                         chapter.            (line  371)
 * d--efvar_name <1>:                     chapter.            (line  374)
-* d--efvar_name <2>:                     chapter.            (line 1035)
-* d--efvar_name <3>:                     chapter.            (line 1038)
-* d--efvar_name <4>:                     chapter.            (line 1837)
-* d--efvar_name <5>:                     chapter.            (line 1840)
+* d--efvar_name <2>:                     chapter.            (line 1031)
+* d--efvar_name <3>:                     chapter.            (line 1034)
+* d--efvar_name <4>:                     chapter.            (line 1829)
+* d--efvar_name <5>:                     chapter.            (line 1832)
 * d--efvr_name:                          chapter.            (line  317)
-* d--efvr_name <1>:                      chapter.            (line  981)
-* d--efvr_name <2>:                      chapter.            (line 1783)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2184)
-* index entry between item and itemx:    chapter.            (line  509)
-* index entry between item and itemx <1>: chapter.           (line  627)
-* index entry between item and itemx <2>: chapter.           (line 1173)
-* index entry between item and itemx <3>: chapter.           (line 1291)
-* index entry between item and itemx <4>: chapter.           (line 1974)
-* index entry between item and itemx <5>: chapter.           (line 2125)
-* index entry in footnote:               chapter.            (line 2529)
+* d--efvr_name <1>:                      chapter.            (line  977)
+* d--efvr_name <2>:                      chapter.            (line 1775)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2173)
+* index entry between item and itemx:    chapter.            (line  505)
+* index entry between item and itemx <1>: chapter.           (line  623)
+* index entry between item and itemx <2>: chapter.           (line 1165)
+* index entry between item and itemx <3>: chapter.           (line 1283)
+* index entry between item and itemx <4>: chapter.           (line 1963)
+* index entry between item and itemx <5>: chapter.           (line 2114)
+* index entry in footnote:               chapter.            (line 2518)
 * index entry within deffn:              chapter.            (line  292)
-* index entry within deffn <1>:          chapter.            (line  956)
-* index entry within deffn <2>:          chapter.            (line 1756)
+* index entry within deffn <1>:          chapter.            (line  952)
+* index entry within deffn <2>:          chapter.            (line 1748)
 * index entry within itemize:            chapter.            (line  203)
-* index entry within itemize <1>:        chapter.            (line  867)
-* index entry within itemize <2>:        chapter.            (line 1667)
+* index entry within itemize <1>:        chapter.            (line  863)
+* index entry within itemize <2>:        chapter.            (line 1659)
 * index entry within multitable:         chapter.            (line  225)
-* index entry within multitable <1>:     chapter.            (line  889)
-* index entry within multitable <2>:     chapter.            (line 1690)
-* t-ruc:                                 chapter.            (line 2184)
-* T-ruc:                                 chapter.            (line 2184)
+* index entry within multitable <1>:     chapter.            (line  885)
+* index entry within multitable <2>:     chapter.            (line 1682)
+* t-ruc:                                 chapter.            (line 2173)
+* T-ruc:                                 chapter.            (line 2173)
 * vtable i--tem code kbdinputstyle:      chapter.            (line  127)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  791)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1590)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  787)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1582)
 * vtable i--tem default kbdinputstyle:   chapter.            (line  122)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  786)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1585)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  782)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1577)
 * vtable i--tem distinct kbdinputstyle:  chapter.            (line  137)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  801)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1600)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  797)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1592)
 * vtable i--tem example kbdinputstyle:   chapter.            (line  132)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  796)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1595)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  792)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1587)
 * vtable i--tem in example code kbdinputstyle: chapter.      (line  129)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  793)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1592)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  789)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1584)
 * vtable i--tem in example default kbdinputstyle: chapter.   (line  124)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  788)
+                                                             (line  784)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1587)
+                                                             (line 1579)
 * vtable i--tem in example distinct kbdinputstyle: chapter.  (line  139)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  803)
+                                                             (line  799)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1602)
+                                                             (line 1594)
 * vtable i--tem in example example kbdinputstyle: chapter.   (line  134)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  798)
+                                                             (line  794)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1597)
+                                                             (line 1589)
 
 [index]
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  692)
-* --foption <2>:                         chapter.            (line 1367)
-* .:                                     chapter.            (line 2184)
-* ?:                                     chapter.            (line 2184)
+* --foption <1>:                         chapter.            (line  688)
+* --foption <2>:                         chapter.            (line 1359)
+* .:                                     chapter.            (line 2173)
+* ?:                                     chapter.            (line 2173)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  692)
-* `` <2>:                                chapter.            (line 1367)
+* `` <1>:                                chapter.            (line  688)
+* `` <2>:                                chapter.            (line 1359)
 * a:                                     chapter.            (line  305)
-* a <1>:                                 chapter.            (line  508)
-* a <2>:                                 chapter.            (line  626)
-* a <3>:                                 chapter.            (line  969)
-* a <4>:                                 chapter.            (line 1172)
-* a <5>:                                 chapter.            (line 1290)
-* a <6>:                                 chapter.            (line 1769)
-* a <7>:                                 chapter.            (line 1973)
-* a <8>:                                 chapter.            (line 2124)
-* a <9>:                                 chapter.            (line 2184)
-* after:                                 chapter.            (line  637)
-* after <1>:                             chapter.            (line 1301)
-* after <2>:                             chapter.            (line 2135)
-* arg2:                                  chapter.            (line  428)
-* arg2 <1>:                              chapter.            (line 1092)
-* arg2 <2>:                              chapter.            (line 1895)
-* b:                                     chapter.            (line  509)
-* b <1>:                                 chapter.            (line  627)
-* b <2>:                                 chapter.            (line 1173)
-* b <3>:                                 chapter.            (line 1291)
-* b <4>:                                 chapter.            (line 1974)
-* b <5>:                                 chapter.            (line 2125)
+* a <1>:                                 chapter.            (line  504)
+* a <2>:                                 chapter.            (line  622)
+* a <3>:                                 chapter.            (line  965)
+* a <4>:                                 chapter.            (line 1164)
+* a <5>:                                 chapter.            (line 1282)
+* a <6>:                                 chapter.            (line 1761)
+* a <7>:                                 chapter.            (line 1962)
+* a <8>:                                 chapter.            (line 2113)
+* a <9>:                                 chapter.            (line 2173)
+* after:                                 chapter.            (line  633)
+* after <1>:                             chapter.            (line 1293)
+* after <2>:                             chapter.            (line 2124)
+* arg2:                                  chapter.            (line  424)
+* arg2 <1>:                              chapter.            (line 1084)
+* arg2 <2>:                              chapter.            (line 1884)
+* b:                                     chapter.            (line  505)
+* b <1>:                                 chapter.            (line  623)
+* b <2>:                                 chapter.            (line 1165)
+* b <3>:                                 chapter.            (line 1283)
+* b <4>:                                 chapter.            (line 1963)
+* b <5>:                                 chapter.            (line 2114)
 * bidule machin:                         chapter.            (line  300)
-* bidule machin <1>:                     chapter.            (line  964)
-* bidule machin <2>:                     chapter.            (line 1764)
+* bidule machin <1>:                     chapter.            (line  960)
+* bidule machin <2>:                     chapter.            (line 1756)
 * d--effn_name:                          chapter.            (line  284)
-* d--effn_name <1>:                      chapter.            (line  948)
-* d--effn_name <2>:                      chapter.            (line 1748)
+* d--effn_name <1>:                      chapter.            (line  944)
+* d--effn_name <2>:                      chapter.            (line 1740)
 * d--efmac_name:                         chapter.            (line  365)
-* d--efmac_name <1>:                     chapter.            (line 1029)
-* d--efmac_name <2>:                     chapter.            (line 1831)
+* d--efmac_name <1>:                     chapter.            (line 1025)
+* d--efmac_name <2>:                     chapter.            (line 1823)
 * d--efmethod_name on c--lass:           chapter.            (line  392)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1056)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1858)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1052)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1850)
 * d--efop_name on c--lass:               chapter.            (line  353)
 * d--efop_name on c--lass <1>:           chapter.            (line  356)
-* d--efop_name on c--lass <2>:           chapter.            (line 1017)
-* d--efop_name on c--lass <3>:           chapter.            (line 1020)
-* d--efop_name on c--lass <4>:           chapter.            (line 1819)
-* d--efop_name on c--lass <5>:           chapter.            (line 1822)
+* d--efop_name on c--lass <2>:           chapter.            (line 1013)
+* d--efop_name on c--lass <3>:           chapter.            (line 1016)
+* d--efop_name on c--lass <4>:           chapter.            (line 1811)
+* d--efop_name on c--lass <5>:           chapter.            (line 1814)
 * d--efspec_name:                        chapter.            (line  368)
-* d--efspec_name <1>:                    chapter.            (line 1032)
-* d--efspec_name <2>:                    chapter.            (line 1834)
+* d--efspec_name <1>:                    chapter.            (line 1028)
+* d--efspec_name <2>:                    chapter.            (line 1826)
 * d--eftypefn_name:                      chapter.            (line  326)
 * d--eftypefn_name <1>:                  chapter.            (line  329)
-* d--eftypefn_name <2>:                  chapter.            (line  990)
-* d--eftypefn_name <3>:                  chapter.            (line  993)
-* d--eftypefn_name <4>:                  chapter.            (line 1792)
-* d--eftypefn_name <5>:                  chapter.            (line 1795)
+* d--eftypefn_name <2>:                  chapter.            (line  986)
+* d--eftypefn_name <3>:                  chapter.            (line  989)
+* d--eftypefn_name <4>:                  chapter.            (line 1784)
+* d--eftypefn_name <5>:                  chapter.            (line 1787)
 * d--eftypefn_name2:                     chapter.            (line  403)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1067)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1870)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1063)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1862)
 * d--eftypefun_name:                     chapter.            (line  380)
-* d--eftypefun_name <1>:                 chapter.            (line 1044)
-* d--eftypefun_name <2>:                 chapter.            (line 1846)
+* d--eftypefun_name <1>:                 chapter.            (line 1040)
+* d--eftypefun_name <2>:                 chapter.            (line 1838)
 * d--eftypemethod_name on c--lass:       chapter.            (line  395)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1059)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1861)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1055)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1853)
 * d--eftypeop_name on c--lass:           chapter.            (line  332)
 * d--eftypeop_name on c--lass <1>:       chapter.            (line  335)
-* d--eftypeop_name on c--lass <2>:       chapter.            (line  996)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line  999)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1798)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1801)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line  992)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line  995)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1790)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1793)
 * d--eftypeop_name2 on c--lass2:         chapter.            (line  408)
 * d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  413)
-* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1072)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1077)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1875)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1880)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1068)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1073)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1867)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1872)
 * d--efun_name:                          chapter.            (line  362)
-* d--efun_name <1>:                      chapter.            (line 1026)
-* d--efun_name <2>:                      chapter.            (line 1828)
+* d--efun_name <1>:                      chapter.            (line 1022)
+* d--efun_name <2>:                      chapter.            (line 1820)
 * de--ffn_name:                          chapter.            (line  287)
-* de--ffn_name <1>:                      chapter.            (line  951)
-* de--ffn_name <2>:                      chapter.            (line 1751)
+* de--ffn_name <1>:                      chapter.            (line  947)
+* de--ffn_name <2>:                      chapter.            (line 1743)
 * deffn:                                 chapter.            (line  308)
 * deffn <1>:                             chapter.            (line  310)
-* deffn <2>:                             chapter.            (line  972)
-* deffn <3>:                             chapter.            (line  974)
-* deffn <4>:                             chapter.            (line 1773)
-* deffn <5>:                             chapter.            (line 1775)
+* deffn <2>:                             chapter.            (line  968)
+* deffn <3>:                             chapter.            (line  970)
+* deffn <4>:                             chapter.            (line 1765)
+* deffn <5>:                             chapter.            (line 1767)
 * deffnx:                                chapter.            (line  306)
 * deffnx <1>:                            chapter.            (line  311)
-* deffnx <2>:                            chapter.            (line  970)
-* deffnx <3>:                            chapter.            (line  975)
-* deffnx <4>:                            chapter.            (line 1770)
-* deffnx <5>:                            chapter.            (line 1776)
-* f---aa:                                chapter.            (line 2184)
-* f---bb, f---cc:                        chapter.            (line 2184)
-* f---ddd, f---eee, ffff:                chapter.            (line 2184)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2184)
+* deffnx <2>:                            chapter.            (line  966)
+* deffnx <3>:                            chapter.            (line  971)
+* deffnx <4>:                            chapter.            (line 1762)
+* deffnx <5>:                            chapter.            (line 1768)
+* f---aa:                                chapter.            (line 2173)
+* f---bb, f---cc:                        chapter.            (line 2173)
+* f---ddd, f---eee, ffff:                chapter.            (line 2173)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2173)
 * followed:                              chapter.            (line  303)
-* followed <1>:                          chapter.            (line  635)
-* followed <2>:                          chapter.            (line  967)
-* followed <3>:                          chapter.            (line 1299)
-* followed <4>:                          chapter.            (line 1767)
-* followed <5>:                          chapter.            (line 2133)
+* followed <1>:                          chapter.            (line  631)
+* followed <2>:                          chapter.            (line  963)
+* followed <3>:                          chapter.            (line 1291)
+* followed <4>:                          chapter.            (line 1759)
+* followed <5>:                          chapter.            (line 2122)
 * I:                                     chapter.            (line  291)
 * I <1>:                                 chapter.            (line  313)
-* I <2>:                                 chapter.            (line  955)
-* I <3>:                                 chapter.            (line  977)
-* I <4>:                                 chapter.            (line 1755)
-* I <5>:                                 chapter.            (line 1778)
+* I <2>:                                 chapter.            (line  951)
+* I <3>:                                 chapter.            (line  973)
+* I <4>:                                 chapter.            (line 1747)
+* I <5>:                                 chapter.            (line 1770)
 * id i ule:                              chapter.            (line  297)
-* id i ule <1>:                          chapter.            (line  961)
-* id i ule <2>:                          chapter.            (line 1761)
+* id i ule <1>:                          chapter.            (line  957)
+* id i ule <2>:                          chapter.            (line 1753)
 * id ule:                                chapter.            (line  296)
-* id ule <1>:                            chapter.            (line  960)
-* id ule <2>:                            chapter.            (line 1760)
-* INVALID:                               chapter.            (line  639)
-* INVALID <1>:                           chapter.            (line 1303)
-* INVALID <2>:                           chapter.            (line 2137)
+* id ule <1>:                            chapter.            (line  956)
+* id ule <2>:                            chapter.            (line 1752)
+* INVALID:                               chapter.            (line  635)
+* INVALID <1>:                           chapter.            (line 1295)
+* INVALID <2>:                           chapter.            (line 2126)
 * log trap:                              chapter.            (line  293)
-* log trap <1>:                          chapter.            (line  957)
-* log trap <2>:                          chapter.            (line 1757)
+* log trap <1>:                          chapter.            (line  953)
+* log trap <2>:                          chapter.            (line 1749)
 * log trap1:                             chapter.            (line  294)
-* log trap1 <1>:                         chapter.            (line  958)
-* log trap1 <2>:                         chapter.            (line 1758)
+* log trap1 <1>:                         chapter.            (line  954)
+* log trap1 <2>:                         chapter.            (line 1750)
 * log trap2:                             chapter.            (line  295)
-* log trap2 <1>:                         chapter.            (line  959)
-* log trap2 <2>:                         chapter.            (line 1759)
+* log trap2 <1>:                         chapter.            (line  955)
+* log trap2 <2>:                         chapter.            (line 1751)
 * machin:                                chapter.            (line  299)
 * machin <1>:                            chapter.            (line  301)
-* machin <2>:                            chapter.            (line  631)
-* machin <3>:                            chapter.            (line  632)
-* machin <4>:                            chapter.            (line  633)
-* machin <5>:                            chapter.            (line  634)
-* machin <6>:                            chapter.            (line  963)
-* machin <7>:                            chapter.            (line  965)
-* machin <8>:                            chapter.            (line 1295)
-* machin <9>:                            chapter.            (line 1296)
-* machin <10>:                           chapter.            (line 1297)
-* machin <11>:                           chapter.            (line 1298)
-* machin <12>:                           chapter.            (line 1763)
-* machin <13>:                           chapter.            (line 1765)
-* machin <14>:                           chapter.            (line 2129)
-* machin <15>:                           chapter.            (line 2130)
-* machin <16>:                           chapter.            (line 2131)
-* machin <17>:                           chapter.            (line 2132)
+* machin <2>:                            chapter.            (line  627)
+* machin <3>:                            chapter.            (line  628)
+* machin <4>:                            chapter.            (line  629)
+* machin <5>:                            chapter.            (line  630)
+* machin <6>:                            chapter.            (line  959)
+* machin <7>:                            chapter.            (line  961)
+* machin <8>:                            chapter.            (line 1287)
+* machin <9>:                            chapter.            (line 1288)
+* machin <10>:                           chapter.            (line 1289)
+* machin <11>:                           chapter.            (line 1290)
+* machin <12>:                           chapter.            (line 1755)
+* machin <13>:                           chapter.            (line 1757)
+* machin <14>:                           chapter.            (line 2118)
+* machin <15>:                           chapter.            (line 2119)
+* machin <16>:                           chapter.            (line 2120)
+* machin <17>:                           chapter.            (line 2121)
 * n--ame:                                chapter.            (line  320)
 * n--ame <1>:                            chapter.            (line  323)
-* n--ame <2>:                            chapter.            (line  984)
-* n--ame <3>:                            chapter.            (line  987)
-* n--ame <4>:                            chapter.            (line 1786)
-* n--ame <5>:                            chapter.            (line 1789)
+* n--ame <2>:                            chapter.            (line  980)
+* n--ame <3>:                            chapter.            (line  983)
+* n--ame <4>:                            chapter.            (line 1778)
+* n--ame <5>:                            chapter.            (line 1781)
 * name2:                                 chapter.            (line  398)
-* name2 <1>:                             chapter.            (line 1062)
-* name2 <2>:                             chapter.            (line 1865)
-* t--ruc:                                chapter.            (line 2184)
-* T--ruc:                                chapter.            (line 2184)
+* name2 <1>:                             chapter.            (line 1058)
+* name2 <2>:                             chapter.            (line 1857)
+* t--ruc:                                chapter.            (line 2173)
+* T--ruc:                                chapter.            (line 2173)
 * truc:                                  chapter.            (line  292)
 * truc <1>:                              chapter.            (line  314)
-* truc <2>:                              chapter.            (line  956)
-* truc <3>:                              chapter.            (line  978)
-* truc <4>:                              chapter.            (line 1756)
-* truc <5>:                              chapter.            (line 1779)
-* xxx, zzz:                              chapter.            (line 2184)
+* truc <2>:                              chapter.            (line  952)
+* truc <3>:                              chapter.            (line  974)
+* truc <4>:                              chapter.            (line 1748)
+* truc <5>:                              chapter.            (line 1771)
+* xxx, zzz:                              chapter.            (line 2173)
 
 
 
 Tag Table:
-Node: Top18495
-Node: chapter18680
-Ref: chapter-Footnote-196874
-Ref: chapter-Footnote-296894
-Ref: chapter-Footnote-396915
-Ref: chapter-Footnote-496935
-Ref: chapter-Footnote-596956
-Ref: chapter-Footnote-696976
-Ref: chapter-Footnote-796997
-Ref: chapter-Footnote-897035
-Node: s--ect,ion97055
-Node: subsection97256
-Ref: anchor97435
-Node: subsubsection ``simple-double--97435
-Node: subsubsection three---four----''97635
-Node: chapter297807
+Node: Top18455
+Node: chapter18640
+Ref: chapter-Footnote-196709
+Ref: chapter-Footnote-296729
+Ref: chapter-Footnote-396750
+Ref: chapter-Footnote-496770
+Ref: chapter-Footnote-596791
+Ref: chapter-Footnote-696811
+Ref: chapter-Footnote-796832
+Ref: chapter-Footnote-896870
+Node: s--ect,ion96890
+Node: subsection97091
+Ref: anchor97270
+Node: subsubsection ``simple-double--97270
+Node: subsubsection three---four----''97470
+Node: chapter297642
 
 End Tag Table
 
diff --git a/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt 
b/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
index 78a27f7062..bb6cbbaef5 100644
--- a/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
+++ b/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
@@ -416,14 +416,10 @@ s-mallformat
           d--eftypeop_name2
      d-eftypeop no arg2
 
- -- c--ategory2 of c--lass2:
-          t--ype2
-          d--eftypecv_name2
+ -- c--ategory2 of c--lass2: t--ype2 d--eftypecv_name2
      d-eftypecv2
 
- -- c--ategory2 of c--lass2:
-          t--ype2
-          d--eftypecv_name2 a--rguments2...
+ -- c--ategory2 of c--lass2: t--ype2 d--eftypecv_name2 a--rguments2...
      d-eftypecv with arguments2
 
  -- fun2: arg2
@@ -1087,14 +1083,10 @@ s-mallformat
           d--eftypeop_name2
      d-eftypeop no arg2
 
- -- c--ategory2 of c--lass2:
-          t--ype2
-          d--eftypecv_name2
+ -- c--ategory2 of c--lass2: t--ype2 d--eftypecv_name2
      d-eftypecv2
 
- -- c--ategory2 of c--lass2:
-          t--ype2
-          d--eftypecv_name2 a--rguments2...
+ -- c--ategory2 of c--lass2: t--ype2 d--eftypecv_name2 a--rguments2...
      d-eftypecv with arguments2
 
  -- fun2: arg2
@@ -1897,14 +1889,11 @@ cross ref name: (file name). '@inforef{}' *note ::
                d--eftypeop_name2
           d--eftypeop no arg2
 
-      -- c--ategory2 of c--lass2:
-               t--ype2
-               d--eftypecv_name2
+      -- c--ategory2 of c--lass2: t--ype2 d--eftypecv_name2
           d--eftypecv2
 
-      -- c--ategory2 of c--lass2:
-               t--ype2
-               d--eftypecv_name2 a--rguments2...
+      -- c--ategory2 of c--lass2: t--ype2 d--eftypecv_name2
+               a--rguments2...
           d--eftypecv with arguments2
 
       -- fun2: arg2
@@ -2209,300 +2198,300 @@ aaa
 
 * Menu:
 
-* truc:                                  chapter.            (line 2205)
+* truc:                                  chapter.            (line 2194)
 
    codeidx
 
 * Menu:
 
-* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2205)
+* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2194)
 
    cp
 
 * Menu:
 
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  699)
-* " <2>:                                 chapter.            (line 1381)
+* " <1>:                                 chapter.            (line  695)
+* " <2>:                                 chapter.            (line 1373)
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  699)
-* -option <2>:                           chapter.            (line 1381)
-* .:                                     chapter.            (line 2205)
-* ?:                                     chapter.            (line 2205)
-* a:                                     chapter.            (line 2205)
-* aaa, bbb:                              chapter.            (line 2205)
-* a--a:                                  chapter.            (line 2205)
-* a--asis:                               chapter.            (line  504)
-* a--asis <1>:                           chapter.            (line 1175)
-* a--asis <2>:                           chapter.            (line 1983)
-* b:                                     chapter.            (line  505)
-* b <1>:                                 chapter.            (line 1176)
-* b <2>:                                 chapter.            (line 1984)
-* b--b, c--c:                            chapter.            (line 2205)
+* -option <1>:                           chapter.            (line  695)
+* -option <2>:                           chapter.            (line 1373)
+* .:                                     chapter.            (line 2194)
+* ?:                                     chapter.            (line 2194)
+* a:                                     chapter.            (line 2194)
+* aaa, bbb:                              chapter.            (line 2194)
+* a--a:                                  chapter.            (line 2194)
+* a--asis:                               chapter.            (line  500)
+* a--asis <1>:                           chapter.            (line 1167)
+* a--asis <2>:                           chapter.            (line 1972)
+* b:                                     chapter.            (line  501)
+* b <1>:                                 chapter.            (line 1168)
+* b <2>:                                 chapter.            (line 1973)
+* b--b, c--c:                            chapter.            (line 2194)
 * counting entry:                        chapter.            (line    0)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2205)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2194)
 * d--efcv_name:                          chapter.            (line  341)
 * d--efcv_name <1>:                      chapter.            (line  344)
-* d--efcv_name <2>:                      chapter.            (line 1012)
-* d--efcv_name <3>:                      chapter.            (line 1015)
-* d--efcv_name <4>:                      chapter.            (line 1821)
-* d--efcv_name <5>:                      chapter.            (line 1824)
+* d--efcv_name <2>:                      chapter.            (line 1008)
+* d--efcv_name <3>:                      chapter.            (line 1011)
+* d--efcv_name <4>:                      chapter.            (line 1813)
+* d--efcv_name <5>:                      chapter.            (line 1816)
 * d--efivar_name of c--lass:             chapter.            (line  386)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1057)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1866)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1053)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1858)
 * d--efopt_name:                         chapter.            (line  377)
-* d--efopt_name <1>:                     chapter.            (line 1048)
-* d--efopt_name <2>:                     chapter.            (line 1857)
+* d--efopt_name <1>:                     chapter.            (line 1044)
+* d--efopt_name <2>:                     chapter.            (line 1849)
 * d--eftypecv_name of c--lass:           chapter.            (line  347)
 * d--eftypecv_name of c--lass <1>:       chapter.            (line  350)
-* d--eftypecv_name of c--lass <2>:       chapter.            (line 1018)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1021)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1827)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1830)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1014)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1017)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1819)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1822)
 * d--eftypecv_name2 of c--lass2:         chapter.            (line  418)
-* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  423)
-* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1089)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1094)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1899)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1904)
+* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  421)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1085)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1088)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1891)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1894)
 * d--eftypeivar_name of c--lass:         chapter.            (line  389)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1060)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1869)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1056)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1861)
 * d--eftypevar_name:                     chapter.            (line  383)
-* d--eftypevar_name <1>:                 chapter.            (line 1054)
-* d--eftypevar_name <2>:                 chapter.            (line 1863)
+* d--eftypevar_name <1>:                 chapter.            (line 1050)
+* d--eftypevar_name <2>:                 chapter.            (line 1855)
 * d--eftypevr_name:                      chapter.            (line  338)
-* d--eftypevr_name <1>:                  chapter.            (line 1009)
-* d--eftypevr_name <2>:                  chapter.            (line 1818)
+* d--eftypevr_name <1>:                  chapter.            (line 1005)
+* d--eftypevr_name <2>:                  chapter.            (line 1810)
 * d--efvar_name:                         chapter.            (line  371)
 * d--efvar_name <1>:                     chapter.            (line  374)
-* d--efvar_name <2>:                     chapter.            (line 1042)
-* d--efvar_name <3>:                     chapter.            (line 1045)
-* d--efvar_name <4>:                     chapter.            (line 1851)
-* d--efvar_name <5>:                     chapter.            (line 1854)
+* d--efvar_name <2>:                     chapter.            (line 1038)
+* d--efvar_name <3>:                     chapter.            (line 1041)
+* d--efvar_name <4>:                     chapter.            (line 1843)
+* d--efvar_name <5>:                     chapter.            (line 1846)
 * d--efvr_name:                          chapter.            (line  317)
-* d--efvr_name <1>:                      chapter.            (line  988)
-* d--efvr_name <2>:                      chapter.            (line 1797)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2205)
-* index entry between item and itemx:    chapter.            (line  509)
-* index entry between item and itemx <1>: chapter.           (line  634)
-* index entry between item and itemx <2>: chapter.           (line 1180)
-* index entry between item and itemx <3>: chapter.           (line 1305)
-* index entry between item and itemx <4>: chapter.           (line 1988)
-* index entry between item and itemx <5>: chapter.           (line 2146)
+* d--efvr_name <1>:                      chapter.            (line  984)
+* d--efvr_name <2>:                      chapter.            (line 1789)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2194)
+* index entry between item and itemx:    chapter.            (line  505)
+* index entry between item and itemx <1>: chapter.           (line  630)
+* index entry between item and itemx <2>: chapter.           (line 1172)
+* index entry between item and itemx <3>: chapter.           (line 1297)
+* index entry between item and itemx <4>: chapter.           (line 1977)
+* index entry between item and itemx <5>: chapter.           (line 2135)
 * index entry in footnote:               chapter.            (line    0)
 * index entry within deffn:              chapter.            (line  292)
-* index entry within deffn <1>:          chapter.            (line  963)
-* index entry within deffn <2>:          chapter.            (line 1770)
+* index entry within deffn <1>:          chapter.            (line  959)
+* index entry within deffn <2>:          chapter.            (line 1762)
 * index entry within itemize:            chapter.            (line  203)
-* index entry within itemize <1>:        chapter.            (line  874)
-* index entry within itemize <2>:        chapter.            (line 1681)
+* index entry within itemize <1>:        chapter.            (line  870)
+* index entry within itemize <2>:        chapter.            (line 1673)
 * index entry within multitable:         chapter.            (line  225)
-* index entry within multitable <1>:     chapter.            (line  896)
-* index entry within multitable <2>:     chapter.            (line 1704)
-* t-ruc:                                 chapter.            (line 2205)
-* T-ruc:                                 chapter.            (line 2205)
+* index entry within multitable <1>:     chapter.            (line  892)
+* index entry within multitable <2>:     chapter.            (line 1696)
+* t-ruc:                                 chapter.            (line 2194)
+* T-ruc:                                 chapter.            (line 2194)
 * vtable i--tem code kbdinputstyle:      chapter.            (line  127)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  798)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1604)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  794)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1596)
 * vtable i--tem default kbdinputstyle:   chapter.            (line  122)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  793)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1599)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  789)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1591)
 * vtable i--tem distinct kbdinputstyle:  chapter.            (line  137)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  808)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1614)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  804)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1606)
 * vtable i--tem example kbdinputstyle:   chapter.            (line  132)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  803)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1609)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  799)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1601)
 * vtable i--tem in example code kbdinputstyle: chapter.      (line  129)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  800)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1606)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  796)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1598)
 * vtable i--tem in example default kbdinputstyle: chapter.   (line  124)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  795)
+                                                             (line  791)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1601)
+                                                             (line 1593)
 * vtable i--tem in example distinct kbdinputstyle: chapter.  (line  139)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  810)
+                                                             (line  806)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1616)
+                                                             (line 1608)
 * vtable i--tem in example example kbdinputstyle: chapter.   (line  134)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  805)
+                                                             (line  801)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1611)
+                                                             (line 1603)
 
    fn
 
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  699)
-* --foption <2>:                         chapter.            (line 1381)
-* .:                                     chapter.            (line 2205)
-* ?:                                     chapter.            (line 2205)
+* --foption <1>:                         chapter.            (line  695)
+* --foption <2>:                         chapter.            (line 1373)
+* .:                                     chapter.            (line 2194)
+* ?:                                     chapter.            (line 2194)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  699)
-* `` <2>:                                chapter.            (line 1381)
+* `` <1>:                                chapter.            (line  695)
+* `` <2>:                                chapter.            (line 1373)
 * a:                                     chapter.            (line  305)
-* a <1>:                                 chapter.            (line  508)
-* a <2>:                                 chapter.            (line  633)
-* a <3>:                                 chapter.            (line  976)
-* a <4>:                                 chapter.            (line 1179)
-* a <5>:                                 chapter.            (line 1304)
-* a <6>:                                 chapter.            (line 1783)
-* a <7>:                                 chapter.            (line 1987)
-* a <8>:                                 chapter.            (line 2145)
-* a <9>:                                 chapter.            (line 2205)
-* after:                                 chapter.            (line  644)
-* after <1>:                             chapter.            (line 1315)
-* after <2>:                             chapter.            (line 2156)
-* arg2:                                  chapter.            (line  428)
-* arg2 <1>:                              chapter.            (line 1099)
-* arg2 <2>:                              chapter.            (line 1909)
-* b:                                     chapter.            (line  509)
-* b <1>:                                 chapter.            (line  634)
-* b <2>:                                 chapter.            (line 1180)
-* b <3>:                                 chapter.            (line 1305)
-* b <4>:                                 chapter.            (line 1988)
-* b <5>:                                 chapter.            (line 2146)
+* a <1>:                                 chapter.            (line  504)
+* a <2>:                                 chapter.            (line  629)
+* a <3>:                                 chapter.            (line  972)
+* a <4>:                                 chapter.            (line 1171)
+* a <5>:                                 chapter.            (line 1296)
+* a <6>:                                 chapter.            (line 1775)
+* a <7>:                                 chapter.            (line 1976)
+* a <8>:                                 chapter.            (line 2134)
+* a <9>:                                 chapter.            (line 2194)
+* after:                                 chapter.            (line  640)
+* after <1>:                             chapter.            (line 1307)
+* after <2>:                             chapter.            (line 2145)
+* arg2:                                  chapter.            (line  424)
+* arg2 <1>:                              chapter.            (line 1091)
+* arg2 <2>:                              chapter.            (line 1898)
+* b:                                     chapter.            (line  505)
+* b <1>:                                 chapter.            (line  630)
+* b <2>:                                 chapter.            (line 1172)
+* b <3>:                                 chapter.            (line 1297)
+* b <4>:                                 chapter.            (line 1977)
+* b <5>:                                 chapter.            (line 2135)
 * bidule machin:                         chapter.            (line  300)
-* bidule machin <1>:                     chapter.            (line  971)
-* bidule machin <2>:                     chapter.            (line 1778)
+* bidule machin <1>:                     chapter.            (line  967)
+* bidule machin <2>:                     chapter.            (line 1770)
 * d--effn_name:                          chapter.            (line  284)
-* d--effn_name <1>:                      chapter.            (line  955)
-* d--effn_name <2>:                      chapter.            (line 1762)
+* d--effn_name <1>:                      chapter.            (line  951)
+* d--effn_name <2>:                      chapter.            (line 1754)
 * d--efmac_name:                         chapter.            (line  365)
-* d--efmac_name <1>:                     chapter.            (line 1036)
-* d--efmac_name <2>:                     chapter.            (line 1845)
+* d--efmac_name <1>:                     chapter.            (line 1032)
+* d--efmac_name <2>:                     chapter.            (line 1837)
 * d--efmethod_name on c--lass:           chapter.            (line  392)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1063)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1872)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1059)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1864)
 * d--efop_name on c--lass:               chapter.            (line  353)
 * d--efop_name on c--lass <1>:           chapter.            (line  356)
-* d--efop_name on c--lass <2>:           chapter.            (line 1024)
-* d--efop_name on c--lass <3>:           chapter.            (line 1027)
-* d--efop_name on c--lass <4>:           chapter.            (line 1833)
-* d--efop_name on c--lass <5>:           chapter.            (line 1836)
+* d--efop_name on c--lass <2>:           chapter.            (line 1020)
+* d--efop_name on c--lass <3>:           chapter.            (line 1023)
+* d--efop_name on c--lass <4>:           chapter.            (line 1825)
+* d--efop_name on c--lass <5>:           chapter.            (line 1828)
 * d--efspec_name:                        chapter.            (line  368)
-* d--efspec_name <1>:                    chapter.            (line 1039)
-* d--efspec_name <2>:                    chapter.            (line 1848)
+* d--efspec_name <1>:                    chapter.            (line 1035)
+* d--efspec_name <2>:                    chapter.            (line 1840)
 * d--eftypefn_name:                      chapter.            (line  326)
 * d--eftypefn_name <1>:                  chapter.            (line  329)
-* d--eftypefn_name <2>:                  chapter.            (line  997)
-* d--eftypefn_name <3>:                  chapter.            (line 1000)
-* d--eftypefn_name <4>:                  chapter.            (line 1806)
-* d--eftypefn_name <5>:                  chapter.            (line 1809)
+* d--eftypefn_name <2>:                  chapter.            (line  993)
+* d--eftypefn_name <3>:                  chapter.            (line  996)
+* d--eftypefn_name <4>:                  chapter.            (line 1798)
+* d--eftypefn_name <5>:                  chapter.            (line 1801)
 * d--eftypefn_name2:                     chapter.            (line  403)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1074)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1884)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1070)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1876)
 * d--eftypefun_name:                     chapter.            (line  380)
-* d--eftypefun_name <1>:                 chapter.            (line 1051)
-* d--eftypefun_name <2>:                 chapter.            (line 1860)
+* d--eftypefun_name <1>:                 chapter.            (line 1047)
+* d--eftypefun_name <2>:                 chapter.            (line 1852)
 * d--eftypemethod_name on c--lass:       chapter.            (line  395)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1066)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1875)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1062)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1867)
 * d--eftypeop_name on c--lass:           chapter.            (line  332)
 * d--eftypeop_name on c--lass <1>:       chapter.            (line  335)
-* d--eftypeop_name on c--lass <2>:       chapter.            (line 1003)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1006)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1812)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1815)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line  999)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1002)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1804)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1807)
 * d--eftypeop_name2 on c--lass2:         chapter.            (line  408)
 * d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  413)
-* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1079)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1084)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1889)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1894)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1075)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1080)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1881)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1886)
 * d--efun_name:                          chapter.            (line  362)
-* d--efun_name <1>:                      chapter.            (line 1033)
-* d--efun_name <2>:                      chapter.            (line 1842)
+* d--efun_name <1>:                      chapter.            (line 1029)
+* d--efun_name <2>:                      chapter.            (line 1834)
 * de--ffn_name:                          chapter.            (line  287)
-* de--ffn_name <1>:                      chapter.            (line  958)
-* de--ffn_name <2>:                      chapter.            (line 1765)
+* de--ffn_name <1>:                      chapter.            (line  954)
+* de--ffn_name <2>:                      chapter.            (line 1757)
 * deffn:                                 chapter.            (line  308)
 * deffn <1>:                             chapter.            (line  310)
-* deffn <2>:                             chapter.            (line  979)
-* deffn <3>:                             chapter.            (line  981)
-* deffn <4>:                             chapter.            (line 1787)
-* deffn <5>:                             chapter.            (line 1789)
+* deffn <2>:                             chapter.            (line  975)
+* deffn <3>:                             chapter.            (line  977)
+* deffn <4>:                             chapter.            (line 1779)
+* deffn <5>:                             chapter.            (line 1781)
 * deffnx:                                chapter.            (line  306)
 * deffnx <1>:                            chapter.            (line  311)
-* deffnx <2>:                            chapter.            (line  977)
-* deffnx <3>:                            chapter.            (line  982)
-* deffnx <4>:                            chapter.            (line 1784)
-* deffnx <5>:                            chapter.            (line 1790)
-* f---aa:                                chapter.            (line 2205)
-* f---bb, f---cc:                        chapter.            (line 2205)
-* f---ddd, f---eee, ffff:                chapter.            (line 2205)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2205)
+* deffnx <2>:                            chapter.            (line  973)
+* deffnx <3>:                            chapter.            (line  978)
+* deffnx <4>:                            chapter.            (line 1776)
+* deffnx <5>:                            chapter.            (line 1782)
+* f---aa:                                chapter.            (line 2194)
+* f---bb, f---cc:                        chapter.            (line 2194)
+* f---ddd, f---eee, ffff:                chapter.            (line 2194)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2194)
 * followed:                              chapter.            (line  303)
-* followed <1>:                          chapter.            (line  642)
-* followed <2>:                          chapter.            (line  974)
-* followed <3>:                          chapter.            (line 1313)
-* followed <4>:                          chapter.            (line 1781)
-* followed <5>:                          chapter.            (line 2154)
+* followed <1>:                          chapter.            (line  638)
+* followed <2>:                          chapter.            (line  970)
+* followed <3>:                          chapter.            (line 1305)
+* followed <4>:                          chapter.            (line 1773)
+* followed <5>:                          chapter.            (line 2143)
 * I:                                     chapter.            (line  291)
 * I <1>:                                 chapter.            (line  313)
-* I <2>:                                 chapter.            (line  962)
-* I <3>:                                 chapter.            (line  984)
-* I <4>:                                 chapter.            (line 1769)
-* I <5>:                                 chapter.            (line 1792)
+* I <2>:                                 chapter.            (line  958)
+* I <3>:                                 chapter.            (line  980)
+* I <4>:                                 chapter.            (line 1761)
+* I <5>:                                 chapter.            (line 1784)
 * id i ule:                              chapter.            (line  297)
-* id i ule <1>:                          chapter.            (line  968)
-* id i ule <2>:                          chapter.            (line 1775)
+* id i ule <1>:                          chapter.            (line  964)
+* id i ule <2>:                          chapter.            (line 1767)
 * id ule:                                chapter.            (line  296)
-* id ule <1>:                            chapter.            (line  967)
-* id ule <2>:                            chapter.            (line 1774)
-* INVALID:                               chapter.            (line  646)
-* INVALID <1>:                           chapter.            (line 1317)
-* INVALID <2>:                           chapter.            (line 2158)
+* id ule <1>:                            chapter.            (line  963)
+* id ule <2>:                            chapter.            (line 1766)
+* INVALID:                               chapter.            (line  642)
+* INVALID <1>:                           chapter.            (line 1309)
+* INVALID <2>:                           chapter.            (line 2147)
 * log trap:                              chapter.            (line  293)
-* log trap <1>:                          chapter.            (line  964)
-* log trap <2>:                          chapter.            (line 1771)
+* log trap <1>:                          chapter.            (line  960)
+* log trap <2>:                          chapter.            (line 1763)
 * log trap1:                             chapter.            (line  294)
-* log trap1 <1>:                         chapter.            (line  965)
-* log trap1 <2>:                         chapter.            (line 1772)
+* log trap1 <1>:                         chapter.            (line  961)
+* log trap1 <2>:                         chapter.            (line 1764)
 * log trap2:                             chapter.            (line  295)
-* log trap2 <1>:                         chapter.            (line  966)
-* log trap2 <2>:                         chapter.            (line 1773)
+* log trap2 <1>:                         chapter.            (line  962)
+* log trap2 <2>:                         chapter.            (line 1765)
 * machin:                                chapter.            (line  299)
 * machin <1>:                            chapter.            (line  301)
-* machin <2>:                            chapter.            (line  638)
-* machin <3>:                            chapter.            (line  639)
-* machin <4>:                            chapter.            (line  640)
-* machin <5>:                            chapter.            (line  641)
-* machin <6>:                            chapter.            (line  970)
-* machin <7>:                            chapter.            (line  972)
-* machin <8>:                            chapter.            (line 1309)
-* machin <9>:                            chapter.            (line 1310)
-* machin <10>:                           chapter.            (line 1311)
-* machin <11>:                           chapter.            (line 1312)
-* machin <12>:                           chapter.            (line 1777)
-* machin <13>:                           chapter.            (line 1779)
-* machin <14>:                           chapter.            (line 2150)
-* machin <15>:                           chapter.            (line 2151)
-* machin <16>:                           chapter.            (line 2152)
-* machin <17>:                           chapter.            (line 2153)
+* machin <2>:                            chapter.            (line  634)
+* machin <3>:                            chapter.            (line  635)
+* machin <4>:                            chapter.            (line  636)
+* machin <5>:                            chapter.            (line  637)
+* machin <6>:                            chapter.            (line  966)
+* machin <7>:                            chapter.            (line  968)
+* machin <8>:                            chapter.            (line 1301)
+* machin <9>:                            chapter.            (line 1302)
+* machin <10>:                           chapter.            (line 1303)
+* machin <11>:                           chapter.            (line 1304)
+* machin <12>:                           chapter.            (line 1769)
+* machin <13>:                           chapter.            (line 1771)
+* machin <14>:                           chapter.            (line 2139)
+* machin <15>:                           chapter.            (line 2140)
+* machin <16>:                           chapter.            (line 2141)
+* machin <17>:                           chapter.            (line 2142)
 * n--ame:                                chapter.            (line  320)
 * n--ame <1>:                            chapter.            (line  323)
-* n--ame <2>:                            chapter.            (line  991)
-* n--ame <3>:                            chapter.            (line  994)
-* n--ame <4>:                            chapter.            (line 1800)
-* n--ame <5>:                            chapter.            (line 1803)
+* n--ame <2>:                            chapter.            (line  987)
+* n--ame <3>:                            chapter.            (line  990)
+* n--ame <4>:                            chapter.            (line 1792)
+* n--ame <5>:                            chapter.            (line 1795)
 * name2:                                 chapter.            (line  398)
-* name2 <1>:                             chapter.            (line 1069)
-* name2 <2>:                             chapter.            (line 1879)
-* t--ruc:                                chapter.            (line 2205)
-* T--ruc:                                chapter.            (line 2205)
+* name2 <1>:                             chapter.            (line 1065)
+* name2 <2>:                             chapter.            (line 1871)
+* t--ruc:                                chapter.            (line 2194)
+* T--ruc:                                chapter.            (line 2194)
 * truc:                                  chapter.            (line  292)
 * truc <1>:                              chapter.            (line  314)
-* truc <2>:                              chapter.            (line  963)
-* truc <3>:                              chapter.            (line  985)
-* truc <4>:                              chapter.            (line 1770)
-* truc <5>:                              chapter.            (line 1793)
-* xxx, zzz:                              chapter.            (line 2205)
+* truc <2>:                              chapter.            (line  959)
+* truc <3>:                              chapter.            (line  981)
+* truc <4>:                              chapter.            (line 1762)
+* truc <5>:                              chapter.            (line 1785)
+* xxx, zzz:                              chapter.            (line 2194)
 
    vr
 
@@ -2515,8 +2504,8 @@ aaa
 * Menu:
 
 * d--eftp_name:                          chapter.            (line  359)
-* d--eftp_name <1>:                      chapter.            (line 1030)
-* d--eftp_name <2>:                      chapter.            (line 1839)
+* d--eftp_name <1>:                      chapter.            (line 1026)
+* d--eftp_name <2>:                      chapter.            (line 1831)
 
    (8)
 
@@ -2561,285 +2550,285 @@ chapter 2
 * Menu:
 
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  699)
-* " <2>:                                 chapter.            (line 1381)
+* " <1>:                                 chapter.            (line  695)
+* " <2>:                                 chapter.            (line 1373)
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  699)
-* -option <2>:                           chapter.            (line 1381)
-* .:                                     chapter.            (line 2205)
-* ?:                                     chapter.            (line 2205)
-* a:                                     chapter.            (line 2205)
-* aaa, bbb:                              chapter.            (line 2205)
-* a--a:                                  chapter.            (line 2205)
-* a--asis:                               chapter.            (line  504)
-* a--asis <1>:                           chapter.            (line 1175)
-* a--asis <2>:                           chapter.            (line 1983)
-* b:                                     chapter.            (line  505)
-* b <1>:                                 chapter.            (line 1176)
-* b <2>:                                 chapter.            (line 1984)
-* b--b, c--c:                            chapter.            (line 2205)
-* counting entry:                        chapter.            (line 2542)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2205)
+* -option <1>:                           chapter.            (line  695)
+* -option <2>:                           chapter.            (line 1373)
+* .:                                     chapter.            (line 2194)
+* ?:                                     chapter.            (line 2194)
+* a:                                     chapter.            (line 2194)
+* aaa, bbb:                              chapter.            (line 2194)
+* a--a:                                  chapter.            (line 2194)
+* a--asis:                               chapter.            (line  500)
+* a--asis <1>:                           chapter.            (line 1167)
+* a--asis <2>:                           chapter.            (line 1972)
+* b:                                     chapter.            (line  501)
+* b <1>:                                 chapter.            (line 1168)
+* b <2>:                                 chapter.            (line 1973)
+* b--b, c--c:                            chapter.            (line 2194)
+* counting entry:                        chapter.            (line 2531)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2194)
 * d--efcv_name:                          chapter.            (line  341)
 * d--efcv_name <1>:                      chapter.            (line  344)
-* d--efcv_name <2>:                      chapter.            (line 1012)
-* d--efcv_name <3>:                      chapter.            (line 1015)
-* d--efcv_name <4>:                      chapter.            (line 1821)
-* d--efcv_name <5>:                      chapter.            (line 1824)
+* d--efcv_name <2>:                      chapter.            (line 1008)
+* d--efcv_name <3>:                      chapter.            (line 1011)
+* d--efcv_name <4>:                      chapter.            (line 1813)
+* d--efcv_name <5>:                      chapter.            (line 1816)
 * d--efivar_name of c--lass:             chapter.            (line  386)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1057)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1866)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1053)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1858)
 * d--efopt_name:                         chapter.            (line  377)
-* d--efopt_name <1>:                     chapter.            (line 1048)
-* d--efopt_name <2>:                     chapter.            (line 1857)
+* d--efopt_name <1>:                     chapter.            (line 1044)
+* d--efopt_name <2>:                     chapter.            (line 1849)
 * d--eftypecv_name of c--lass:           chapter.            (line  347)
 * d--eftypecv_name of c--lass <1>:       chapter.            (line  350)
-* d--eftypecv_name of c--lass <2>:       chapter.            (line 1018)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1021)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1827)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1830)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1014)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1017)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1819)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1822)
 * d--eftypecv_name2 of c--lass2:         chapter.            (line  418)
-* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  423)
-* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1089)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1094)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1899)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1904)
+* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  421)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1085)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1088)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1891)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1894)
 * d--eftypeivar_name of c--lass:         chapter.            (line  389)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1060)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1869)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1056)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1861)
 * d--eftypevar_name:                     chapter.            (line  383)
-* d--eftypevar_name <1>:                 chapter.            (line 1054)
-* d--eftypevar_name <2>:                 chapter.            (line 1863)
+* d--eftypevar_name <1>:                 chapter.            (line 1050)
+* d--eftypevar_name <2>:                 chapter.            (line 1855)
 * d--eftypevr_name:                      chapter.            (line  338)
-* d--eftypevr_name <1>:                  chapter.            (line 1009)
-* d--eftypevr_name <2>:                  chapter.            (line 1818)
+* d--eftypevr_name <1>:                  chapter.            (line 1005)
+* d--eftypevr_name <2>:                  chapter.            (line 1810)
 * d--efvar_name:                         chapter.            (line  371)
 * d--efvar_name <1>:                     chapter.            (line  374)
-* d--efvar_name <2>:                     chapter.            (line 1042)
-* d--efvar_name <3>:                     chapter.            (line 1045)
-* d--efvar_name <4>:                     chapter.            (line 1851)
-* d--efvar_name <5>:                     chapter.            (line 1854)
+* d--efvar_name <2>:                     chapter.            (line 1038)
+* d--efvar_name <3>:                     chapter.            (line 1041)
+* d--efvar_name <4>:                     chapter.            (line 1843)
+* d--efvar_name <5>:                     chapter.            (line 1846)
 * d--efvr_name:                          chapter.            (line  317)
-* d--efvr_name <1>:                      chapter.            (line  988)
-* d--efvr_name <2>:                      chapter.            (line 1797)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2205)
-* index entry between item and itemx:    chapter.            (line  509)
-* index entry between item and itemx <1>: chapter.           (line  634)
-* index entry between item and itemx <2>: chapter.           (line 1180)
-* index entry between item and itemx <3>: chapter.           (line 1305)
-* index entry between item and itemx <4>: chapter.           (line 1988)
-* index entry between item and itemx <5>: chapter.           (line 2146)
-* index entry in footnote:               chapter.            (line 2537)
+* d--efvr_name <1>:                      chapter.            (line  984)
+* d--efvr_name <2>:                      chapter.            (line 1789)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2194)
+* index entry between item and itemx:    chapter.            (line  505)
+* index entry between item and itemx <1>: chapter.           (line  630)
+* index entry between item and itemx <2>: chapter.           (line 1172)
+* index entry between item and itemx <3>: chapter.           (line 1297)
+* index entry between item and itemx <4>: chapter.           (line 1977)
+* index entry between item and itemx <5>: chapter.           (line 2135)
+* index entry in footnote:               chapter.            (line 2526)
 * index entry within deffn:              chapter.            (line  292)
-* index entry within deffn <1>:          chapter.            (line  963)
-* index entry within deffn <2>:          chapter.            (line 1770)
+* index entry within deffn <1>:          chapter.            (line  959)
+* index entry within deffn <2>:          chapter.            (line 1762)
 * index entry within itemize:            chapter.            (line  203)
-* index entry within itemize <1>:        chapter.            (line  874)
-* index entry within itemize <2>:        chapter.            (line 1681)
+* index entry within itemize <1>:        chapter.            (line  870)
+* index entry within itemize <2>:        chapter.            (line 1673)
 * index entry within multitable:         chapter.            (line  225)
-* index entry within multitable <1>:     chapter.            (line  896)
-* index entry within multitable <2>:     chapter.            (line 1704)
-* t-ruc:                                 chapter.            (line 2205)
-* T-ruc:                                 chapter.            (line 2205)
+* index entry within multitable <1>:     chapter.            (line  892)
+* index entry within multitable <2>:     chapter.            (line 1696)
+* t-ruc:                                 chapter.            (line 2194)
+* T-ruc:                                 chapter.            (line 2194)
 * vtable i--tem code kbdinputstyle:      chapter.            (line  127)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  798)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1604)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  794)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1596)
 * vtable i--tem default kbdinputstyle:   chapter.            (line  122)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  793)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1599)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  789)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1591)
 * vtable i--tem distinct kbdinputstyle:  chapter.            (line  137)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  808)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1614)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  804)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1606)
 * vtable i--tem example kbdinputstyle:   chapter.            (line  132)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  803)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1609)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  799)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1601)
 * vtable i--tem in example code kbdinputstyle: chapter.      (line  129)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  800)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1606)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  796)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1598)
 * vtable i--tem in example default kbdinputstyle: chapter.   (line  124)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  795)
+                                                             (line  791)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1601)
+                                                             (line 1593)
 * vtable i--tem in example distinct kbdinputstyle: chapter.  (line  139)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  810)
+                                                             (line  806)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1616)
+                                                             (line 1608)
 * vtable i--tem in example example kbdinputstyle: chapter.   (line  134)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  805)
+                                                             (line  801)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1611)
+                                                             (line 1603)
 
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  699)
-* --foption <2>:                         chapter.            (line 1381)
-* .:                                     chapter.            (line 2205)
-* ?:                                     chapter.            (line 2205)
+* --foption <1>:                         chapter.            (line  695)
+* --foption <2>:                         chapter.            (line 1373)
+* .:                                     chapter.            (line 2194)
+* ?:                                     chapter.            (line 2194)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  699)
-* `` <2>:                                chapter.            (line 1381)
+* `` <1>:                                chapter.            (line  695)
+* `` <2>:                                chapter.            (line 1373)
 * a:                                     chapter.            (line  305)
-* a <1>:                                 chapter.            (line  508)
-* a <2>:                                 chapter.            (line  633)
-* a <3>:                                 chapter.            (line  976)
-* a <4>:                                 chapter.            (line 1179)
-* a <5>:                                 chapter.            (line 1304)
-* a <6>:                                 chapter.            (line 1783)
-* a <7>:                                 chapter.            (line 1987)
-* a <8>:                                 chapter.            (line 2145)
-* a <9>:                                 chapter.            (line 2205)
-* after:                                 chapter.            (line  644)
-* after <1>:                             chapter.            (line 1315)
-* after <2>:                             chapter.            (line 2156)
-* arg2:                                  chapter.            (line  428)
-* arg2 <1>:                              chapter.            (line 1099)
-* arg2 <2>:                              chapter.            (line 1909)
-* b:                                     chapter.            (line  509)
-* b <1>:                                 chapter.            (line  634)
-* b <2>:                                 chapter.            (line 1180)
-* b <3>:                                 chapter.            (line 1305)
-* b <4>:                                 chapter.            (line 1988)
-* b <5>:                                 chapter.            (line 2146)
+* a <1>:                                 chapter.            (line  504)
+* a <2>:                                 chapter.            (line  629)
+* a <3>:                                 chapter.            (line  972)
+* a <4>:                                 chapter.            (line 1171)
+* a <5>:                                 chapter.            (line 1296)
+* a <6>:                                 chapter.            (line 1775)
+* a <7>:                                 chapter.            (line 1976)
+* a <8>:                                 chapter.            (line 2134)
+* a <9>:                                 chapter.            (line 2194)
+* after:                                 chapter.            (line  640)
+* after <1>:                             chapter.            (line 1307)
+* after <2>:                             chapter.            (line 2145)
+* arg2:                                  chapter.            (line  424)
+* arg2 <1>:                              chapter.            (line 1091)
+* arg2 <2>:                              chapter.            (line 1898)
+* b:                                     chapter.            (line  505)
+* b <1>:                                 chapter.            (line  630)
+* b <2>:                                 chapter.            (line 1172)
+* b <3>:                                 chapter.            (line 1297)
+* b <4>:                                 chapter.            (line 1977)
+* b <5>:                                 chapter.            (line 2135)
 * bidule machin:                         chapter.            (line  300)
-* bidule machin <1>:                     chapter.            (line  971)
-* bidule machin <2>:                     chapter.            (line 1778)
+* bidule machin <1>:                     chapter.            (line  967)
+* bidule machin <2>:                     chapter.            (line 1770)
 * d--effn_name:                          chapter.            (line  284)
-* d--effn_name <1>:                      chapter.            (line  955)
-* d--effn_name <2>:                      chapter.            (line 1762)
+* d--effn_name <1>:                      chapter.            (line  951)
+* d--effn_name <2>:                      chapter.            (line 1754)
 * d--efmac_name:                         chapter.            (line  365)
-* d--efmac_name <1>:                     chapter.            (line 1036)
-* d--efmac_name <2>:                     chapter.            (line 1845)
+* d--efmac_name <1>:                     chapter.            (line 1032)
+* d--efmac_name <2>:                     chapter.            (line 1837)
 * d--efmethod_name on c--lass:           chapter.            (line  392)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1063)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1872)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1059)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1864)
 * d--efop_name on c--lass:               chapter.            (line  353)
 * d--efop_name on c--lass <1>:           chapter.            (line  356)
-* d--efop_name on c--lass <2>:           chapter.            (line 1024)
-* d--efop_name on c--lass <3>:           chapter.            (line 1027)
-* d--efop_name on c--lass <4>:           chapter.            (line 1833)
-* d--efop_name on c--lass <5>:           chapter.            (line 1836)
+* d--efop_name on c--lass <2>:           chapter.            (line 1020)
+* d--efop_name on c--lass <3>:           chapter.            (line 1023)
+* d--efop_name on c--lass <4>:           chapter.            (line 1825)
+* d--efop_name on c--lass <5>:           chapter.            (line 1828)
 * d--efspec_name:                        chapter.            (line  368)
-* d--efspec_name <1>:                    chapter.            (line 1039)
-* d--efspec_name <2>:                    chapter.            (line 1848)
+* d--efspec_name <1>:                    chapter.            (line 1035)
+* d--efspec_name <2>:                    chapter.            (line 1840)
 * d--eftypefn_name:                      chapter.            (line  326)
 * d--eftypefn_name <1>:                  chapter.            (line  329)
-* d--eftypefn_name <2>:                  chapter.            (line  997)
-* d--eftypefn_name <3>:                  chapter.            (line 1000)
-* d--eftypefn_name <4>:                  chapter.            (line 1806)
-* d--eftypefn_name <5>:                  chapter.            (line 1809)
+* d--eftypefn_name <2>:                  chapter.            (line  993)
+* d--eftypefn_name <3>:                  chapter.            (line  996)
+* d--eftypefn_name <4>:                  chapter.            (line 1798)
+* d--eftypefn_name <5>:                  chapter.            (line 1801)
 * d--eftypefn_name2:                     chapter.            (line  403)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1074)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1884)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1070)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1876)
 * d--eftypefun_name:                     chapter.            (line  380)
-* d--eftypefun_name <1>:                 chapter.            (line 1051)
-* d--eftypefun_name <2>:                 chapter.            (line 1860)
+* d--eftypefun_name <1>:                 chapter.            (line 1047)
+* d--eftypefun_name <2>:                 chapter.            (line 1852)
 * d--eftypemethod_name on c--lass:       chapter.            (line  395)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1066)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1875)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1062)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1867)
 * d--eftypeop_name on c--lass:           chapter.            (line  332)
 * d--eftypeop_name on c--lass <1>:       chapter.            (line  335)
-* d--eftypeop_name on c--lass <2>:       chapter.            (line 1003)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1006)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1812)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1815)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line  999)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1002)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1804)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1807)
 * d--eftypeop_name2 on c--lass2:         chapter.            (line  408)
 * d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  413)
-* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1079)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1084)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1889)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1894)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1075)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1080)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1881)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1886)
 * d--efun_name:                          chapter.            (line  362)
-* d--efun_name <1>:                      chapter.            (line 1033)
-* d--efun_name <2>:                      chapter.            (line 1842)
+* d--efun_name <1>:                      chapter.            (line 1029)
+* d--efun_name <2>:                      chapter.            (line 1834)
 * de--ffn_name:                          chapter.            (line  287)
-* de--ffn_name <1>:                      chapter.            (line  958)
-* de--ffn_name <2>:                      chapter.            (line 1765)
+* de--ffn_name <1>:                      chapter.            (line  954)
+* de--ffn_name <2>:                      chapter.            (line 1757)
 * deffn:                                 chapter.            (line  308)
 * deffn <1>:                             chapter.            (line  310)
-* deffn <2>:                             chapter.            (line  979)
-* deffn <3>:                             chapter.            (line  981)
-* deffn <4>:                             chapter.            (line 1787)
-* deffn <5>:                             chapter.            (line 1789)
+* deffn <2>:                             chapter.            (line  975)
+* deffn <3>:                             chapter.            (line  977)
+* deffn <4>:                             chapter.            (line 1779)
+* deffn <5>:                             chapter.            (line 1781)
 * deffnx:                                chapter.            (line  306)
 * deffnx <1>:                            chapter.            (line  311)
-* deffnx <2>:                            chapter.            (line  977)
-* deffnx <3>:                            chapter.            (line  982)
-* deffnx <4>:                            chapter.            (line 1784)
-* deffnx <5>:                            chapter.            (line 1790)
-* f---aa:                                chapter.            (line 2205)
-* f---bb, f---cc:                        chapter.            (line 2205)
-* f---ddd, f---eee, ffff:                chapter.            (line 2205)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2205)
+* deffnx <2>:                            chapter.            (line  973)
+* deffnx <3>:                            chapter.            (line  978)
+* deffnx <4>:                            chapter.            (line 1776)
+* deffnx <5>:                            chapter.            (line 1782)
+* f---aa:                                chapter.            (line 2194)
+* f---bb, f---cc:                        chapter.            (line 2194)
+* f---ddd, f---eee, ffff:                chapter.            (line 2194)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2194)
 * followed:                              chapter.            (line  303)
-* followed <1>:                          chapter.            (line  642)
-* followed <2>:                          chapter.            (line  974)
-* followed <3>:                          chapter.            (line 1313)
-* followed <4>:                          chapter.            (line 1781)
-* followed <5>:                          chapter.            (line 2154)
+* followed <1>:                          chapter.            (line  638)
+* followed <2>:                          chapter.            (line  970)
+* followed <3>:                          chapter.            (line 1305)
+* followed <4>:                          chapter.            (line 1773)
+* followed <5>:                          chapter.            (line 2143)
 * I:                                     chapter.            (line  291)
 * I <1>:                                 chapter.            (line  313)
-* I <2>:                                 chapter.            (line  962)
-* I <3>:                                 chapter.            (line  984)
-* I <4>:                                 chapter.            (line 1769)
-* I <5>:                                 chapter.            (line 1792)
+* I <2>:                                 chapter.            (line  958)
+* I <3>:                                 chapter.            (line  980)
+* I <4>:                                 chapter.            (line 1761)
+* I <5>:                                 chapter.            (line 1784)
 * id i ule:                              chapter.            (line  297)
-* id i ule <1>:                          chapter.            (line  968)
-* id i ule <2>:                          chapter.            (line 1775)
+* id i ule <1>:                          chapter.            (line  964)
+* id i ule <2>:                          chapter.            (line 1767)
 * id ule:                                chapter.            (line  296)
-* id ule <1>:                            chapter.            (line  967)
-* id ule <2>:                            chapter.            (line 1774)
-* INVALID:                               chapter.            (line  646)
-* INVALID <1>:                           chapter.            (line 1317)
-* INVALID <2>:                           chapter.            (line 2158)
+* id ule <1>:                            chapter.            (line  963)
+* id ule <2>:                            chapter.            (line 1766)
+* INVALID:                               chapter.            (line  642)
+* INVALID <1>:                           chapter.            (line 1309)
+* INVALID <2>:                           chapter.            (line 2147)
 * log trap:                              chapter.            (line  293)
-* log trap <1>:                          chapter.            (line  964)
-* log trap <2>:                          chapter.            (line 1771)
+* log trap <1>:                          chapter.            (line  960)
+* log trap <2>:                          chapter.            (line 1763)
 * log trap1:                             chapter.            (line  294)
-* log trap1 <1>:                         chapter.            (line  965)
-* log trap1 <2>:                         chapter.            (line 1772)
+* log trap1 <1>:                         chapter.            (line  961)
+* log trap1 <2>:                         chapter.            (line 1764)
 * log trap2:                             chapter.            (line  295)
-* log trap2 <1>:                         chapter.            (line  966)
-* log trap2 <2>:                         chapter.            (line 1773)
+* log trap2 <1>:                         chapter.            (line  962)
+* log trap2 <2>:                         chapter.            (line 1765)
 * machin:                                chapter.            (line  299)
 * machin <1>:                            chapter.            (line  301)
-* machin <2>:                            chapter.            (line  638)
-* machin <3>:                            chapter.            (line  639)
-* machin <4>:                            chapter.            (line  640)
-* machin <5>:                            chapter.            (line  641)
-* machin <6>:                            chapter.            (line  970)
-* machin <7>:                            chapter.            (line  972)
-* machin <8>:                            chapter.            (line 1309)
-* machin <9>:                            chapter.            (line 1310)
-* machin <10>:                           chapter.            (line 1311)
-* machin <11>:                           chapter.            (line 1312)
-* machin <12>:                           chapter.            (line 1777)
-* machin <13>:                           chapter.            (line 1779)
-* machin <14>:                           chapter.            (line 2150)
-* machin <15>:                           chapter.            (line 2151)
-* machin <16>:                           chapter.            (line 2152)
-* machin <17>:                           chapter.            (line 2153)
+* machin <2>:                            chapter.            (line  634)
+* machin <3>:                            chapter.            (line  635)
+* machin <4>:                            chapter.            (line  636)
+* machin <5>:                            chapter.            (line  637)
+* machin <6>:                            chapter.            (line  966)
+* machin <7>:                            chapter.            (line  968)
+* machin <8>:                            chapter.            (line 1301)
+* machin <9>:                            chapter.            (line 1302)
+* machin <10>:                           chapter.            (line 1303)
+* machin <11>:                           chapter.            (line 1304)
+* machin <12>:                           chapter.            (line 1769)
+* machin <13>:                           chapter.            (line 1771)
+* machin <14>:                           chapter.            (line 2139)
+* machin <15>:                           chapter.            (line 2140)
+* machin <16>:                           chapter.            (line 2141)
+* machin <17>:                           chapter.            (line 2142)
 * n--ame:                                chapter.            (line  320)
 * n--ame <1>:                            chapter.            (line  323)
-* n--ame <2>:                            chapter.            (line  991)
-* n--ame <3>:                            chapter.            (line  994)
-* n--ame <4>:                            chapter.            (line 1800)
-* n--ame <5>:                            chapter.            (line 1803)
+* n--ame <2>:                            chapter.            (line  987)
+* n--ame <3>:                            chapter.            (line  990)
+* n--ame <4>:                            chapter.            (line 1792)
+* n--ame <5>:                            chapter.            (line 1795)
 * name2:                                 chapter.            (line  398)
-* name2 <1>:                             chapter.            (line 1069)
-* name2 <2>:                             chapter.            (line 1879)
-* t--ruc:                                chapter.            (line 2205)
-* T--ruc:                                chapter.            (line 2205)
+* name2 <1>:                             chapter.            (line 1065)
+* name2 <2>:                             chapter.            (line 1871)
+* t--ruc:                                chapter.            (line 2194)
+* T--ruc:                                chapter.            (line 2194)
 * truc:                                  chapter.            (line  292)
 * truc <1>:                              chapter.            (line  314)
-* truc <2>:                              chapter.            (line  963)
-* truc <3>:                              chapter.            (line  985)
-* truc <4>:                              chapter.            (line 1770)
-* truc <5>:                              chapter.            (line 1793)
-* xxx, zzz:                              chapter.            (line 2205)
+* truc <2>:                              chapter.            (line  959)
+* truc <3>:                              chapter.            (line  981)
+* truc <4>:                              chapter.            (line 1762)
+* truc <5>:                              chapter.            (line 1785)
+* xxx, zzz:                              chapter.            (line 2194)
 
 Top section
 1 chapter



reply via email to

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