texinfo-commits
[Top][All Lists]
Advanced

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

[no subject]


From: Patrice Dumas
Date: Sun, 29 Sep 2024 10:05:29 -0400 (EDT)

branch: master
commit bd6326bdeb983fa07608892b09591fcc0adb48de
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Jul 3 06:43:53 2024 +0200

    * tp/Texinfo/Convert/HTML.pm (_convert_sp_command),
    tp/Texinfo/Convert/Plaintext.pm (_convert),
    tp/Texinfo/XS/convert/convert_html.c (convert_sp_command): consider
    empty @sp argument to be 1, to have an output more consistent with
    Texinfo TeX.
    
    * tp/Texinfo/Convert/LaTeX.pm (_convert): consider empty @sp argument
    to be empty.
    
    * tp/Makefile.tres, tp/t/converters_tests.t
    (sp_empty_lines_1_no_arg_zero): test of @sp, @sp 0 and @sp 1 with
    diverse possibilities for empty lines.
---
 ChangeLog                                          |  15 +
 tp/Makefile.tres                                   |   1 +
 tp/Texinfo/Convert/HTML.pm                         |  10 +-
 tp/Texinfo/Convert/LaTeX.pm                        |  13 +-
 tp/Texinfo/Convert/Plaintext.pm                    |  21 +-
 tp/Texinfo/XS/convert/convert_html.c               |  30 +-
 tp/t/converters_tests.t                            |  50 ++
 .../sp_empty_lines_1_no_arg_zero.pl                | 824 ++++++++++++++++++++
 .../res_parser/formatting_chm/chapter.html         |   3 +
 .../res_parser/formatting_chm/formatting.html      |   2 +
 .../EPUB/xhtml/chapter.xhtml                       |   3 +
 .../EPUB/xhtml/formatting.xhtml                    |   2 +
 .../res_parser/formatting_html32/formatting.html   |   5 +
 .../formatting_html_no_split/formatting.html       |   3 +
 .../res_parser/formatting_info/formatting.info     | 832 +++++++++++----------
 .../res_parser/formatting_latex/formatting.tex     |  10 +-
 .../res_parser/formatting_plaintext/formatting.txt | 799 ++++++++++----------
 .../formatting_regions/formatting_regions.html     |   5 +
 .../res_parser/formatting_xhtml/formatting.html    |   5 +
 .../formatting_enable_encoding/formatting.html     |   5 +
 .../EPUB/xhtml/chapter.xhtml                       |   3 +
 .../EPUB/xhtml/formatting.xhtml                    |   2 +
 .../res_parser/formatting_exotic/chapter.html      |   3 +
 .../res_parser/formatting_fr/formatting.html       |   5 +
 .../res_parser/formatting_fr_icons/formatting.html |   5 +
 .../res_parser/formatting_fr_info/formatting.info  | 832 +++++++++++----------
 .../formatting.info                                | 832 +++++++++++----------
 .../formatting.info                                | 832 +++++++++++----------
 .../formatting_inline_css/formatting.html          |   4 +
 .../res_parser/formatting_mathjax/formatting.html  |   5 +
 .../formatting_numerical_entities/formatting.html  |   5 +
 .../formatting.txt                                 | 799 ++++++++++----------
 .../formatting_sort_element_counts/formatting.html |   3 +
 .../formatting_texi2html/formatting.html           |   5 +
 .../formatting_texi2html_nodes/chapter.html        |   3 +
 .../formatting_texi2html_nodes/index.html          |   2 +
 .../formatting_weird_quotes/formatting.html        |   5 +
 .../res_parser/formatting_singular/chapter.html    |   3 +
 38 files changed, 3493 insertions(+), 2493 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c3af2f9cd6..6e7b246399 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2024-07-03  Patrice Dumas  <pertusus@free.f>
+
+       * tp/Texinfo/Convert/HTML.pm (_convert_sp_command),
+       tp/Texinfo/Convert/Plaintext.pm (_convert),
+       tp/Texinfo/XS/convert/convert_html.c (convert_sp_command): consider
+       empty @sp argument to be 1, to have an output more consistent with
+       Texinfo TeX.
+
+       * tp/Texinfo/Convert/LaTeX.pm (_convert): consider empty @sp argument
+       to be empty.
+
+       * tp/Makefile.tres, tp/t/converters_tests.t
+       (sp_empty_lines_1_no_arg_zero): test of @sp, @sp 0 and @sp 1 with
+       diverse possibilities for empty lines.
+
 2024-07-02  Patrice Dumas  <pertusus@free.f>
 
        * tp/Texinfo/Convert/Plaintext.pm (_convert_def_line, _convert):
diff --git a/tp/Makefile.tres b/tp/Makefile.tres
index aab6adaab0..5360303070 100644
--- a/tp/Makefile.tres
+++ b/tp/Makefile.tres
@@ -284,6 +284,7 @@ test_files_generated_list = 
$(test_tap_files_generated_list) \
   t/results/converters_tests/simplest_test_prefix/res_latex \
   t/results/converters_tests/simplest_test_prefix/res_xml \
   t/results/converters_tests/some_at_commands_in_ref_nodes.pl \
+  t/results/converters_tests/sp_empty_lines_1_no_arg_zero.pl \
   t/results/converters_tests/sp_in_example.pl \
   t/results/converters_tests/spaces_in_empty_node_names.pl \
   t/results/converters_tests/spaces_in_node_names.pl \
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 67f50cc849..3e63fa7779 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -5486,15 +5486,19 @@ sub _convert_sp_command($$$$)
   my $command = shift;
   my $args = shift;
 
+  my $sp_nr = 1;
   if (defined($command->{'extra'})
-      and defined($command->{'extra'}->{'misc_args'})
-      and defined($command->{'extra'}->{'misc_args'}->[0])) {
-    my $sp_nr = $command->{'extra'}->{'misc_args'}->[0];
+      and $command->{'extra'}->{'misc_args'}) {
+    $sp_nr = $command->{'extra'}->{'misc_args'}->[0];
+  }
+  if ($sp_nr > 0) {
     if (in_preformatted_context($self) or in_string($self)) {
       return "\n" x $sp_nr;
     } else {
       return ($self->get_info('line_break_element')."\n") x $sp_nr;
     }
+  } else {
+    return '';
   }
 }
 
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index d891231fd6..114b1a9342 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -4116,17 +4116,14 @@ sub _convert($$)
       $result .= "\\noindent{}";
       return $result;
     } elsif ($cmdname eq 'sp') {
-      my $sp_nr = 1;
+      my $sp_nr = '';
       if ($element->{'extra'}
-          and $element->{'extra'}->{'misc_args'}
-          and $element->{'extra'}->{'misc_args'}->[0]) {
-        # this useless copy avoids perl changing the type to integer!
+          and $element->{'extra'}->{'misc_args'}) {
         $sp_nr = $element->{'extra'}->{'misc_args'}->[0];
       }
-      # FIXME \vskip is a TeX primitive, so the syntax seems to be
-      # different from LaTeX, and some people warn against using
-      # TeX primitives.  However there is no obvious corresponding
-      # command in LaTeX, except for adding enough \\.
+      # NOTE \vskip is a TeX primitive that does what we need here,
+      # stop any paragraph and add vertical space.
+      # The code output here is the same as the code used in Texinfo TeX.
       $result .= "\\vskip $sp_nr\\baselineskip %\n";
       return $result;
     } elsif ($cmdname eq 'need') {
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index ab08e1032c..cb6f5add82 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -3680,21 +3680,20 @@ sub _convert($$)
       _add_lines_count($self, $lines_count);
       return '';
     } elsif ($cmdname eq 'sp') {
-      # FIXME No argument should mean 1, not 0, to check
+      _stream_output($self,
+                     add_pending_word($formatter->{'container'}),
+                     $formatter->{'container'});
+      my $sp_nr = 1;
       if ($element->{'extra'}
           and $element->{'extra'}->{'misc_args'}) {
+        $sp_nr = $element->{'extra'}->{'misc_args'}->[0];
+      }
+      for (my $i = 0; $i < $sp_nr; $i++) {
         _stream_output($self,
-                    add_pending_word($formatter->{'container'}),
-                    $formatter->{'container'});
-        # this useless copy avoids perl changing the type to integer!
-        my $sp_nr = $element->{'extra'}->{'misc_args'}->[0];
-        for (my $i = 0; $i < $sp_nr; $i++) {
-          _stream_output($self,
-                         end_line($formatter->{'container'}),
-                         $formatter->{'container'});
-        }
-        delete $self->{'text_element_context'}->[-1]->{'counter'};
+                       end_line($formatter->{'container'}),
+                       $formatter->{'container'});
       }
+      delete $self->{'text_element_context'}->[-1]->{'counter'};
       return;
     } elsif ($cmdname eq 'contents') {
       my $sections_list;
diff --git a/tp/Texinfo/XS/convert/convert_html.c 
b/tp/Texinfo/XS/convert/convert_html.c
index ae092db2cc..e0f78eab02 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -11125,25 +11125,27 @@ convert_sp_command (CONVERTER *self, const enum 
command_id cmd,
 {
   const STRING_LIST *misc_args = lookup_extra_misc_args (element,
                                                 AI_key_misc_args);
+  unsigned int sp_nr = 1;
+  int i;
+
   if (misc_args && misc_args->number > 0)
     {
-      int i;
       const char *sp_number_string = misc_args->list[0];
-      unsigned int sp_nr = strtoul (sp_number_string, NULL, 10);
+      sp_nr = strtoul (sp_number_string, NULL, 10);
+    }
 
-      if (html_in_preformatted_context (self) || html_in_string (self))
-        {
-          for (i= 0; i < sp_nr; i++)
-            text_append_n (result, "\n", 1);
-        }
-      else
+  if (html_in_preformatted_context (self) || html_in_string (self))
+    {
+      for (i = 0; i < sp_nr; i++)
+        text_append_n (result, "\n", 1);
+    }
+  else
+    {
+      for (i = 0; i < sp_nr; i++)
         {
-          for (i= 0; i < sp_nr; i++)
-            {
-              text_append_n (result, self->line_break_element.string,
-                                     self->line_break_element.len);
-              text_append_n (result, "\n", 1);
-            }
+          text_append_n (result, self->line_break_element.string,
+                                 self->line_break_element.len);
+         text_append_n (result, "\n", 1);
         }
     }
 }
diff --git a/tp/t/converters_tests.t b/tp/t/converters_tests.t
index ed774ef0d3..36c1067812 100644
--- a/tp/t/converters_tests.t
+++ b/tp/t/converters_tests.t
@@ -446,6 +446,56 @@ sp after para
 @sp 1
 @end example
 '],
+# NOTE comparison of TeX/LaTeX output with Plaintext show differences.
+# In TeX/LaTeX with @sp 1, and irrespective of the number of empty line
+# the vertical space is always the same, interparagraph small space + 1
+# character.  In plaintext trailing empty lines do not produce an empty
+# line (as in TeX), but leading empty line do.  Also, @sp 0 without empty
+# lines lead to no empty line between paragraphs in Plaintext.
+# This is not of practical concern, as both @sp 0 (and @sp without
+# argument) behaviour are undefined, and both TeX and Plaintext output
+# are consistent with the documentation.  Also @sp should rarely, if ever,
+# be used in Plaintext.
+['sp_empty_lines_1_no_arg_zero',
+'A
+
+A010
+@sp 1
+A110
+
+@sp 1
+A011
+
+@sp 1
+A111
+
+@sp 1
+
+A000
+@sp 0
+A100
+
+@sp 0
+A001
+
+@sp 0
+A101
+
+@sp 0
+
+A0 0
+@sp
+A1 0
+
+@sp 
+A0 1
+
+@sp
+A1 1
+
+@sp 
+
+B'],
 ['line_breaks',
 '@documentdescription 
 a document @* yes!
diff --git a/tp/t/results/converters_tests/sp_empty_lines_1_no_arg_zero.pl 
b/tp/t/results/converters_tests/sp_empty_lines_1_no_arg_zero.pl
new file mode 100644
index 0000000000..699b4bfd5a
--- /dev/null
+++ b/tp/t/results/converters_tests/sp_empty_lines_1_no_arg_zero.pl
@@ -0,0 +1,824 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors 
+   %result_indices %result_sectioning %result_nodes %result_menus
+   %result_floats %result_converted %result_converted_errors 
+   %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'sp_empty_lines_1_no_arg_zero'} = {
+  'contents' => [
+    {
+      'contents' => [
+        {
+          'contents' => [
+            {
+              'text' => 'A
+'
+            }
+          ],
+          'type' => 'paragraph'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'contents' => [
+            {
+              'text' => 'A010
+'
+            }
+          ],
+          'type' => 'paragraph'
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'text' => '1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
+              },
+              'type' => 'line_arg'
+            }
+          ],
+          'cmdname' => 'sp',
+          'extra' => {
+            'misc_args' => [
+              '1'
+            ]
+          },
+          'info' => {
+            'spaces_before_argument' => {
+              'text' => ' '
+            }
+          },
+          'source_info' => {
+            'line_nr' => 4
+          }
+        },
+        {
+          'contents' => [
+            {
+              'text' => 'A110
+'
+            }
+          ],
+          'type' => 'paragraph'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'text' => '1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
+              },
+              'type' => 'line_arg'
+            }
+          ],
+          'cmdname' => 'sp',
+          'extra' => {
+            'misc_args' => [
+              '1'
+            ]
+          },
+          'info' => {
+            'spaces_before_argument' => {
+              'text' => ' '
+            }
+          },
+          'source_info' => {
+            'line_nr' => 7
+          }
+        },
+        {
+          'contents' => [
+            {
+              'text' => 'A011
+'
+            }
+          ],
+          'type' => 'paragraph'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'text' => '1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
+              },
+              'type' => 'line_arg'
+            }
+          ],
+          'cmdname' => 'sp',
+          'extra' => {
+            'misc_args' => [
+              '1'
+            ]
+          },
+          'info' => {
+            'spaces_before_argument' => {
+              'text' => ' '
+            }
+          },
+          'source_info' => {
+            'line_nr' => 10
+          }
+        },
+        {
+          'contents' => [
+            {
+              'text' => 'A111
+'
+            }
+          ],
+          'type' => 'paragraph'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'text' => '1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
+              },
+              'type' => 'line_arg'
+            }
+          ],
+          'cmdname' => 'sp',
+          'extra' => {
+            'misc_args' => [
+              '1'
+            ]
+          },
+          'info' => {
+            'spaces_before_argument' => {
+              'text' => ' '
+            }
+          },
+          'source_info' => {
+            'line_nr' => 13
+          }
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'contents' => [
+            {
+              'text' => 'A000
+'
+            }
+          ],
+          'type' => 'paragraph'
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'text' => '0'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
+              },
+              'type' => 'line_arg'
+            }
+          ],
+          'cmdname' => 'sp',
+          'extra' => {
+            'misc_args' => [
+              '0'
+            ]
+          },
+          'info' => {
+            'spaces_before_argument' => {
+              'text' => ' '
+            }
+          },
+          'source_info' => {
+            'line_nr' => 16
+          }
+        },
+        {
+          'contents' => [
+            {
+              'text' => 'A100
+'
+            }
+          ],
+          'type' => 'paragraph'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'text' => '0'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
+              },
+              'type' => 'line_arg'
+            }
+          ],
+          'cmdname' => 'sp',
+          'extra' => {
+            'misc_args' => [
+              '0'
+            ]
+          },
+          'info' => {
+            'spaces_before_argument' => {
+              'text' => ' '
+            }
+          },
+          'source_info' => {
+            'line_nr' => 19
+          }
+        },
+        {
+          'contents' => [
+            {
+              'text' => 'A001
+'
+            }
+          ],
+          'type' => 'paragraph'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'text' => '0'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
+              },
+              'type' => 'line_arg'
+            }
+          ],
+          'cmdname' => 'sp',
+          'extra' => {
+            'misc_args' => [
+              '0'
+            ]
+          },
+          'info' => {
+            'spaces_before_argument' => {
+              'text' => ' '
+            }
+          },
+          'source_info' => {
+            'line_nr' => 22
+          }
+        },
+        {
+          'contents' => [
+            {
+              'text' => 'A101
+'
+            }
+          ],
+          'type' => 'paragraph'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'text' => '0'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
+              },
+              'type' => 'line_arg'
+            }
+          ],
+          'cmdname' => 'sp',
+          'extra' => {
+            'misc_args' => [
+              '0'
+            ]
+          },
+          'info' => {
+            'spaces_before_argument' => {
+              'text' => ' '
+            }
+          },
+          'source_info' => {
+            'line_nr' => 25
+          }
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'contents' => [
+            {
+              'text' => 'A0 0
+'
+            }
+          ],
+          'type' => 'paragraph'
+        },
+        {
+          'args' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
+              },
+              'type' => 'line_arg'
+            }
+          ],
+          'cmdname' => 'sp',
+          'source_info' => {
+            'line_nr' => 28
+          }
+        },
+        {
+          'contents' => [
+            {
+              'text' => 'A1 0
+'
+            }
+          ],
+          'type' => 'paragraph'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'args' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => ' 
+'
+                }
+              },
+              'type' => 'line_arg'
+            }
+          ],
+          'cmdname' => 'sp',
+          'source_info' => {
+            'line_nr' => 31
+          }
+        },
+        {
+          'contents' => [
+            {
+              'text' => 'A0 1
+'
+            }
+          ],
+          'type' => 'paragraph'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'args' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
+              },
+              'type' => 'line_arg'
+            }
+          ],
+          'cmdname' => 'sp',
+          'source_info' => {
+            'line_nr' => 34
+          }
+        },
+        {
+          'contents' => [
+            {
+              'text' => 'A1 1
+'
+            }
+          ],
+          'type' => 'paragraph'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'args' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => ' 
+'
+                }
+              },
+              'type' => 'line_arg'
+            }
+          ],
+          'cmdname' => 'sp',
+          'source_info' => {
+            'line_nr' => 37
+          }
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'contents' => [
+            {
+              'text' => 'B'
+            }
+          ],
+          'type' => 'paragraph'
+        }
+      ],
+      'type' => 'before_node_section'
+    }
+  ],
+  'type' => 'document_root'
+};
+
+$result_texis{'sp_empty_lines_1_no_arg_zero'} = 'A
+
+A010
+@sp 1
+A110
+
+@sp 1
+A011
+
+@sp 1
+A111
+
+@sp 1
+
+A000
+@sp 0
+A100
+
+@sp 0
+A001
+
+@sp 0
+A101
+
+@sp 0
+
+A0 0
+@sp
+A1 0
+
+@sp 
+A0 1
+
+@sp
+A1 1
+
+@sp 
+
+B';
+
+
+$result_texts{'sp_empty_lines_1_no_arg_zero'} = 'A
+
+A010
+
+A110
+
+
+A011
+
+
+A111
+
+
+
+A000
+A100
+
+A001
+
+A101
+
+
+A0 0
+A1 0
+
+A0 1
+
+A1 1
+
+
+B';
+
+$result_errors{'sp_empty_lines_1_no_arg_zero'} = [
+  {
+    'error_line' => '@sp missing argument
+',
+    'line_nr' => 28,
+    'text' => '@sp missing argument',
+    'type' => 'error'
+  },
+  {
+    'error_line' => '@sp missing argument
+',
+    'line_nr' => 31,
+    'text' => '@sp missing argument',
+    'type' => 'error'
+  },
+  {
+    'error_line' => '@sp missing argument
+',
+    'line_nr' => 34,
+    'text' => '@sp missing argument',
+    'type' => 'error'
+  },
+  {
+    'error_line' => '@sp missing argument
+',
+    'line_nr' => 37,
+    'text' => '@sp missing argument',
+    'type' => 'error'
+  }
+];
+
+
+$result_floats{'sp_empty_lines_1_no_arg_zero'} = {};
+
+
+
+$result_converted{'plaintext'}->{'sp_empty_lines_1_no_arg_zero'} = 'A
+
+   A010
+
+   A110
+
+
+   A011
+
+
+   A111
+
+
+   A000
+   A100
+
+   A001
+
+   A101
+
+   A0 0
+
+   A1 0
+
+
+   A0 1
+
+
+   A1 1
+
+
+   B
+';
+
+
+$result_converted{'html_text'}->{'sp_empty_lines_1_no_arg_zero'} = '<p>A
+</p>
+<p>A010
+</p><br>
+<p>A110
+</p>
+<br>
+<p>A011
+</p>
+<br>
+<p>A111
+</p>
+<br>
+
+<p>A000
+</p><p>A100
+</p>
+<p>A001
+</p>
+<p>A101
+</p>
+
+<p>A0 0
+</p><br>
+<p>A1 0
+</p>
+<br>
+<p>A0 1
+</p>
+<br>
+<p>A1 1
+</p>
+<br>
+
+<p>B</p>';
+
+
+$result_converted{'xml'}->{'sp_empty_lines_1_no_arg_zero'} = '<para>A
+</para>
+<para>A010
+</para><sp spaces=" " value="1" line="1"></sp>
+<para>A110
+</para>
+<sp spaces=" " value="1" line="1"></sp>
+<para>A011
+</para>
+<sp spaces=" " value="1" line="1"></sp>
+<para>A111
+</para>
+<sp spaces=" " value="1" line="1"></sp>
+
+<para>A000
+</para><sp spaces=" " value="0" line="0"></sp>
+<para>A100
+</para>
+<sp spaces=" " value="0" line="0"></sp>
+<para>A001
+</para>
+<sp spaces=" " value="0" line="0"></sp>
+<para>A101
+</para>
+<sp spaces=" " value="0" line="0"></sp>
+
+<para>A0 0
+</para><sp></sp>
+<para>A1 0
+</para>
+<sp line=" "></sp>
+<para>A0 1
+</para>
+<sp></sp>
+<para>A1 1
+</para>
+<sp line=" "></sp>
+
+<para>B</para>';
+
+
+$result_converted{'docbook'}->{'sp_empty_lines_1_no_arg_zero'} = '<para>A
+</para>
+<para>A010
+</para><para>A110
+</para>
+<para>A011
+</para>
+<para>A111
+</para>
+
+<para>A000
+</para><para>A100
+</para>
+<para>A001
+</para>
+<para>A101
+</para>
+
+<para>A0 0
+</para><para>A1 0
+</para>
+<para>A0 1
+</para>
+<para>A1 1
+</para>
+
+<para>B</para>';
+
+
+$result_converted{'latex_text'}->{'sp_empty_lines_1_no_arg_zero'} = 'A
+
+A010
+\\vskip 1\\baselineskip %
+A110
+
+\\vskip 1\\baselineskip %
+A011
+
+\\vskip 1\\baselineskip %
+A111
+
+\\vskip 1\\baselineskip %
+
+A000
+\\vskip 0\\baselineskip %
+A100
+
+\\vskip 0\\baselineskip %
+A001
+
+\\vskip 0\\baselineskip %
+A101
+
+\\vskip 0\\baselineskip %
+
+A0 0
+\\vskip \\baselineskip %
+A1 0
+
+\\vskip \\baselineskip %
+A0 1
+
+\\vskip \\baselineskip %
+A1 1
+
+\\vskip \\baselineskip %
+
+B';
+
+1;
diff --git a/tp/tests/coverage/res_parser/formatting_chm/chapter.html 
b/tp/tests/coverage/res_parser/formatting_chm/chapter.html
index 9c24dd3d42..cdb754281f 100644
--- a/tp/tests/coverage/res_parser/formatting_chm/chapter.html
+++ b/tp/tests/coverage/res_parser/formatting_chm/chapter.html
@@ -1918,6 +1918,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
@@ -3022,6 +3023,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
@@ -4271,6 +4273,7 @@ Invalid use of @':
 
 
 
+
 </pre><pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
 &#262;&#807; &#262;&#807; a&#779; &#551; &aring; a&#865;
 &#259; &#462;
diff --git a/tp/tests/coverage/res_parser/formatting_chm/formatting.html 
b/tp/tests/coverage/res_parser/formatting_chm/formatting.html
index b8a7949d9a..7575019b0d 100644
--- a/tp/tests/coverage/res_parser/formatting_chm/formatting.html
+++ b/tp/tests/coverage/res_parser/formatting_chm/formatting.html
@@ -1901,6 +1901,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 <strong class="author">author</strong><br>
 
@@ -3007,6 +3008,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
diff --git 
a/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
index b1034c5b71..edd09338d1 100644
--- 
a/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
+++ 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
@@ -1918,6 +1918,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="../images/35-f--ile.e--xt" 
alt="jk&#160;_&quot;&#160;%@ in b &quot;"/>
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="../images/36-filejk-__0022-_0025_0040.jpg" 
alt="altjk&#160;_&quot;&#160;%@"/>
 </p>
+<br/>
 
 
 <pre class="displaymath">&#252; &#220; &#241; &#226; &#233; &#333; &#236; 
&#233; &#274;&#768;
@@ -3022,6 +3023,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="../images/47-f--ile.e--xt" 
alt="jk&#160;_&quot;&#160;%@ in b &quot;"/>
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="../images/48-filejk-__0022-_0025_0040.jpg" 
alt="altjk&#160;_&quot;&#160;%@"/>
 </p>
+<br/>
 
 
 <pre class="displaymath">&#252; &#220; &#241; &#226; &#233; &#333; &#236; 
&#233; &#274;&#768;
@@ -4271,6 +4273,7 @@ Invalid use of @':
 
 
 
+
 </pre><pre class="displaymath">&#252; &#220; &#241; &#226; &#233; &#333; 
&#236; &#233; &#274;&#768;
 &#262;&#807; &#262;&#807; a&#779; &#551; &#229; a&#865;
 &#259; &#462;
diff --git 
a/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
index d5eda38a6f..f42e32aba5 100644
--- 
a/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
+++ 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
@@ -1901,6 +1901,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="../images/11-f--ile.e--xt" 
alt="jk&#160;_&quot;&#160;%@ in b &quot;"/>
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="../images/12-filejk-__0022-_0025_0040.jpg" 
alt="altjk&#160;_&quot;&#160;%@"/>
 </p>
+<br/>
 
 <strong class="author">author</strong><br/>
 
@@ -3007,6 +3008,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="../images/23-f--ile.e--xt" 
alt="jk&#160;_&quot;&#160;%@ in b &quot;"/>
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="../images/24-filejk-__0022-_0025_0040.jpg" 
alt="altjk&#160;_&quot;&#160;%@"/>
 </p>
+<br/>
 
 
 <pre class="displaymath">&#252; &#220; &#241; &#226; &#233; &#333; &#236; 
&#233; &#274;&#768;
diff --git a/tp/tests/coverage/res_parser/formatting_html32/formatting.html 
b/tp/tests/coverage/res_parser/formatting_html32/formatting.html
index 12bea942bd..9622654411 100644
--- a/tp/tests/coverage/res_parser/formatting_html32/formatting.html
+++ b/tp/tests/coverage/res_parser/formatting_html32/formatting.html
@@ -1852,6 +1852,7 @@ html ''
 <p><code>@image{f--ile,aze,az,@verb{:jk _&#34; %@:} @b{in b 
&#34;},e--xt}</code> <img src="f--ile.e--xt" alt="jk&nbsp;_&#34;&nbsp;%@ in b 
&#34;">
 <code>@image{file@verb{:jk _&#34; %@:},,,alt@verb{:jk _&#34; %@:}}</code> <img 
src="filejk%20_%22%20%25%40.jpg" alt="altjk&nbsp;_&#34;&nbsp;%@">
 </p>
+<br>
 
 <strong>author</strong><br>
 
@@ -2932,6 +2933,7 @@ html ''
 <p><code>@image{f--ile,aze,az,@verb{:jk _&#34; %@:} @b{in b 
&#34;},e--xt}</code> <img src="f--ile.e--xt" alt="jk&nbsp;_&#34;&nbsp;%@ in b 
&#34;">
 <code>@image{file@verb{:jk _&#34; %@:},,,alt@verb{:jk _&#34; %@:}}</code> <img 
src="filejk%20_%22%20%25%40.jpg" alt="altjk&nbsp;_&#34;&nbsp;%@">
 </p>
+<br>
 
 
 <pre>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; &igrave; &eacute; 
&#274;&#768;
@@ -4080,6 +4082,7 @@ html ''
 <p><code>@image{f--ile,aze,az,@verb{:jk _&#34; %@:} @b{in b 
&#34;},e--xt}</code> <img src="f--ile.e--xt" alt="jk&nbsp;_&#34;&nbsp;%@ in b 
&#34;">
 <code>@image{file@verb{:jk _&#34; %@:},,,alt@verb{:jk _&#34; %@:}}</code> <img 
src="filejk%20_%22%20%25%40.jpg" alt="altjk&nbsp;_&#34;&nbsp;%@">
 </p>
+<br>
 
 
 <pre>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; &igrave; &eacute; 
&#274;&#768;
@@ -5158,6 +5161,7 @@ html ''
 <p><code>@image{f--ile,aze,az,@verb{:jk _&#34; %@:} @b{in b 
&#34;},e--xt}</code> <img src="f--ile.e--xt" alt="jk&nbsp;_&#34;&nbsp;%@ in b 
&#34;">
 <code>@image{file@verb{:jk _&#34; %@:},,,alt@verb{:jk _&#34; %@:}}</code> <img 
src="filejk%20_%22%20%25%40.jpg" alt="altjk&nbsp;_&#34;&nbsp;%@">
 </p>
+<br>
 
 
 <pre>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; &igrave; &eacute; 
&#274;&#768;
@@ -6380,6 +6384,7 @@ Invalid use of @':
 
 
 
+
 </pre><pre>&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; &igrave; &eacute; 
&#274;&#768;
 &#262;&#807; &#262;&#807; a&#779; &#551; &aring; a&#865;
 &#259; &#462;
diff --git 
a/tp/tests/coverage/res_parser/formatting_html_no_split/formatting.html 
b/tp/tests/coverage/res_parser/formatting_html_no_split/formatting.html
index 91ab5a1a93..178401a452 100644
--- a/tp/tests/coverage/res_parser/formatting_html_no_split/formatting.html
+++ b/tp/tests/coverage/res_parser/formatting_html_no_split/formatting.html
@@ -1971,6 +1971,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
@@ -3075,6 +3076,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
@@ -4324,6 +4326,7 @@ Invalid use of @':
 
 
 
+
 </pre><pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
 &#262;&#807; &#262;&#807; a&#779; &#551; &aring; a&#865;
 &#259; &#462;
diff --git a/tp/tests/coverage/res_parser/formatting_info/formatting.info 
b/tp/tests/coverage/res_parser/formatting_info/formatting.info
index 276cfa56a7..25bf170f43 100644
--- a/tp/tests/coverage/res_parser/formatting_info/formatting.info
+++ b/tp/tests/coverage/res_parser/formatting_info/formatting.info
@@ -618,6 +618,7 @@ aaa"]
 aaa"]
 ‘@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}’ [altjk _" %@]
 
+
 ü Ü ñ â é ō ì é Ḕ
 Ḉ Ḉ a̋ ȧ å a͡
 ă ǎ
@@ -1357,6 +1358,7 @@ aaa"]
 aaa"]
 ‘@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}’ [altjk _" %@]
 
+
 ü Ü ñ â é ō ì é Ḕ
 Ḉ Ḉ a̋ ȧ å a͡
 ă ǎ
@@ -2053,6 +2055,7 @@ aaa"]
 aaa"]
 ‘@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}’ [altjk _" %@]
 
+
 ü Ü ñ â é ō ì é Ḕ
 Ḉ Ḉ a̋ ȧ å a͡
 ă ǎ
@@ -2918,6 +2921,7 @@ aaa"]
 
 
 
+
      ü Ü ñ â é ō ì é Ḕ
      Ḉ Ḉ a̋ ȧ å a͡
      ă ǎ
@@ -3009,14 +3013,14 @@ aaa"]
 [index]
 * Menu:
 
-* truc:                                  chapter.            (line 2278)
+* truc:                                  chapter.            (line 2281)
 
    codeidx
 
 [index]
 * Menu:
 
-* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2278)
+* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2281)
 
    cp
 
@@ -3024,116 +3028,116 @@ aaa"]
 * Menu:
 
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  724)
-* -option <2>:                           chapter.            (line 1431)
-* ?:                                     chapter.            (line 2278)
-* .:                                     chapter.            (line 2278)
+* -option <1>:                           chapter.            (line  725)
+* -option <2>:                           chapter.            (line 1433)
+* ?:                                     chapter.            (line 2281)
+* .:                                     chapter.            (line 2281)
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  724)
-* " <2>:                                 chapter.            (line 1431)
-* a:                                     chapter.            (line 2278)
-* aaa, bbb:                              chapter.            (line 2278)
-* a--a:                                  chapter.            (line 2278)
+* " <1>:                                 chapter.            (line  725)
+* " <2>:                                 chapter.            (line 1433)
+* a:                                     chapter.            (line 2281)
+* aaa, bbb:                              chapter.            (line 2281)
+* a--a:                                  chapter.            (line 2281)
 * a--asis:                               chapter.            (line  525)
-* a--asis <1>:                           chapter.            (line 1221)
-* a--asis <2>:                           chapter.            (line 2053)
+* a--asis <1>:                           chapter.            (line 1222)
+* a--asis <2>:                           chapter.            (line 2055)
 * b:                                     chapter.            (line  526)
-* b <1>:                                 chapter.            (line 1222)
-* b <2>:                                 chapter.            (line 2054)
-* b--b, c--c:                            chapter.            (line 2278)
+* b <1>:                                 chapter.            (line 1223)
+* b <2>:                                 chapter.            (line 2056)
+* b--b, c--c:                            chapter.            (line 2281)
 * counting entry:                        chapter.            (line    4)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2278)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2281)
 * d--efcv_name:                          chapter.            (line  366)
 * d--efcv_name <1>:                      chapter.            (line  369)
-* d--efcv_name <2>:                      chapter.            (line 1062)
-* d--efcv_name <3>:                      chapter.            (line 1065)
-* d--efcv_name <4>:                      chapter.            (line 1894)
-* d--efcv_name <5>:                      chapter.            (line 1897)
+* d--efcv_name <2>:                      chapter.            (line 1063)
+* d--efcv_name <3>:                      chapter.            (line 1066)
+* d--efcv_name <4>:                      chapter.            (line 1896)
+* d--efcv_name <5>:                      chapter.            (line 1899)
 * d--efivar_name of c--lass:             chapter.            (line  411)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1107)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1939)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1108)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1941)
 * d--efopt_name:                         chapter.            (line  402)
-* d--efopt_name <1>:                     chapter.            (line 1098)
-* d--efopt_name <2>:                     chapter.            (line 1930)
+* d--efopt_name <1>:                     chapter.            (line 1099)
+* d--efopt_name <2>:                     chapter.            (line 1932)
 * d--eftypecv_name of c--lass:           chapter.            (line  372)
 * d--eftypecv_name of c--lass <1>:       chapter.            (line  375)
-* d--eftypecv_name of c--lass <2>:       chapter.            (line 1068)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1071)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1900)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1903)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1069)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1072)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1902)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1905)
 * d--eftypecv_name2 of c--lass2:         chapter.            (line  443)
 * d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  446)
-* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1139)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1142)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1972)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1975)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1140)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1143)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1974)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1977)
 * d--eftypeivar_name of c--lass:         chapter.            (line  414)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1110)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1942)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1111)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1944)
 * d--eftypevar_name:                     chapter.            (line  408)
-* d--eftypevar_name <1>:                 chapter.            (line 1104)
-* d--eftypevar_name <2>:                 chapter.            (line 1936)
+* d--eftypevar_name <1>:                 chapter.            (line 1105)
+* d--eftypevar_name <2>:                 chapter.            (line 1938)
 * d--eftypevr_name:                      chapter.            (line  363)
-* d--eftypevr_name <1>:                  chapter.            (line 1059)
-* d--eftypevr_name <2>:                  chapter.            (line 1891)
+* d--eftypevr_name <1>:                  chapter.            (line 1060)
+* d--eftypevr_name <2>:                  chapter.            (line 1893)
 * d--efvar_name:                         chapter.            (line  396)
 * d--efvar_name <1>:                     chapter.            (line  399)
-* d--efvar_name <2>:                     chapter.            (line 1092)
-* d--efvar_name <3>:                     chapter.            (line 1095)
-* d--efvar_name <4>:                     chapter.            (line 1924)
-* d--efvar_name <5>:                     chapter.            (line 1927)
+* d--efvar_name <2>:                     chapter.            (line 1093)
+* d--efvar_name <3>:                     chapter.            (line 1096)
+* d--efvar_name <4>:                     chapter.            (line 1926)
+* d--efvar_name <5>:                     chapter.            (line 1929)
 * d--efvr_name:                          chapter.            (line  342)
-* d--efvr_name <1>:                      chapter.            (line 1038)
-* d--efvr_name <2>:                      chapter.            (line 1870)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2278)
+* d--efvr_name <1>:                      chapter.            (line 1039)
+* d--efvr_name <2>:                      chapter.            (line 1872)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2281)
 * index entry between item and itemx:    chapter.            (line  530)
-* index entry between item and itemx <1>: chapter.           (line  659)
-* index entry between item and itemx <2>: chapter.           (line 1226)
-* index entry between item and itemx <3>: chapter.           (line 1355)
-* index entry between item and itemx <4>: chapter.           (line 2058)
-* index entry between item and itemx <5>: chapter.           (line 2220)
+* index entry between item and itemx <1>: chapter.           (line  660)
+* index entry between item and itemx <2>: chapter.           (line 1227)
+* index entry between item and itemx <3>: chapter.           (line 1357)
+* index entry between item and itemx <4>: chapter.           (line 2060)
+* index entry between item and itemx <5>: chapter.           (line 2223)
 * index entry in footnote:               chapter.            (line    4)
 * index entry within deffn:              chapter.            (line  317)
-* index entry within deffn <1>:          chapter.            (line 1013)
-* index entry within deffn <2>:          chapter.            (line 1843)
+* index entry within deffn <1>:          chapter.            (line 1014)
+* index entry within deffn <2>:          chapter.            (line 1845)
 * index entry within itemize:            chapter.            (line  228)
-* index entry within itemize <1>:        chapter.            (line  924)
-* index entry within itemize <2>:        chapter.            (line 1754)
+* index entry within itemize <1>:        chapter.            (line  925)
+* index entry within itemize <2>:        chapter.            (line 1756)
 * index entry within multitable:         chapter.            (line  250)
-* index entry within multitable <1>:     chapter.            (line  946)
-* index entry within multitable <2>:     chapter.            (line 1777)
-* t-ruc:                                 chapter.            (line 2278)
-* T-ruc:                                 chapter.            (line 2278)
+* index entry within multitable <1>:     chapter.            (line  947)
+* index entry within multitable <2>:     chapter.            (line 1779)
+* t-ruc:                                 chapter.            (line 2281)
+* T-ruc:                                 chapter.            (line 2281)
 * vtable i--tem code kbdinputstyle:      chapter.            (line  152)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  848)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1677)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  849)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1679)
 * vtable i--tem default kbdinputstyle:   chapter.            (line  147)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  843)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1672)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  844)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1674)
 * vtable i--tem distinct kbdinputstyle:  chapter.            (line  162)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  858)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1687)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  859)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1689)
 * vtable i--tem example kbdinputstyle:   chapter.            (line  157)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  853)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1682)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  854)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1684)
 * vtable i--tem in example code kbdinputstyle: chapter.      (line  154)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  850)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1679)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  851)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1681)
 * vtable i--tem in example default kbdinputstyle: chapter.   (line  149)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  845)
+                                                             (line  846)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1674)
+                                                             (line 1676)
 * vtable i--tem in example distinct kbdinputstyle: chapter.  (line  164)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  860)
+                                                             (line  861)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1689)
+                                                             (line 1691)
 * vtable i--tem in example example kbdinputstyle: chapter.   (line  159)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  855)
+                                                             (line  856)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1684)
+                                                             (line 1686)
 
    fn
 
@@ -3141,171 +3145,171 @@ aaa"]
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  724)
-* --foption <2>:                         chapter.            (line 1431)
-* ?:                                     chapter.            (line 2278)
-* .:                                     chapter.            (line 2278)
+* --foption <1>:                         chapter.            (line  725)
+* --foption <2>:                         chapter.            (line 1433)
+* ?:                                     chapter.            (line 2281)
+* .:                                     chapter.            (line 2281)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  724)
-* `` <2>:                                chapter.            (line 1431)
+* `` <1>:                                chapter.            (line  725)
+* `` <2>:                                chapter.            (line 1433)
 * a:                                     chapter.            (line  330)
 * a <1>:                                 chapter.            (line  529)
-* a <2>:                                 chapter.            (line  658)
-* a <3>:                                 chapter.            (line 1026)
-* a <4>:                                 chapter.            (line 1225)
-* a <5>:                                 chapter.            (line 1354)
-* a <6>:                                 chapter.            (line 1856)
-* a <7>:                                 chapter.            (line 2057)
-* a <8>:                                 chapter.            (line 2219)
-* a <9>:                                 chapter.            (line 2278)
-* after:                                 chapter.            (line  669)
-* after <1>:                             chapter.            (line 1365)
-* after <2>:                             chapter.            (line 2230)
+* a <2>:                                 chapter.            (line  659)
+* a <3>:                                 chapter.            (line 1027)
+* a <4>:                                 chapter.            (line 1226)
+* a <5>:                                 chapter.            (line 1356)
+* a <6>:                                 chapter.            (line 1858)
+* a <7>:                                 chapter.            (line 2059)
+* a <8>:                                 chapter.            (line 2222)
+* a <9>:                                 chapter.            (line 2281)
+* after:                                 chapter.            (line  670)
+* after <1>:                             chapter.            (line 1367)
+* after <2>:                             chapter.            (line 2233)
 * arg2:                                  chapter.            (line  449)
-* arg2 <1>:                              chapter.            (line 1145)
-* arg2 <2>:                              chapter.            (line 1979)
+* arg2 <1>:                              chapter.            (line 1146)
+* arg2 <2>:                              chapter.            (line 1981)
 * b:                                     chapter.            (line  530)
-* b <1>:                                 chapter.            (line  659)
-* b <2>:                                 chapter.            (line 1226)
-* b <3>:                                 chapter.            (line 1355)
-* b <4>:                                 chapter.            (line 2058)
-* b <5>:                                 chapter.            (line 2220)
+* b <1>:                                 chapter.            (line  660)
+* b <2>:                                 chapter.            (line 1227)
+* b <3>:                                 chapter.            (line 1357)
+* b <4>:                                 chapter.            (line 2060)
+* b <5>:                                 chapter.            (line 2223)
 * bidule machin:                         chapter.            (line  325)
-* bidule machin <1>:                     chapter.            (line 1021)
-* bidule machin <2>:                     chapter.            (line 1851)
+* bidule machin <1>:                     chapter.            (line 1022)
+* bidule machin <2>:                     chapter.            (line 1853)
 * d--effn_name:                          chapter.            (line  309)
-* d--effn_name <1>:                      chapter.            (line 1005)
-* d--effn_name <2>:                      chapter.            (line 1835)
+* d--effn_name <1>:                      chapter.            (line 1006)
+* d--effn_name <2>:                      chapter.            (line 1837)
 * d--efmac_name:                         chapter.            (line  390)
-* d--efmac_name <1>:                     chapter.            (line 1086)
-* d--efmac_name <2>:                     chapter.            (line 1918)
+* d--efmac_name <1>:                     chapter.            (line 1087)
+* d--efmac_name <2>:                     chapter.            (line 1920)
 * d--efmethod_name on c--lass:           chapter.            (line  417)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1113)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1945)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1114)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1947)
 * d--efop_name on c--lass:               chapter.            (line  378)
 * d--efop_name on c--lass <1>:           chapter.            (line  381)
-* d--efop_name on c--lass <2>:           chapter.            (line 1074)
-* d--efop_name on c--lass <3>:           chapter.            (line 1077)
-* d--efop_name on c--lass <4>:           chapter.            (line 1906)
-* d--efop_name on c--lass <5>:           chapter.            (line 1909)
+* d--efop_name on c--lass <2>:           chapter.            (line 1075)
+* d--efop_name on c--lass <3>:           chapter.            (line 1078)
+* d--efop_name on c--lass <4>:           chapter.            (line 1908)
+* d--efop_name on c--lass <5>:           chapter.            (line 1911)
 * d--efspec_name:                        chapter.            (line  393)
-* d--efspec_name <1>:                    chapter.            (line 1089)
-* d--efspec_name <2>:                    chapter.            (line 1921)
+* d--efspec_name <1>:                    chapter.            (line 1090)
+* d--efspec_name <2>:                    chapter.            (line 1923)
 * d--eftypefn_name:                      chapter.            (line  351)
 * d--eftypefn_name <1>:                  chapter.            (line  354)
-* d--eftypefn_name <2>:                  chapter.            (line 1047)
-* d--eftypefn_name <3>:                  chapter.            (line 1050)
-* d--eftypefn_name <4>:                  chapter.            (line 1879)
-* d--eftypefn_name <5>:                  chapter.            (line 1882)
+* d--eftypefn_name <2>:                  chapter.            (line 1048)
+* d--eftypefn_name <3>:                  chapter.            (line 1051)
+* d--eftypefn_name <4>:                  chapter.            (line 1881)
+* d--eftypefn_name <5>:                  chapter.            (line 1884)
 * d--eftypefn_name2:                     chapter.            (line  428)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1124)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1957)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1125)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1959)
 * d--eftypefun_name:                     chapter.            (line  405)
-* d--eftypefun_name <1>:                 chapter.            (line 1101)
-* d--eftypefun_name <2>:                 chapter.            (line 1933)
+* d--eftypefun_name <1>:                 chapter.            (line 1102)
+* d--eftypefun_name <2>:                 chapter.            (line 1935)
 * d--eftypemethod_name on c--lass:       chapter.            (line  420)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1116)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1948)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1117)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1950)
 * d--eftypeop_name on c--lass:           chapter.            (line  357)
 * d--eftypeop_name on c--lass <1>:       chapter.            (line  360)
-* d--eftypeop_name on c--lass <2>:       chapter.            (line 1053)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1056)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1885)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1888)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1054)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1057)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1887)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1890)
 * d--eftypeop_name2 on c--lass2:         chapter.            (line  433)
 * d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  438)
-* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1129)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1134)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1962)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1967)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1130)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1135)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1964)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1969)
 * d--efun_name:                          chapter.            (line  387)
-* d--efun_name <1>:                      chapter.            (line 1083)
-* d--efun_name <2>:                      chapter.            (line 1915)
+* d--efun_name <1>:                      chapter.            (line 1084)
+* d--efun_name <2>:                      chapter.            (line 1917)
 * de--ffn_name:                          chapter.            (line  312)
-* de--ffn_name <1>:                      chapter.            (line 1008)
-* de--ffn_name <2>:                      chapter.            (line 1838)
+* de--ffn_name <1>:                      chapter.            (line 1009)
+* de--ffn_name <2>:                      chapter.            (line 1840)
 * deffn:                                 chapter.            (line  333)
 * deffn <1>:                             chapter.            (line  335)
-* deffn <2>:                             chapter.            (line 1029)
-* deffn <3>:                             chapter.            (line 1031)
-* deffn <4>:                             chapter.            (line 1860)
-* deffn <5>:                             chapter.            (line 1862)
+* deffn <2>:                             chapter.            (line 1030)
+* deffn <3>:                             chapter.            (line 1032)
+* deffn <4>:                             chapter.            (line 1862)
+* deffn <5>:                             chapter.            (line 1864)
 * deffnx:                                chapter.            (line  331)
 * deffnx <1>:                            chapter.            (line  336)
-* deffnx <2>:                            chapter.            (line 1027)
-* deffnx <3>:                            chapter.            (line 1032)
-* deffnx <4>:                            chapter.            (line 1857)
-* deffnx <5>:                            chapter.            (line 1863)
-* f---aa:                                chapter.            (line 2278)
-* f---bb, f---cc:                        chapter.            (line 2278)
-* f---ddd, f---eee, ffff:                chapter.            (line 2278)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2278)
+* deffnx <2>:                            chapter.            (line 1028)
+* deffnx <3>:                            chapter.            (line 1033)
+* deffnx <4>:                            chapter.            (line 1859)
+* deffnx <5>:                            chapter.            (line 1865)
+* f---aa:                                chapter.            (line 2281)
+* f---bb, f---cc:                        chapter.            (line 2281)
+* f---ddd, f---eee, ffff:                chapter.            (line 2281)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2281)
 * followed:                              chapter.            (line  328)
-* followed <1>:                          chapter.            (line  667)
-* followed <2>:                          chapter.            (line 1024)
-* followed <3>:                          chapter.            (line 1363)
-* followed <4>:                          chapter.            (line 1854)
-* followed <5>:                          chapter.            (line 2228)
+* followed <1>:                          chapter.            (line  668)
+* followed <2>:                          chapter.            (line 1025)
+* followed <3>:                          chapter.            (line 1365)
+* followed <4>:                          chapter.            (line 1856)
+* followed <5>:                          chapter.            (line 2231)
 * I:                                     chapter.            (line  316)
 * I <1>:                                 chapter.            (line  338)
-* I <2>:                                 chapter.            (line 1012)
-* I <3>:                                 chapter.            (line 1034)
-* I <4>:                                 chapter.            (line 1842)
-* I <5>:                                 chapter.            (line 1865)
+* I <2>:                                 chapter.            (line 1013)
+* I <3>:                                 chapter.            (line 1035)
+* I <4>:                                 chapter.            (line 1844)
+* I <5>:                                 chapter.            (line 1867)
 * id i ule:                              chapter.            (line  322)
-* id i ule <1>:                          chapter.            (line 1018)
-* id i ule <2>:                          chapter.            (line 1848)
+* id i ule <1>:                          chapter.            (line 1019)
+* id i ule <2>:                          chapter.            (line 1850)
 * id ule:                                chapter.            (line  321)
-* id ule <1>:                            chapter.            (line 1017)
-* id ule <2>:                            chapter.            (line 1847)
-* INVALID:                               chapter.            (line  671)
-* INVALID <1>:                           chapter.            (line 1367)
-* INVALID <2>:                           chapter.            (line 2232)
+* id ule <1>:                            chapter.            (line 1018)
+* id ule <2>:                            chapter.            (line 1849)
+* INVALID:                               chapter.            (line  672)
+* INVALID <1>:                           chapter.            (line 1369)
+* INVALID <2>:                           chapter.            (line 2235)
 * log trap:                              chapter.            (line  318)
-* log trap <1>:                          chapter.            (line 1014)
-* log trap <2>:                          chapter.            (line 1844)
+* log trap <1>:                          chapter.            (line 1015)
+* log trap <2>:                          chapter.            (line 1846)
 * log trap1:                             chapter.            (line  319)
-* log trap1 <1>:                         chapter.            (line 1015)
-* log trap1 <2>:                         chapter.            (line 1845)
+* log trap1 <1>:                         chapter.            (line 1016)
+* log trap1 <2>:                         chapter.            (line 1847)
 * log trap2:                             chapter.            (line  320)
-* log trap2 <1>:                         chapter.            (line 1016)
-* log trap2 <2>:                         chapter.            (line 1846)
+* log trap2 <1>:                         chapter.            (line 1017)
+* log trap2 <2>:                         chapter.            (line 1848)
 * machin:                                chapter.            (line  324)
 * machin <1>:                            chapter.            (line  326)
-* machin <2>:                            chapter.            (line  663)
-* machin <3>:                            chapter.            (line  664)
-* machin <4>:                            chapter.            (line  665)
-* machin <5>:                            chapter.            (line  666)
-* machin <6>:                            chapter.            (line 1020)
-* machin <7>:                            chapter.            (line 1022)
-* machin <8>:                            chapter.            (line 1359)
-* machin <9>:                            chapter.            (line 1360)
-* machin <10>:                           chapter.            (line 1361)
-* machin <11>:                           chapter.            (line 1362)
-* machin <12>:                           chapter.            (line 1850)
-* machin <13>:                           chapter.            (line 1852)
-* machin <14>:                           chapter.            (line 2224)
-* machin <15>:                           chapter.            (line 2225)
-* machin <16>:                           chapter.            (line 2226)
-* machin <17>:                           chapter.            (line 2227)
+* machin <2>:                            chapter.            (line  664)
+* machin <3>:                            chapter.            (line  665)
+* machin <4>:                            chapter.            (line  666)
+* machin <5>:                            chapter.            (line  667)
+* machin <6>:                            chapter.            (line 1021)
+* machin <7>:                            chapter.            (line 1023)
+* machin <8>:                            chapter.            (line 1361)
+* machin <9>:                            chapter.            (line 1362)
+* machin <10>:                           chapter.            (line 1363)
+* machin <11>:                           chapter.            (line 1364)
+* machin <12>:                           chapter.            (line 1852)
+* machin <13>:                           chapter.            (line 1854)
+* machin <14>:                           chapter.            (line 2227)
+* machin <15>:                           chapter.            (line 2228)
+* machin <16>:                           chapter.            (line 2229)
+* machin <17>:                           chapter.            (line 2230)
 * n--ame:                                chapter.            (line  345)
 * n--ame <1>:                            chapter.            (line  348)
-* n--ame <2>:                            chapter.            (line 1041)
-* n--ame <3>:                            chapter.            (line 1044)
-* n--ame <4>:                            chapter.            (line 1873)
-* n--ame <5>:                            chapter.            (line 1876)
+* n--ame <2>:                            chapter.            (line 1042)
+* n--ame <3>:                            chapter.            (line 1045)
+* n--ame <4>:                            chapter.            (line 1875)
+* n--ame <5>:                            chapter.            (line 1878)
 * name2:                                 chapter.            (line  423)
-* name2 <1>:                             chapter.            (line 1119)
-* name2 <2>:                             chapter.            (line 1952)
-* t--ruc:                                chapter.            (line 2278)
-* T--ruc:                                chapter.            (line 2278)
+* name2 <1>:                             chapter.            (line 1120)
+* name2 <2>:                             chapter.            (line 1954)
+* t--ruc:                                chapter.            (line 2281)
+* T--ruc:                                chapter.            (line 2281)
 * truc:                                  chapter.            (line  317)
 * truc <1>:                              chapter.            (line  339)
-* truc <2>:                              chapter.            (line 1013)
-* truc <3>:                              chapter.            (line 1035)
-* truc <4>:                              chapter.            (line 1843)
-* truc <5>:                              chapter.            (line 1866)
-* xxx, zzz:                              chapter.            (line 2278)
+* truc <2>:                              chapter.            (line 1014)
+* truc <3>:                              chapter.            (line 1036)
+* truc <4>:                              chapter.            (line 1845)
+* truc <5>:                              chapter.            (line 1868)
+* xxx, zzz:                              chapter.            (line 2281)
 
    vr
 
@@ -3319,8 +3323,8 @@ aaa"]
 * Menu:
 
 * d--eftp_name:                          chapter.            (line  384)
-* d--eftp_name <1>:                      chapter.            (line 1080)
-* d--eftp_name <2>:                      chapter.            (line 1912)
+* d--eftp_name <1>:                      chapter.            (line 1081)
+* d--eftp_name <2>:                      chapter.            (line 1914)
 
    (8)
 
@@ -3402,305 +3406,305 @@ chapter 2
 * Menu:
 
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  724)
-* -option <2>:                           chapter.            (line 1431)
-* ?:                                     chapter.            (line 2278)
-* .:                                     chapter.            (line 2278)
+* -option <1>:                           chapter.            (line  725)
+* -option <2>:                           chapter.            (line 1433)
+* ?:                                     chapter.            (line 2281)
+* .:                                     chapter.            (line 2281)
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  724)
-* " <2>:                                 chapter.            (line 1431)
-* a:                                     chapter.            (line 2278)
-* aaa, bbb:                              chapter.            (line 2278)
-* a--a:                                  chapter.            (line 2278)
+* " <1>:                                 chapter.            (line  725)
+* " <2>:                                 chapter.            (line 1433)
+* a:                                     chapter.            (line 2281)
+* aaa, bbb:                              chapter.            (line 2281)
+* a--a:                                  chapter.            (line 2281)
 * a--asis:                               chapter.            (line  525)
-* a--asis <1>:                           chapter.            (line 1221)
-* a--asis <2>:                           chapter.            (line 2053)
+* a--asis <1>:                           chapter.            (line 1222)
+* a--asis <2>:                           chapter.            (line 2055)
 * b:                                     chapter.            (line  526)
-* b <1>:                                 chapter.            (line 1222)
-* b <2>:                                 chapter.            (line 2054)
-* b--b, c--c:                            chapter.            (line 2278)
-* counting entry:                        chapter.            (line 2627)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2278)
+* b <1>:                                 chapter.            (line 1223)
+* b <2>:                                 chapter.            (line 2056)
+* b--b, c--c:                            chapter.            (line 2281)
+* counting entry:                        chapter.            (line 2630)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2281)
 * d--efcv_name:                          chapter.            (line  366)
 * d--efcv_name <1>:                      chapter.            (line  369)
-* d--efcv_name <2>:                      chapter.            (line 1062)
-* d--efcv_name <3>:                      chapter.            (line 1065)
-* d--efcv_name <4>:                      chapter.            (line 1894)
-* d--efcv_name <5>:                      chapter.            (line 1897)
+* d--efcv_name <2>:                      chapter.            (line 1063)
+* d--efcv_name <3>:                      chapter.            (line 1066)
+* d--efcv_name <4>:                      chapter.            (line 1896)
+* d--efcv_name <5>:                      chapter.            (line 1899)
 * d--efivar_name of c--lass:             chapter.            (line  411)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1107)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1939)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1108)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1941)
 * d--efopt_name:                         chapter.            (line  402)
-* d--efopt_name <1>:                     chapter.            (line 1098)
-* d--efopt_name <2>:                     chapter.            (line 1930)
+* d--efopt_name <1>:                     chapter.            (line 1099)
+* d--efopt_name <2>:                     chapter.            (line 1932)
 * d--eftypecv_name of c--lass:           chapter.            (line  372)
 * d--eftypecv_name of c--lass <1>:       chapter.            (line  375)
-* d--eftypecv_name of c--lass <2>:       chapter.            (line 1068)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1071)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1900)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1903)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1069)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1072)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1902)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1905)
 * d--eftypecv_name2 of c--lass2:         chapter.            (line  443)
 * d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  446)
-* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1139)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1142)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1972)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1975)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1140)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1143)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1974)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1977)
 * d--eftypeivar_name of c--lass:         chapter.            (line  414)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1110)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1942)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1111)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1944)
 * d--eftypevar_name:                     chapter.            (line  408)
-* d--eftypevar_name <1>:                 chapter.            (line 1104)
-* d--eftypevar_name <2>:                 chapter.            (line 1936)
+* d--eftypevar_name <1>:                 chapter.            (line 1105)
+* d--eftypevar_name <2>:                 chapter.            (line 1938)
 * d--eftypevr_name:                      chapter.            (line  363)
-* d--eftypevr_name <1>:                  chapter.            (line 1059)
-* d--eftypevr_name <2>:                  chapter.            (line 1891)
+* d--eftypevr_name <1>:                  chapter.            (line 1060)
+* d--eftypevr_name <2>:                  chapter.            (line 1893)
 * d--efvar_name:                         chapter.            (line  396)
 * d--efvar_name <1>:                     chapter.            (line  399)
-* d--efvar_name <2>:                     chapter.            (line 1092)
-* d--efvar_name <3>:                     chapter.            (line 1095)
-* d--efvar_name <4>:                     chapter.            (line 1924)
-* d--efvar_name <5>:                     chapter.            (line 1927)
+* d--efvar_name <2>:                     chapter.            (line 1093)
+* d--efvar_name <3>:                     chapter.            (line 1096)
+* d--efvar_name <4>:                     chapter.            (line 1926)
+* d--efvar_name <5>:                     chapter.            (line 1929)
 * d--efvr_name:                          chapter.            (line  342)
-* d--efvr_name <1>:                      chapter.            (line 1038)
-* d--efvr_name <2>:                      chapter.            (line 1870)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2278)
+* d--efvr_name <1>:                      chapter.            (line 1039)
+* d--efvr_name <2>:                      chapter.            (line 1872)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2281)
 * index entry between item and itemx:    chapter.            (line  530)
-* index entry between item and itemx <1>: chapter.           (line  659)
-* index entry between item and itemx <2>: chapter.           (line 1226)
-* index entry between item and itemx <3>: chapter.           (line 1355)
-* index entry between item and itemx <4>: chapter.           (line 2058)
-* index entry between item and itemx <5>: chapter.           (line 2220)
-* index entry in footnote:               chapter.            (line 2622)
+* index entry between item and itemx <1>: chapter.           (line  660)
+* index entry between item and itemx <2>: chapter.           (line 1227)
+* index entry between item and itemx <3>: chapter.           (line 1357)
+* index entry between item and itemx <4>: chapter.           (line 2060)
+* index entry between item and itemx <5>: chapter.           (line 2223)
+* index entry in footnote:               chapter.            (line 2625)
 * index entry within deffn:              chapter.            (line  317)
-* index entry within deffn <1>:          chapter.            (line 1013)
-* index entry within deffn <2>:          chapter.            (line 1843)
+* index entry within deffn <1>:          chapter.            (line 1014)
+* index entry within deffn <2>:          chapter.            (line 1845)
 * index entry within itemize:            chapter.            (line  228)
-* index entry within itemize <1>:        chapter.            (line  924)
-* index entry within itemize <2>:        chapter.            (line 1754)
+* index entry within itemize <1>:        chapter.            (line  925)
+* index entry within itemize <2>:        chapter.            (line 1756)
 * index entry within multitable:         chapter.            (line  250)
-* index entry within multitable <1>:     chapter.            (line  946)
-* index entry within multitable <2>:     chapter.            (line 1777)
-* t-ruc:                                 chapter.            (line 2278)
-* T-ruc:                                 chapter.            (line 2278)
+* index entry within multitable <1>:     chapter.            (line  947)
+* index entry within multitable <2>:     chapter.            (line 1779)
+* t-ruc:                                 chapter.            (line 2281)
+* T-ruc:                                 chapter.            (line 2281)
 * vtable i--tem code kbdinputstyle:      chapter.            (line  152)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  848)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1677)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  849)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1679)
 * vtable i--tem default kbdinputstyle:   chapter.            (line  147)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  843)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1672)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  844)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1674)
 * vtable i--tem distinct kbdinputstyle:  chapter.            (line  162)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  858)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1687)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  859)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1689)
 * vtable i--tem example kbdinputstyle:   chapter.            (line  157)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  853)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1682)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  854)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1684)
 * vtable i--tem in example code kbdinputstyle: chapter.      (line  154)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  850)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1679)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  851)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1681)
 * vtable i--tem in example default kbdinputstyle: chapter.   (line  149)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  845)
+                                                             (line  846)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1674)
+                                                             (line 1676)
 * vtable i--tem in example distinct kbdinputstyle: chapter.  (line  164)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  860)
+                                                             (line  861)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1689)
+                                                             (line 1691)
 * vtable i--tem in example example kbdinputstyle: chapter.   (line  159)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  855)
+                                                             (line  856)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1684)
+                                                             (line 1686)
 
 [index]
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  724)
-* --foption <2>:                         chapter.            (line 1431)
-* ?:                                     chapter.            (line 2278)
-* .:                                     chapter.            (line 2278)
+* --foption <1>:                         chapter.            (line  725)
+* --foption <2>:                         chapter.            (line 1433)
+* ?:                                     chapter.            (line 2281)
+* .:                                     chapter.            (line 2281)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  724)
-* `` <2>:                                chapter.            (line 1431)
+* `` <1>:                                chapter.            (line  725)
+* `` <2>:                                chapter.            (line 1433)
 * a:                                     chapter.            (line  330)
 * a <1>:                                 chapter.            (line  529)
-* a <2>:                                 chapter.            (line  658)
-* a <3>:                                 chapter.            (line 1026)
-* a <4>:                                 chapter.            (line 1225)
-* a <5>:                                 chapter.            (line 1354)
-* a <6>:                                 chapter.            (line 1856)
-* a <7>:                                 chapter.            (line 2057)
-* a <8>:                                 chapter.            (line 2219)
-* a <9>:                                 chapter.            (line 2278)
-* after:                                 chapter.            (line  669)
-* after <1>:                             chapter.            (line 1365)
-* after <2>:                             chapter.            (line 2230)
+* a <2>:                                 chapter.            (line  659)
+* a <3>:                                 chapter.            (line 1027)
+* a <4>:                                 chapter.            (line 1226)
+* a <5>:                                 chapter.            (line 1356)
+* a <6>:                                 chapter.            (line 1858)
+* a <7>:                                 chapter.            (line 2059)
+* a <8>:                                 chapter.            (line 2222)
+* a <9>:                                 chapter.            (line 2281)
+* after:                                 chapter.            (line  670)
+* after <1>:                             chapter.            (line 1367)
+* after <2>:                             chapter.            (line 2233)
 * arg2:                                  chapter.            (line  449)
-* arg2 <1>:                              chapter.            (line 1145)
-* arg2 <2>:                              chapter.            (line 1979)
+* arg2 <1>:                              chapter.            (line 1146)
+* arg2 <2>:                              chapter.            (line 1981)
 * b:                                     chapter.            (line  530)
-* b <1>:                                 chapter.            (line  659)
-* b <2>:                                 chapter.            (line 1226)
-* b <3>:                                 chapter.            (line 1355)
-* b <4>:                                 chapter.            (line 2058)
-* b <5>:                                 chapter.            (line 2220)
+* b <1>:                                 chapter.            (line  660)
+* b <2>:                                 chapter.            (line 1227)
+* b <3>:                                 chapter.            (line 1357)
+* b <4>:                                 chapter.            (line 2060)
+* b <5>:                                 chapter.            (line 2223)
 * bidule machin:                         chapter.            (line  325)
-* bidule machin <1>:                     chapter.            (line 1021)
-* bidule machin <2>:                     chapter.            (line 1851)
+* bidule machin <1>:                     chapter.            (line 1022)
+* bidule machin <2>:                     chapter.            (line 1853)
 * d--effn_name:                          chapter.            (line  309)
-* d--effn_name <1>:                      chapter.            (line 1005)
-* d--effn_name <2>:                      chapter.            (line 1835)
+* d--effn_name <1>:                      chapter.            (line 1006)
+* d--effn_name <2>:                      chapter.            (line 1837)
 * d--efmac_name:                         chapter.            (line  390)
-* d--efmac_name <1>:                     chapter.            (line 1086)
-* d--efmac_name <2>:                     chapter.            (line 1918)
+* d--efmac_name <1>:                     chapter.            (line 1087)
+* d--efmac_name <2>:                     chapter.            (line 1920)
 * d--efmethod_name on c--lass:           chapter.            (line  417)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1113)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1945)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1114)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1947)
 * d--efop_name on c--lass:               chapter.            (line  378)
 * d--efop_name on c--lass <1>:           chapter.            (line  381)
-* d--efop_name on c--lass <2>:           chapter.            (line 1074)
-* d--efop_name on c--lass <3>:           chapter.            (line 1077)
-* d--efop_name on c--lass <4>:           chapter.            (line 1906)
-* d--efop_name on c--lass <5>:           chapter.            (line 1909)
+* d--efop_name on c--lass <2>:           chapter.            (line 1075)
+* d--efop_name on c--lass <3>:           chapter.            (line 1078)
+* d--efop_name on c--lass <4>:           chapter.            (line 1908)
+* d--efop_name on c--lass <5>:           chapter.            (line 1911)
 * d--efspec_name:                        chapter.            (line  393)
-* d--efspec_name <1>:                    chapter.            (line 1089)
-* d--efspec_name <2>:                    chapter.            (line 1921)
+* d--efspec_name <1>:                    chapter.            (line 1090)
+* d--efspec_name <2>:                    chapter.            (line 1923)
 * d--eftypefn_name:                      chapter.            (line  351)
 * d--eftypefn_name <1>:                  chapter.            (line  354)
-* d--eftypefn_name <2>:                  chapter.            (line 1047)
-* d--eftypefn_name <3>:                  chapter.            (line 1050)
-* d--eftypefn_name <4>:                  chapter.            (line 1879)
-* d--eftypefn_name <5>:                  chapter.            (line 1882)
+* d--eftypefn_name <2>:                  chapter.            (line 1048)
+* d--eftypefn_name <3>:                  chapter.            (line 1051)
+* d--eftypefn_name <4>:                  chapter.            (line 1881)
+* d--eftypefn_name <5>:                  chapter.            (line 1884)
 * d--eftypefn_name2:                     chapter.            (line  428)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1124)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1957)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1125)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1959)
 * d--eftypefun_name:                     chapter.            (line  405)
-* d--eftypefun_name <1>:                 chapter.            (line 1101)
-* d--eftypefun_name <2>:                 chapter.            (line 1933)
+* d--eftypefun_name <1>:                 chapter.            (line 1102)
+* d--eftypefun_name <2>:                 chapter.            (line 1935)
 * d--eftypemethod_name on c--lass:       chapter.            (line  420)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1116)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1948)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1117)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1950)
 * d--eftypeop_name on c--lass:           chapter.            (line  357)
 * d--eftypeop_name on c--lass <1>:       chapter.            (line  360)
-* d--eftypeop_name on c--lass <2>:       chapter.            (line 1053)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1056)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1885)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1888)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1054)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1057)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1887)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1890)
 * d--eftypeop_name2 on c--lass2:         chapter.            (line  433)
 * d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  438)
-* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1129)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1134)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1962)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1967)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1130)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1135)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1964)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1969)
 * d--efun_name:                          chapter.            (line  387)
-* d--efun_name <1>:                      chapter.            (line 1083)
-* d--efun_name <2>:                      chapter.            (line 1915)
+* d--efun_name <1>:                      chapter.            (line 1084)
+* d--efun_name <2>:                      chapter.            (line 1917)
 * de--ffn_name:                          chapter.            (line  312)
-* de--ffn_name <1>:                      chapter.            (line 1008)
-* de--ffn_name <2>:                      chapter.            (line 1838)
+* de--ffn_name <1>:                      chapter.            (line 1009)
+* de--ffn_name <2>:                      chapter.            (line 1840)
 * deffn:                                 chapter.            (line  333)
 * deffn <1>:                             chapter.            (line  335)
-* deffn <2>:                             chapter.            (line 1029)
-* deffn <3>:                             chapter.            (line 1031)
-* deffn <4>:                             chapter.            (line 1860)
-* deffn <5>:                             chapter.            (line 1862)
+* deffn <2>:                             chapter.            (line 1030)
+* deffn <3>:                             chapter.            (line 1032)
+* deffn <4>:                             chapter.            (line 1862)
+* deffn <5>:                             chapter.            (line 1864)
 * deffnx:                                chapter.            (line  331)
 * deffnx <1>:                            chapter.            (line  336)
-* deffnx <2>:                            chapter.            (line 1027)
-* deffnx <3>:                            chapter.            (line 1032)
-* deffnx <4>:                            chapter.            (line 1857)
-* deffnx <5>:                            chapter.            (line 1863)
-* f---aa:                                chapter.            (line 2278)
-* f---bb, f---cc:                        chapter.            (line 2278)
-* f---ddd, f---eee, ffff:                chapter.            (line 2278)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2278)
+* deffnx <2>:                            chapter.            (line 1028)
+* deffnx <3>:                            chapter.            (line 1033)
+* deffnx <4>:                            chapter.            (line 1859)
+* deffnx <5>:                            chapter.            (line 1865)
+* f---aa:                                chapter.            (line 2281)
+* f---bb, f---cc:                        chapter.            (line 2281)
+* f---ddd, f---eee, ffff:                chapter.            (line 2281)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2281)
 * followed:                              chapter.            (line  328)
-* followed <1>:                          chapter.            (line  667)
-* followed <2>:                          chapter.            (line 1024)
-* followed <3>:                          chapter.            (line 1363)
-* followed <4>:                          chapter.            (line 1854)
-* followed <5>:                          chapter.            (line 2228)
+* followed <1>:                          chapter.            (line  668)
+* followed <2>:                          chapter.            (line 1025)
+* followed <3>:                          chapter.            (line 1365)
+* followed <4>:                          chapter.            (line 1856)
+* followed <5>:                          chapter.            (line 2231)
 * I:                                     chapter.            (line  316)
 * I <1>:                                 chapter.            (line  338)
-* I <2>:                                 chapter.            (line 1012)
-* I <3>:                                 chapter.            (line 1034)
-* I <4>:                                 chapter.            (line 1842)
-* I <5>:                                 chapter.            (line 1865)
+* I <2>:                                 chapter.            (line 1013)
+* I <3>:                                 chapter.            (line 1035)
+* I <4>:                                 chapter.            (line 1844)
+* I <5>:                                 chapter.            (line 1867)
 * id i ule:                              chapter.            (line  322)
-* id i ule <1>:                          chapter.            (line 1018)
-* id i ule <2>:                          chapter.            (line 1848)
+* id i ule <1>:                          chapter.            (line 1019)
+* id i ule <2>:                          chapter.            (line 1850)
 * id ule:                                chapter.            (line  321)
-* id ule <1>:                            chapter.            (line 1017)
-* id ule <2>:                            chapter.            (line 1847)
-* INVALID:                               chapter.            (line  671)
-* INVALID <1>:                           chapter.            (line 1367)
-* INVALID <2>:                           chapter.            (line 2232)
+* id ule <1>:                            chapter.            (line 1018)
+* id ule <2>:                            chapter.            (line 1849)
+* INVALID:                               chapter.            (line  672)
+* INVALID <1>:                           chapter.            (line 1369)
+* INVALID <2>:                           chapter.            (line 2235)
 * log trap:                              chapter.            (line  318)
-* log trap <1>:                          chapter.            (line 1014)
-* log trap <2>:                          chapter.            (line 1844)
+* log trap <1>:                          chapter.            (line 1015)
+* log trap <2>:                          chapter.            (line 1846)
 * log trap1:                             chapter.            (line  319)
-* log trap1 <1>:                         chapter.            (line 1015)
-* log trap1 <2>:                         chapter.            (line 1845)
+* log trap1 <1>:                         chapter.            (line 1016)
+* log trap1 <2>:                         chapter.            (line 1847)
 * log trap2:                             chapter.            (line  320)
-* log trap2 <1>:                         chapter.            (line 1016)
-* log trap2 <2>:                         chapter.            (line 1846)
+* log trap2 <1>:                         chapter.            (line 1017)
+* log trap2 <2>:                         chapter.            (line 1848)
 * machin:                                chapter.            (line  324)
 * machin <1>:                            chapter.            (line  326)
-* machin <2>:                            chapter.            (line  663)
-* machin <3>:                            chapter.            (line  664)
-* machin <4>:                            chapter.            (line  665)
-* machin <5>:                            chapter.            (line  666)
-* machin <6>:                            chapter.            (line 1020)
-* machin <7>:                            chapter.            (line 1022)
-* machin <8>:                            chapter.            (line 1359)
-* machin <9>:                            chapter.            (line 1360)
-* machin <10>:                           chapter.            (line 1361)
-* machin <11>:                           chapter.            (line 1362)
-* machin <12>:                           chapter.            (line 1850)
-* machin <13>:                           chapter.            (line 1852)
-* machin <14>:                           chapter.            (line 2224)
-* machin <15>:                           chapter.            (line 2225)
-* machin <16>:                           chapter.            (line 2226)
-* machin <17>:                           chapter.            (line 2227)
+* machin <2>:                            chapter.            (line  664)
+* machin <3>:                            chapter.            (line  665)
+* machin <4>:                            chapter.            (line  666)
+* machin <5>:                            chapter.            (line  667)
+* machin <6>:                            chapter.            (line 1021)
+* machin <7>:                            chapter.            (line 1023)
+* machin <8>:                            chapter.            (line 1361)
+* machin <9>:                            chapter.            (line 1362)
+* machin <10>:                           chapter.            (line 1363)
+* machin <11>:                           chapter.            (line 1364)
+* machin <12>:                           chapter.            (line 1852)
+* machin <13>:                           chapter.            (line 1854)
+* machin <14>:                           chapter.            (line 2227)
+* machin <15>:                           chapter.            (line 2228)
+* machin <16>:                           chapter.            (line 2229)
+* machin <17>:                           chapter.            (line 2230)
 * n--ame:                                chapter.            (line  345)
 * n--ame <1>:                            chapter.            (line  348)
-* n--ame <2>:                            chapter.            (line 1041)
-* n--ame <3>:                            chapter.            (line 1044)
-* n--ame <4>:                            chapter.            (line 1873)
-* n--ame <5>:                            chapter.            (line 1876)
+* n--ame <2>:                            chapter.            (line 1042)
+* n--ame <3>:                            chapter.            (line 1045)
+* n--ame <4>:                            chapter.            (line 1875)
+* n--ame <5>:                            chapter.            (line 1878)
 * name2:                                 chapter.            (line  423)
-* name2 <1>:                             chapter.            (line 1119)
-* name2 <2>:                             chapter.            (line 1952)
-* t--ruc:                                chapter.            (line 2278)
-* T--ruc:                                chapter.            (line 2278)
+* name2 <1>:                             chapter.            (line 1120)
+* name2 <2>:                             chapter.            (line 1954)
+* t--ruc:                                chapter.            (line 2281)
+* T--ruc:                                chapter.            (line 2281)
 * truc:                                  chapter.            (line  317)
 * truc <1>:                              chapter.            (line  339)
-* truc <2>:                              chapter.            (line 1013)
-* truc <3>:                              chapter.            (line 1035)
-* truc <4>:                              chapter.            (line 1843)
-* truc <5>:                              chapter.            (line 1866)
-* xxx, zzz:                              chapter.            (line 2278)
+* truc <2>:                              chapter.            (line 1014)
+* truc <3>:                              chapter.            (line 1036)
+* truc <4>:                              chapter.            (line 1845)
+* truc <5>:                              chapter.            (line 1868)
+* xxx, zzz:                              chapter.            (line 2281)
 
 
 Tag Table:
-Node: Top20115
-Node: chapter20300
-Ref: chapter-Footnote-1102510
-Ref: chapter-Footnote-2102530
-Ref: chapter-Footnote-3102551
-Ref: chapter-Footnote-4102571
-Ref: chapter-Footnote-5102592
-Ref: chapter-Footnote-6102612
-Ref: chapter-Footnote-7102633
-Ref: chapter-Footnote-8102671
-Node: s--ect,ion102691
-Node: subsection102894
-Ref: anchor103075
-Node: subsubsection ``simple-double--103075
-Node: subsubsection three---four----''103275
-Node: chapter2103447
+Node: Top20116
+Node: chapter20301
+Ref: chapter-Footnote-1102514
+Ref: chapter-Footnote-2102534
+Ref: chapter-Footnote-3102555
+Ref: chapter-Footnote-4102575
+Ref: chapter-Footnote-5102596
+Ref: chapter-Footnote-6102616
+Ref: chapter-Footnote-7102637
+Ref: chapter-Footnote-8102675
+Node: s--ect,ion102695
+Node: subsection102898
+Ref: anchor103079
+Node: subsubsection ``simple-double--103079
+Node: subsubsection three---four----''103279
+Node: chapter2103451
 
 End Tag Table
 
diff --git a/tp/tests/coverage/res_parser/formatting_latex/formatting.tex 
b/tp/tests/coverage/res_parser/formatting_latex/formatting.tex
index 975453135b..04d38b3c53 100644
--- a/tp/tests/coverage/res_parser/formatting_latex/formatting.tex
+++ b/tp/tests/coverage/res_parser/formatting_latex/formatting.tex
@@ -1622,7 +1622,7 @@ Invalid use of @':\leavevmode{}\\
 \texttt{@image\{f{-}{-}ile,aze,az,@verb\{:jk \_" \%@:\}\ @b\{in b 
"\},e{-}{-}xt\}} \includegraphics[width=aze,height=az]{f--ile}
 \texttt{@image\{file@verb\{:jk \_" \%@:\}{,}{,},alt@verb\{:jk \_" \%@:\}\}} 
\includegraphics{filejk _" \%@}
 
-\vskip 1\baselineskip %
+\vskip \baselineskip %
 
 {\bfseries author}%
 
@@ -3300,7 +3300,7 @@ Invalid use of @':\leavevmode{}\\
 \texttt{@image\{f{-}{-}ile,aze,az,@verb\{:jk \_" \%@:\}\ @b\{in b 
"\},e{-}{-}xt\}} \includegraphics[width=aze,height=az]{f--ile}
 \texttt{@image\{file@verb\{:jk \_" \%@:\}{,}{,},alt@verb\{:jk \_" \%@:\}\}} 
\includegraphics{filejk _" \%@}
 
-\vskip 1\baselineskip %
+\vskip \baselineskip %
 
 {\bfseries author}%
 
@@ -4995,7 +4995,7 @@ Invalid use of @':\leavevmode{}\\
 \texttt{@image\{f{-}{-}ile,aze,az,@verb\{:jk \_" \%@:\}\ @b\{in b 
"\},e{-}{-}xt\}} \includegraphics[width=aze,height=az]{f--ile}
 \texttt{@image\{file@verb\{:jk \_" \%@:\}{,}{,},alt@verb\{:jk \_" \%@:\}\}} 
\includegraphics{filejk _" \%@}
 
-\vskip 1\baselineskip %
+\vskip \baselineskip %
 
 {\bfseries author}%
 
@@ -6672,7 +6672,7 @@ Invalid use of @':\leavevmode{}\\
 \texttt{@image\{f{-}{-}ile,aze,az,@verb\{:jk \_" \%@:\}\ @b\{in b 
"\},e{-}{-}xt\}} \includegraphics[width=aze,height=az]{f--ile}
 \texttt{@image\{file@verb\{:jk \_" \%@:\}{,}{,},alt@verb\{:jk \_" \%@:\}\}} 
\includegraphics{filejk _" \%@}
 
-\vskip 1\baselineskip %
+\vskip \baselineskip %
 
 {\bfseries author}%
 
@@ -8812,7 +8812,7 @@ Invalid use of @':\leavevmode{}\\
 \texttt{@image\{f{-}{-}ile,aze,az,@verb\{:jk \_" \%@:\}\ @b\{in b 
"\},e{-}{-}xt\}}\ \includegraphics[width=aze,height=az]{f--ile}
 \texttt{@image\{file@verb\{:jk \_" \%@:\}{,}{,},alt@verb\{:jk \_" \%@:\}\}}\ 
\includegraphics{filejk _" \%@}
 
-\vskip 1\baselineskip %
+\vskip \baselineskip %
 
 {\bfseries author}%
 
diff --git a/tp/tests/coverage/res_parser/formatting_plaintext/formatting.txt 
b/tp/tests/coverage/res_parser/formatting_plaintext/formatting.txt
index f5aba1d33c..c20cf153b3 100644
--- a/tp/tests/coverage/res_parser/formatting_plaintext/formatting.txt
+++ b/tp/tests/coverage/res_parser/formatting_plaintext/formatting.txt
@@ -631,6 +631,7 @@ aaa
 aaa
 ‘@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}’ [altjk _" %@]
 
+
 ü Ü ñ â é ō ì é Ḕ
 Ḉ Ḉ a̋ ȧ å a͡
 ă ǎ
@@ -1327,6 +1328,7 @@ aaa
 aaa
 ‘@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}’ [altjk _" %@]
 
+
 ü Ü ñ â é ō ì é Ḕ
 Ḉ Ḉ a̋ ȧ å a͡
 ă ǎ
@@ -2192,6 +2194,7 @@ aaa
 
 
 
+
      ü Ü ñ â é ō ì é Ḕ
      Ḉ Ḉ a̋ ȧ å a͡
      ă ǎ
@@ -2282,300 +2285,300 @@ aaa
 
 * Menu:
 
-* truc:                                  chapter.            (line 2278)
+* truc:                                  chapter.            (line 2281)
 
    codeidx
 
 * Menu:
 
-* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2278)
+* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2281)
 
    cp
 
 * Menu:
 
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  724)
-* -option <2>:                           chapter.            (line 1431)
-* ?:                                     chapter.            (line 2278)
-* .:                                     chapter.            (line 2278)
+* -option <1>:                           chapter.            (line  725)
+* -option <2>:                           chapter.            (line 1433)
+* ?:                                     chapter.            (line 2281)
+* .:                                     chapter.            (line 2281)
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  724)
-* " <2>:                                 chapter.            (line 1431)
-* a:                                     chapter.            (line 2278)
-* aaa, bbb:                              chapter.            (line 2278)
-* a--a:                                  chapter.            (line 2278)
+* " <1>:                                 chapter.            (line  725)
+* " <2>:                                 chapter.            (line 1433)
+* a:                                     chapter.            (line 2281)
+* aaa, bbb:                              chapter.            (line 2281)
+* a--a:                                  chapter.            (line 2281)
 * a--asis:                               chapter.            (line  525)
-* a--asis <1>:                           chapter.            (line 1221)
-* a--asis <2>:                           chapter.            (line 2053)
+* a--asis <1>:                           chapter.            (line 1222)
+* a--asis <2>:                           chapter.            (line 2055)
 * b:                                     chapter.            (line  526)
-* b <1>:                                 chapter.            (line 1222)
-* b <2>:                                 chapter.            (line 2054)
-* b--b, c--c:                            chapter.            (line 2278)
+* b <1>:                                 chapter.            (line 1223)
+* b <2>:                                 chapter.            (line 2056)
+* b--b, c--c:                            chapter.            (line 2281)
 * counting entry:                        chapter.            (line    0)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2278)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2281)
 * d--efcv_name:                          chapter.            (line  366)
 * d--efcv_name <1>:                      chapter.            (line  369)
-* d--efcv_name <2>:                      chapter.            (line 1062)
-* d--efcv_name <3>:                      chapter.            (line 1065)
-* d--efcv_name <4>:                      chapter.            (line 1894)
-* d--efcv_name <5>:                      chapter.            (line 1897)
+* d--efcv_name <2>:                      chapter.            (line 1063)
+* d--efcv_name <3>:                      chapter.            (line 1066)
+* d--efcv_name <4>:                      chapter.            (line 1896)
+* d--efcv_name <5>:                      chapter.            (line 1899)
 * d--efivar_name of c--lass:             chapter.            (line  411)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1107)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1939)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1108)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1941)
 * d--efopt_name:                         chapter.            (line  402)
-* d--efopt_name <1>:                     chapter.            (line 1098)
-* d--efopt_name <2>:                     chapter.            (line 1930)
+* d--efopt_name <1>:                     chapter.            (line 1099)
+* d--efopt_name <2>:                     chapter.            (line 1932)
 * d--eftypecv_name of c--lass:           chapter.            (line  372)
 * d--eftypecv_name of c--lass <1>:       chapter.            (line  375)
-* d--eftypecv_name of c--lass <2>:       chapter.            (line 1068)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1071)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1900)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1903)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1069)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1072)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1902)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1905)
 * d--eftypecv_name2 of c--lass2:         chapter.            (line  443)
 * d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  446)
-* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1139)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1142)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1972)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1975)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1140)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1143)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1974)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1977)
 * d--eftypeivar_name of c--lass:         chapter.            (line  414)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1110)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1942)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1111)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1944)
 * d--eftypevar_name:                     chapter.            (line  408)
-* d--eftypevar_name <1>:                 chapter.            (line 1104)
-* d--eftypevar_name <2>:                 chapter.            (line 1936)
+* d--eftypevar_name <1>:                 chapter.            (line 1105)
+* d--eftypevar_name <2>:                 chapter.            (line 1938)
 * d--eftypevr_name:                      chapter.            (line  363)
-* d--eftypevr_name <1>:                  chapter.            (line 1059)
-* d--eftypevr_name <2>:                  chapter.            (line 1891)
+* d--eftypevr_name <1>:                  chapter.            (line 1060)
+* d--eftypevr_name <2>:                  chapter.            (line 1893)
 * d--efvar_name:                         chapter.            (line  396)
 * d--efvar_name <1>:                     chapter.            (line  399)
-* d--efvar_name <2>:                     chapter.            (line 1092)
-* d--efvar_name <3>:                     chapter.            (line 1095)
-* d--efvar_name <4>:                     chapter.            (line 1924)
-* d--efvar_name <5>:                     chapter.            (line 1927)
+* d--efvar_name <2>:                     chapter.            (line 1093)
+* d--efvar_name <3>:                     chapter.            (line 1096)
+* d--efvar_name <4>:                     chapter.            (line 1926)
+* d--efvar_name <5>:                     chapter.            (line 1929)
 * d--efvr_name:                          chapter.            (line  342)
-* d--efvr_name <1>:                      chapter.            (line 1038)
-* d--efvr_name <2>:                      chapter.            (line 1870)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2278)
+* d--efvr_name <1>:                      chapter.            (line 1039)
+* d--efvr_name <2>:                      chapter.            (line 1872)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2281)
 * index entry between item and itemx:    chapter.            (line  530)
-* index entry between item and itemx <1>: chapter.           (line  659)
-* index entry between item and itemx <2>: chapter.           (line 1226)
-* index entry between item and itemx <3>: chapter.           (line 1355)
-* index entry between item and itemx <4>: chapter.           (line 2058)
-* index entry between item and itemx <5>: chapter.           (line 2220)
+* index entry between item and itemx <1>: chapter.           (line  660)
+* index entry between item and itemx <2>: chapter.           (line 1227)
+* index entry between item and itemx <3>: chapter.           (line 1357)
+* index entry between item and itemx <4>: chapter.           (line 2060)
+* index entry between item and itemx <5>: chapter.           (line 2223)
 * index entry in footnote:               chapter.            (line    0)
 * index entry within deffn:              chapter.            (line  317)
-* index entry within deffn <1>:          chapter.            (line 1013)
-* index entry within deffn <2>:          chapter.            (line 1843)
+* index entry within deffn <1>:          chapter.            (line 1014)
+* index entry within deffn <2>:          chapter.            (line 1845)
 * index entry within itemize:            chapter.            (line  228)
-* index entry within itemize <1>:        chapter.            (line  924)
-* index entry within itemize <2>:        chapter.            (line 1754)
+* index entry within itemize <1>:        chapter.            (line  925)
+* index entry within itemize <2>:        chapter.            (line 1756)
 * index entry within multitable:         chapter.            (line  250)
-* index entry within multitable <1>:     chapter.            (line  946)
-* index entry within multitable <2>:     chapter.            (line 1777)
-* t-ruc:                                 chapter.            (line 2278)
-* T-ruc:                                 chapter.            (line 2278)
+* index entry within multitable <1>:     chapter.            (line  947)
+* index entry within multitable <2>:     chapter.            (line 1779)
+* t-ruc:                                 chapter.            (line 2281)
+* T-ruc:                                 chapter.            (line 2281)
 * vtable i--tem code kbdinputstyle:      chapter.            (line  152)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  848)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1677)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  849)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1679)
 * vtable i--tem default kbdinputstyle:   chapter.            (line  147)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  843)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1672)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  844)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1674)
 * vtable i--tem distinct kbdinputstyle:  chapter.            (line  162)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  858)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1687)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  859)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1689)
 * vtable i--tem example kbdinputstyle:   chapter.            (line  157)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  853)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1682)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  854)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1684)
 * vtable i--tem in example code kbdinputstyle: chapter.      (line  154)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  850)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1679)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  851)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1681)
 * vtable i--tem in example default kbdinputstyle: chapter.   (line  149)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  845)
+                                                             (line  846)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1674)
+                                                             (line 1676)
 * vtable i--tem in example distinct kbdinputstyle: chapter.  (line  164)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  860)
+                                                             (line  861)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1689)
+                                                             (line 1691)
 * vtable i--tem in example example kbdinputstyle: chapter.   (line  159)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  855)
+                                                             (line  856)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1684)
+                                                             (line 1686)
 
    fn
 
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  724)
-* --foption <2>:                         chapter.            (line 1431)
-* ?:                                     chapter.            (line 2278)
-* .:                                     chapter.            (line 2278)
+* --foption <1>:                         chapter.            (line  725)
+* --foption <2>:                         chapter.            (line 1433)
+* ?:                                     chapter.            (line 2281)
+* .:                                     chapter.            (line 2281)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  724)
-* `` <2>:                                chapter.            (line 1431)
+* `` <1>:                                chapter.            (line  725)
+* `` <2>:                                chapter.            (line 1433)
 * a:                                     chapter.            (line  330)
 * a <1>:                                 chapter.            (line  529)
-* a <2>:                                 chapter.            (line  658)
-* a <3>:                                 chapter.            (line 1026)
-* a <4>:                                 chapter.            (line 1225)
-* a <5>:                                 chapter.            (line 1354)
-* a <6>:                                 chapter.            (line 1856)
-* a <7>:                                 chapter.            (line 2057)
-* a <8>:                                 chapter.            (line 2219)
-* a <9>:                                 chapter.            (line 2278)
-* after:                                 chapter.            (line  669)
-* after <1>:                             chapter.            (line 1365)
-* after <2>:                             chapter.            (line 2230)
+* a <2>:                                 chapter.            (line  659)
+* a <3>:                                 chapter.            (line 1027)
+* a <4>:                                 chapter.            (line 1226)
+* a <5>:                                 chapter.            (line 1356)
+* a <6>:                                 chapter.            (line 1858)
+* a <7>:                                 chapter.            (line 2059)
+* a <8>:                                 chapter.            (line 2222)
+* a <9>:                                 chapter.            (line 2281)
+* after:                                 chapter.            (line  670)
+* after <1>:                             chapter.            (line 1367)
+* after <2>:                             chapter.            (line 2233)
 * arg2:                                  chapter.            (line  449)
-* arg2 <1>:                              chapter.            (line 1145)
-* arg2 <2>:                              chapter.            (line 1979)
+* arg2 <1>:                              chapter.            (line 1146)
+* arg2 <2>:                              chapter.            (line 1981)
 * b:                                     chapter.            (line  530)
-* b <1>:                                 chapter.            (line  659)
-* b <2>:                                 chapter.            (line 1226)
-* b <3>:                                 chapter.            (line 1355)
-* b <4>:                                 chapter.            (line 2058)
-* b <5>:                                 chapter.            (line 2220)
+* b <1>:                                 chapter.            (line  660)
+* b <2>:                                 chapter.            (line 1227)
+* b <3>:                                 chapter.            (line 1357)
+* b <4>:                                 chapter.            (line 2060)
+* b <5>:                                 chapter.            (line 2223)
 * bidule machin:                         chapter.            (line  325)
-* bidule machin <1>:                     chapter.            (line 1021)
-* bidule machin <2>:                     chapter.            (line 1851)
+* bidule machin <1>:                     chapter.            (line 1022)
+* bidule machin <2>:                     chapter.            (line 1853)
 * d--effn_name:                          chapter.            (line  309)
-* d--effn_name <1>:                      chapter.            (line 1005)
-* d--effn_name <2>:                      chapter.            (line 1835)
+* d--effn_name <1>:                      chapter.            (line 1006)
+* d--effn_name <2>:                      chapter.            (line 1837)
 * d--efmac_name:                         chapter.            (line  390)
-* d--efmac_name <1>:                     chapter.            (line 1086)
-* d--efmac_name <2>:                     chapter.            (line 1918)
+* d--efmac_name <1>:                     chapter.            (line 1087)
+* d--efmac_name <2>:                     chapter.            (line 1920)
 * d--efmethod_name on c--lass:           chapter.            (line  417)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1113)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1945)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1114)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1947)
 * d--efop_name on c--lass:               chapter.            (line  378)
 * d--efop_name on c--lass <1>:           chapter.            (line  381)
-* d--efop_name on c--lass <2>:           chapter.            (line 1074)
-* d--efop_name on c--lass <3>:           chapter.            (line 1077)
-* d--efop_name on c--lass <4>:           chapter.            (line 1906)
-* d--efop_name on c--lass <5>:           chapter.            (line 1909)
+* d--efop_name on c--lass <2>:           chapter.            (line 1075)
+* d--efop_name on c--lass <3>:           chapter.            (line 1078)
+* d--efop_name on c--lass <4>:           chapter.            (line 1908)
+* d--efop_name on c--lass <5>:           chapter.            (line 1911)
 * d--efspec_name:                        chapter.            (line  393)
-* d--efspec_name <1>:                    chapter.            (line 1089)
-* d--efspec_name <2>:                    chapter.            (line 1921)
+* d--efspec_name <1>:                    chapter.            (line 1090)
+* d--efspec_name <2>:                    chapter.            (line 1923)
 * d--eftypefn_name:                      chapter.            (line  351)
 * d--eftypefn_name <1>:                  chapter.            (line  354)
-* d--eftypefn_name <2>:                  chapter.            (line 1047)
-* d--eftypefn_name <3>:                  chapter.            (line 1050)
-* d--eftypefn_name <4>:                  chapter.            (line 1879)
-* d--eftypefn_name <5>:                  chapter.            (line 1882)
+* d--eftypefn_name <2>:                  chapter.            (line 1048)
+* d--eftypefn_name <3>:                  chapter.            (line 1051)
+* d--eftypefn_name <4>:                  chapter.            (line 1881)
+* d--eftypefn_name <5>:                  chapter.            (line 1884)
 * d--eftypefn_name2:                     chapter.            (line  428)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1124)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1957)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1125)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1959)
 * d--eftypefun_name:                     chapter.            (line  405)
-* d--eftypefun_name <1>:                 chapter.            (line 1101)
-* d--eftypefun_name <2>:                 chapter.            (line 1933)
+* d--eftypefun_name <1>:                 chapter.            (line 1102)
+* d--eftypefun_name <2>:                 chapter.            (line 1935)
 * d--eftypemethod_name on c--lass:       chapter.            (line  420)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1116)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1948)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1117)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1950)
 * d--eftypeop_name on c--lass:           chapter.            (line  357)
 * d--eftypeop_name on c--lass <1>:       chapter.            (line  360)
-* d--eftypeop_name on c--lass <2>:       chapter.            (line 1053)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1056)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1885)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1888)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1054)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1057)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1887)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1890)
 * d--eftypeop_name2 on c--lass2:         chapter.            (line  433)
 * d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  438)
-* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1129)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1134)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1962)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1967)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1130)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1135)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1964)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1969)
 * d--efun_name:                          chapter.            (line  387)
-* d--efun_name <1>:                      chapter.            (line 1083)
-* d--efun_name <2>:                      chapter.            (line 1915)
+* d--efun_name <1>:                      chapter.            (line 1084)
+* d--efun_name <2>:                      chapter.            (line 1917)
 * de--ffn_name:                          chapter.            (line  312)
-* de--ffn_name <1>:                      chapter.            (line 1008)
-* de--ffn_name <2>:                      chapter.            (line 1838)
+* de--ffn_name <1>:                      chapter.            (line 1009)
+* de--ffn_name <2>:                      chapter.            (line 1840)
 * deffn:                                 chapter.            (line  333)
 * deffn <1>:                             chapter.            (line  335)
-* deffn <2>:                             chapter.            (line 1029)
-* deffn <3>:                             chapter.            (line 1031)
-* deffn <4>:                             chapter.            (line 1860)
-* deffn <5>:                             chapter.            (line 1862)
+* deffn <2>:                             chapter.            (line 1030)
+* deffn <3>:                             chapter.            (line 1032)
+* deffn <4>:                             chapter.            (line 1862)
+* deffn <5>:                             chapter.            (line 1864)
 * deffnx:                                chapter.            (line  331)
 * deffnx <1>:                            chapter.            (line  336)
-* deffnx <2>:                            chapter.            (line 1027)
-* deffnx <3>:                            chapter.            (line 1032)
-* deffnx <4>:                            chapter.            (line 1857)
-* deffnx <5>:                            chapter.            (line 1863)
-* f---aa:                                chapter.            (line 2278)
-* f---bb, f---cc:                        chapter.            (line 2278)
-* f---ddd, f---eee, ffff:                chapter.            (line 2278)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2278)
+* deffnx <2>:                            chapter.            (line 1028)
+* deffnx <3>:                            chapter.            (line 1033)
+* deffnx <4>:                            chapter.            (line 1859)
+* deffnx <5>:                            chapter.            (line 1865)
+* f---aa:                                chapter.            (line 2281)
+* f---bb, f---cc:                        chapter.            (line 2281)
+* f---ddd, f---eee, ffff:                chapter.            (line 2281)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2281)
 * followed:                              chapter.            (line  328)
-* followed <1>:                          chapter.            (line  667)
-* followed <2>:                          chapter.            (line 1024)
-* followed <3>:                          chapter.            (line 1363)
-* followed <4>:                          chapter.            (line 1854)
-* followed <5>:                          chapter.            (line 2228)
+* followed <1>:                          chapter.            (line  668)
+* followed <2>:                          chapter.            (line 1025)
+* followed <3>:                          chapter.            (line 1365)
+* followed <4>:                          chapter.            (line 1856)
+* followed <5>:                          chapter.            (line 2231)
 * I:                                     chapter.            (line  316)
 * I <1>:                                 chapter.            (line  338)
-* I <2>:                                 chapter.            (line 1012)
-* I <3>:                                 chapter.            (line 1034)
-* I <4>:                                 chapter.            (line 1842)
-* I <5>:                                 chapter.            (line 1865)
+* I <2>:                                 chapter.            (line 1013)
+* I <3>:                                 chapter.            (line 1035)
+* I <4>:                                 chapter.            (line 1844)
+* I <5>:                                 chapter.            (line 1867)
 * id i ule:                              chapter.            (line  322)
-* id i ule <1>:                          chapter.            (line 1018)
-* id i ule <2>:                          chapter.            (line 1848)
+* id i ule <1>:                          chapter.            (line 1019)
+* id i ule <2>:                          chapter.            (line 1850)
 * id ule:                                chapter.            (line  321)
-* id ule <1>:                            chapter.            (line 1017)
-* id ule <2>:                            chapter.            (line 1847)
-* INVALID:                               chapter.            (line  671)
-* INVALID <1>:                           chapter.            (line 1367)
-* INVALID <2>:                           chapter.            (line 2232)
+* id ule <1>:                            chapter.            (line 1018)
+* id ule <2>:                            chapter.            (line 1849)
+* INVALID:                               chapter.            (line  672)
+* INVALID <1>:                           chapter.            (line 1369)
+* INVALID <2>:                           chapter.            (line 2235)
 * log trap:                              chapter.            (line  318)
-* log trap <1>:                          chapter.            (line 1014)
-* log trap <2>:                          chapter.            (line 1844)
+* log trap <1>:                          chapter.            (line 1015)
+* log trap <2>:                          chapter.            (line 1846)
 * log trap1:                             chapter.            (line  319)
-* log trap1 <1>:                         chapter.            (line 1015)
-* log trap1 <2>:                         chapter.            (line 1845)
+* log trap1 <1>:                         chapter.            (line 1016)
+* log trap1 <2>:                         chapter.            (line 1847)
 * log trap2:                             chapter.            (line  320)
-* log trap2 <1>:                         chapter.            (line 1016)
-* log trap2 <2>:                         chapter.            (line 1846)
+* log trap2 <1>:                         chapter.            (line 1017)
+* log trap2 <2>:                         chapter.            (line 1848)
 * machin:                                chapter.            (line  324)
 * machin <1>:                            chapter.            (line  326)
-* machin <2>:                            chapter.            (line  663)
-* machin <3>:                            chapter.            (line  664)
-* machin <4>:                            chapter.            (line  665)
-* machin <5>:                            chapter.            (line  666)
-* machin <6>:                            chapter.            (line 1020)
-* machin <7>:                            chapter.            (line 1022)
-* machin <8>:                            chapter.            (line 1359)
-* machin <9>:                            chapter.            (line 1360)
-* machin <10>:                           chapter.            (line 1361)
-* machin <11>:                           chapter.            (line 1362)
-* machin <12>:                           chapter.            (line 1850)
-* machin <13>:                           chapter.            (line 1852)
-* machin <14>:                           chapter.            (line 2224)
-* machin <15>:                           chapter.            (line 2225)
-* machin <16>:                           chapter.            (line 2226)
-* machin <17>:                           chapter.            (line 2227)
+* machin <2>:                            chapter.            (line  664)
+* machin <3>:                            chapter.            (line  665)
+* machin <4>:                            chapter.            (line  666)
+* machin <5>:                            chapter.            (line  667)
+* machin <6>:                            chapter.            (line 1021)
+* machin <7>:                            chapter.            (line 1023)
+* machin <8>:                            chapter.            (line 1361)
+* machin <9>:                            chapter.            (line 1362)
+* machin <10>:                           chapter.            (line 1363)
+* machin <11>:                           chapter.            (line 1364)
+* machin <12>:                           chapter.            (line 1852)
+* machin <13>:                           chapter.            (line 1854)
+* machin <14>:                           chapter.            (line 2227)
+* machin <15>:                           chapter.            (line 2228)
+* machin <16>:                           chapter.            (line 2229)
+* machin <17>:                           chapter.            (line 2230)
 * n--ame:                                chapter.            (line  345)
 * n--ame <1>:                            chapter.            (line  348)
-* n--ame <2>:                            chapter.            (line 1041)
-* n--ame <3>:                            chapter.            (line 1044)
-* n--ame <4>:                            chapter.            (line 1873)
-* n--ame <5>:                            chapter.            (line 1876)
+* n--ame <2>:                            chapter.            (line 1042)
+* n--ame <3>:                            chapter.            (line 1045)
+* n--ame <4>:                            chapter.            (line 1875)
+* n--ame <5>:                            chapter.            (line 1878)
 * name2:                                 chapter.            (line  423)
-* name2 <1>:                             chapter.            (line 1119)
-* name2 <2>:                             chapter.            (line 1952)
-* t--ruc:                                chapter.            (line 2278)
-* T--ruc:                                chapter.            (line 2278)
+* name2 <1>:                             chapter.            (line 1120)
+* name2 <2>:                             chapter.            (line 1954)
+* t--ruc:                                chapter.            (line 2281)
+* T--ruc:                                chapter.            (line 2281)
 * truc:                                  chapter.            (line  317)
 * truc <1>:                              chapter.            (line  339)
-* truc <2>:                              chapter.            (line 1013)
-* truc <3>:                              chapter.            (line 1035)
-* truc <4>:                              chapter.            (line 1843)
-* truc <5>:                              chapter.            (line 1866)
-* xxx, zzz:                              chapter.            (line 2278)
+* truc <2>:                              chapter.            (line 1014)
+* truc <3>:                              chapter.            (line 1036)
+* truc <4>:                              chapter.            (line 1845)
+* truc <5>:                              chapter.            (line 1868)
+* xxx, zzz:                              chapter.            (line 2281)
 
    vr
 
@@ -2588,8 +2591,8 @@ aaa
 * Menu:
 
 * d--eftp_name:                          chapter.            (line  384)
-* d--eftp_name <1>:                      chapter.            (line 1080)
-* d--eftp_name <2>:                      chapter.            (line 1912)
+* d--eftp_name <1>:                      chapter.            (line 1081)
+* d--eftp_name <2>:                      chapter.            (line 1914)
 
    (8)
 
@@ -2633,285 +2636,285 @@ chapter 2
 * Menu:
 
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  724)
-* -option <2>:                           chapter.            (line 1431)
-* ?:                                     chapter.            (line 2278)
-* .:                                     chapter.            (line 2278)
+* -option <1>:                           chapter.            (line  725)
+* -option <2>:                           chapter.            (line 1433)
+* ?:                                     chapter.            (line 2281)
+* .:                                     chapter.            (line 2281)
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  724)
-* " <2>:                                 chapter.            (line 1431)
-* a:                                     chapter.            (line 2278)
-* aaa, bbb:                              chapter.            (line 2278)
-* a--a:                                  chapter.            (line 2278)
+* " <1>:                                 chapter.            (line  725)
+* " <2>:                                 chapter.            (line 1433)
+* a:                                     chapter.            (line 2281)
+* aaa, bbb:                              chapter.            (line 2281)
+* a--a:                                  chapter.            (line 2281)
 * a--asis:                               chapter.            (line  525)
-* a--asis <1>:                           chapter.            (line 1221)
-* a--asis <2>:                           chapter.            (line 2053)
+* a--asis <1>:                           chapter.            (line 1222)
+* a--asis <2>:                           chapter.            (line 2055)
 * b:                                     chapter.            (line  526)
-* b <1>:                                 chapter.            (line 1222)
-* b <2>:                                 chapter.            (line 2054)
-* b--b, c--c:                            chapter.            (line 2278)
-* counting entry:                        chapter.            (line 2614)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2278)
+* b <1>:                                 chapter.            (line 1223)
+* b <2>:                                 chapter.            (line 2056)
+* b--b, c--c:                            chapter.            (line 2281)
+* counting entry:                        chapter.            (line 2617)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2281)
 * d--efcv_name:                          chapter.            (line  366)
 * d--efcv_name <1>:                      chapter.            (line  369)
-* d--efcv_name <2>:                      chapter.            (line 1062)
-* d--efcv_name <3>:                      chapter.            (line 1065)
-* d--efcv_name <4>:                      chapter.            (line 1894)
-* d--efcv_name <5>:                      chapter.            (line 1897)
+* d--efcv_name <2>:                      chapter.            (line 1063)
+* d--efcv_name <3>:                      chapter.            (line 1066)
+* d--efcv_name <4>:                      chapter.            (line 1896)
+* d--efcv_name <5>:                      chapter.            (line 1899)
 * d--efivar_name of c--lass:             chapter.            (line  411)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1107)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1939)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1108)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1941)
 * d--efopt_name:                         chapter.            (line  402)
-* d--efopt_name <1>:                     chapter.            (line 1098)
-* d--efopt_name <2>:                     chapter.            (line 1930)
+* d--efopt_name <1>:                     chapter.            (line 1099)
+* d--efopt_name <2>:                     chapter.            (line 1932)
 * d--eftypecv_name of c--lass:           chapter.            (line  372)
 * d--eftypecv_name of c--lass <1>:       chapter.            (line  375)
-* d--eftypecv_name of c--lass <2>:       chapter.            (line 1068)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1071)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1900)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1903)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1069)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1072)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1902)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1905)
 * d--eftypecv_name2 of c--lass2:         chapter.            (line  443)
 * d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  446)
-* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1139)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1142)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1972)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1975)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1140)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1143)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1974)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1977)
 * d--eftypeivar_name of c--lass:         chapter.            (line  414)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1110)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1942)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1111)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1944)
 * d--eftypevar_name:                     chapter.            (line  408)
-* d--eftypevar_name <1>:                 chapter.            (line 1104)
-* d--eftypevar_name <2>:                 chapter.            (line 1936)
+* d--eftypevar_name <1>:                 chapter.            (line 1105)
+* d--eftypevar_name <2>:                 chapter.            (line 1938)
 * d--eftypevr_name:                      chapter.            (line  363)
-* d--eftypevr_name <1>:                  chapter.            (line 1059)
-* d--eftypevr_name <2>:                  chapter.            (line 1891)
+* d--eftypevr_name <1>:                  chapter.            (line 1060)
+* d--eftypevr_name <2>:                  chapter.            (line 1893)
 * d--efvar_name:                         chapter.            (line  396)
 * d--efvar_name <1>:                     chapter.            (line  399)
-* d--efvar_name <2>:                     chapter.            (line 1092)
-* d--efvar_name <3>:                     chapter.            (line 1095)
-* d--efvar_name <4>:                     chapter.            (line 1924)
-* d--efvar_name <5>:                     chapter.            (line 1927)
+* d--efvar_name <2>:                     chapter.            (line 1093)
+* d--efvar_name <3>:                     chapter.            (line 1096)
+* d--efvar_name <4>:                     chapter.            (line 1926)
+* d--efvar_name <5>:                     chapter.            (line 1929)
 * d--efvr_name:                          chapter.            (line  342)
-* d--efvr_name <1>:                      chapter.            (line 1038)
-* d--efvr_name <2>:                      chapter.            (line 1870)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2278)
+* d--efvr_name <1>:                      chapter.            (line 1039)
+* d--efvr_name <2>:                      chapter.            (line 1872)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2281)
 * index entry between item and itemx:    chapter.            (line  530)
-* index entry between item and itemx <1>: chapter.           (line  659)
-* index entry between item and itemx <2>: chapter.           (line 1226)
-* index entry between item and itemx <3>: chapter.           (line 1355)
-* index entry between item and itemx <4>: chapter.           (line 2058)
-* index entry between item and itemx <5>: chapter.           (line 2220)
-* index entry in footnote:               chapter.            (line 2609)
+* index entry between item and itemx <1>: chapter.           (line  660)
+* index entry between item and itemx <2>: chapter.           (line 1227)
+* index entry between item and itemx <3>: chapter.           (line 1357)
+* index entry between item and itemx <4>: chapter.           (line 2060)
+* index entry between item and itemx <5>: chapter.           (line 2223)
+* index entry in footnote:               chapter.            (line 2612)
 * index entry within deffn:              chapter.            (line  317)
-* index entry within deffn <1>:          chapter.            (line 1013)
-* index entry within deffn <2>:          chapter.            (line 1843)
+* index entry within deffn <1>:          chapter.            (line 1014)
+* index entry within deffn <2>:          chapter.            (line 1845)
 * index entry within itemize:            chapter.            (line  228)
-* index entry within itemize <1>:        chapter.            (line  924)
-* index entry within itemize <2>:        chapter.            (line 1754)
+* index entry within itemize <1>:        chapter.            (line  925)
+* index entry within itemize <2>:        chapter.            (line 1756)
 * index entry within multitable:         chapter.            (line  250)
-* index entry within multitable <1>:     chapter.            (line  946)
-* index entry within multitable <2>:     chapter.            (line 1777)
-* t-ruc:                                 chapter.            (line 2278)
-* T-ruc:                                 chapter.            (line 2278)
+* index entry within multitable <1>:     chapter.            (line  947)
+* index entry within multitable <2>:     chapter.            (line 1779)
+* t-ruc:                                 chapter.            (line 2281)
+* T-ruc:                                 chapter.            (line 2281)
 * vtable i--tem code kbdinputstyle:      chapter.            (line  152)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  848)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1677)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  849)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1679)
 * vtable i--tem default kbdinputstyle:   chapter.            (line  147)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  843)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1672)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  844)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1674)
 * vtable i--tem distinct kbdinputstyle:  chapter.            (line  162)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  858)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1687)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  859)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1689)
 * vtable i--tem example kbdinputstyle:   chapter.            (line  157)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  853)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1682)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  854)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1684)
 * vtable i--tem in example code kbdinputstyle: chapter.      (line  154)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  850)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1679)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  851)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1681)
 * vtable i--tem in example default kbdinputstyle: chapter.   (line  149)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  845)
+                                                             (line  846)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1674)
+                                                             (line 1676)
 * vtable i--tem in example distinct kbdinputstyle: chapter.  (line  164)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  860)
+                                                             (line  861)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1689)
+                                                             (line 1691)
 * vtable i--tem in example example kbdinputstyle: chapter.   (line  159)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  855)
+                                                             (line  856)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1684)
+                                                             (line 1686)
 
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  724)
-* --foption <2>:                         chapter.            (line 1431)
-* ?:                                     chapter.            (line 2278)
-* .:                                     chapter.            (line 2278)
+* --foption <1>:                         chapter.            (line  725)
+* --foption <2>:                         chapter.            (line 1433)
+* ?:                                     chapter.            (line 2281)
+* .:                                     chapter.            (line 2281)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  724)
-* `` <2>:                                chapter.            (line 1431)
+* `` <1>:                                chapter.            (line  725)
+* `` <2>:                                chapter.            (line 1433)
 * a:                                     chapter.            (line  330)
 * a <1>:                                 chapter.            (line  529)
-* a <2>:                                 chapter.            (line  658)
-* a <3>:                                 chapter.            (line 1026)
-* a <4>:                                 chapter.            (line 1225)
-* a <5>:                                 chapter.            (line 1354)
-* a <6>:                                 chapter.            (line 1856)
-* a <7>:                                 chapter.            (line 2057)
-* a <8>:                                 chapter.            (line 2219)
-* a <9>:                                 chapter.            (line 2278)
-* after:                                 chapter.            (line  669)
-* after <1>:                             chapter.            (line 1365)
-* after <2>:                             chapter.            (line 2230)
+* a <2>:                                 chapter.            (line  659)
+* a <3>:                                 chapter.            (line 1027)
+* a <4>:                                 chapter.            (line 1226)
+* a <5>:                                 chapter.            (line 1356)
+* a <6>:                                 chapter.            (line 1858)
+* a <7>:                                 chapter.            (line 2059)
+* a <8>:                                 chapter.            (line 2222)
+* a <9>:                                 chapter.            (line 2281)
+* after:                                 chapter.            (line  670)
+* after <1>:                             chapter.            (line 1367)
+* after <2>:                             chapter.            (line 2233)
 * arg2:                                  chapter.            (line  449)
-* arg2 <1>:                              chapter.            (line 1145)
-* arg2 <2>:                              chapter.            (line 1979)
+* arg2 <1>:                              chapter.            (line 1146)
+* arg2 <2>:                              chapter.            (line 1981)
 * b:                                     chapter.            (line  530)
-* b <1>:                                 chapter.            (line  659)
-* b <2>:                                 chapter.            (line 1226)
-* b <3>:                                 chapter.            (line 1355)
-* b <4>:                                 chapter.            (line 2058)
-* b <5>:                                 chapter.            (line 2220)
+* b <1>:                                 chapter.            (line  660)
+* b <2>:                                 chapter.            (line 1227)
+* b <3>:                                 chapter.            (line 1357)
+* b <4>:                                 chapter.            (line 2060)
+* b <5>:                                 chapter.            (line 2223)
 * bidule machin:                         chapter.            (line  325)
-* bidule machin <1>:                     chapter.            (line 1021)
-* bidule machin <2>:                     chapter.            (line 1851)
+* bidule machin <1>:                     chapter.            (line 1022)
+* bidule machin <2>:                     chapter.            (line 1853)
 * d--effn_name:                          chapter.            (line  309)
-* d--effn_name <1>:                      chapter.            (line 1005)
-* d--effn_name <2>:                      chapter.            (line 1835)
+* d--effn_name <1>:                      chapter.            (line 1006)
+* d--effn_name <2>:                      chapter.            (line 1837)
 * d--efmac_name:                         chapter.            (line  390)
-* d--efmac_name <1>:                     chapter.            (line 1086)
-* d--efmac_name <2>:                     chapter.            (line 1918)
+* d--efmac_name <1>:                     chapter.            (line 1087)
+* d--efmac_name <2>:                     chapter.            (line 1920)
 * d--efmethod_name on c--lass:           chapter.            (line  417)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1113)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1945)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1114)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1947)
 * d--efop_name on c--lass:               chapter.            (line  378)
 * d--efop_name on c--lass <1>:           chapter.            (line  381)
-* d--efop_name on c--lass <2>:           chapter.            (line 1074)
-* d--efop_name on c--lass <3>:           chapter.            (line 1077)
-* d--efop_name on c--lass <4>:           chapter.            (line 1906)
-* d--efop_name on c--lass <5>:           chapter.            (line 1909)
+* d--efop_name on c--lass <2>:           chapter.            (line 1075)
+* d--efop_name on c--lass <3>:           chapter.            (line 1078)
+* d--efop_name on c--lass <4>:           chapter.            (line 1908)
+* d--efop_name on c--lass <5>:           chapter.            (line 1911)
 * d--efspec_name:                        chapter.            (line  393)
-* d--efspec_name <1>:                    chapter.            (line 1089)
-* d--efspec_name <2>:                    chapter.            (line 1921)
+* d--efspec_name <1>:                    chapter.            (line 1090)
+* d--efspec_name <2>:                    chapter.            (line 1923)
 * d--eftypefn_name:                      chapter.            (line  351)
 * d--eftypefn_name <1>:                  chapter.            (line  354)
-* d--eftypefn_name <2>:                  chapter.            (line 1047)
-* d--eftypefn_name <3>:                  chapter.            (line 1050)
-* d--eftypefn_name <4>:                  chapter.            (line 1879)
-* d--eftypefn_name <5>:                  chapter.            (line 1882)
+* d--eftypefn_name <2>:                  chapter.            (line 1048)
+* d--eftypefn_name <3>:                  chapter.            (line 1051)
+* d--eftypefn_name <4>:                  chapter.            (line 1881)
+* d--eftypefn_name <5>:                  chapter.            (line 1884)
 * d--eftypefn_name2:                     chapter.            (line  428)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1124)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1957)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1125)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1959)
 * d--eftypefun_name:                     chapter.            (line  405)
-* d--eftypefun_name <1>:                 chapter.            (line 1101)
-* d--eftypefun_name <2>:                 chapter.            (line 1933)
+* d--eftypefun_name <1>:                 chapter.            (line 1102)
+* d--eftypefun_name <2>:                 chapter.            (line 1935)
 * d--eftypemethod_name on c--lass:       chapter.            (line  420)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1116)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1948)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1117)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1950)
 * d--eftypeop_name on c--lass:           chapter.            (line  357)
 * d--eftypeop_name on c--lass <1>:       chapter.            (line  360)
-* d--eftypeop_name on c--lass <2>:       chapter.            (line 1053)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1056)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1885)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1888)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1054)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1057)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1887)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1890)
 * d--eftypeop_name2 on c--lass2:         chapter.            (line  433)
 * d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  438)
-* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1129)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1134)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1962)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1967)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1130)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1135)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1964)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1969)
 * d--efun_name:                          chapter.            (line  387)
-* d--efun_name <1>:                      chapter.            (line 1083)
-* d--efun_name <2>:                      chapter.            (line 1915)
+* d--efun_name <1>:                      chapter.            (line 1084)
+* d--efun_name <2>:                      chapter.            (line 1917)
 * de--ffn_name:                          chapter.            (line  312)
-* de--ffn_name <1>:                      chapter.            (line 1008)
-* de--ffn_name <2>:                      chapter.            (line 1838)
+* de--ffn_name <1>:                      chapter.            (line 1009)
+* de--ffn_name <2>:                      chapter.            (line 1840)
 * deffn:                                 chapter.            (line  333)
 * deffn <1>:                             chapter.            (line  335)
-* deffn <2>:                             chapter.            (line 1029)
-* deffn <3>:                             chapter.            (line 1031)
-* deffn <4>:                             chapter.            (line 1860)
-* deffn <5>:                             chapter.            (line 1862)
+* deffn <2>:                             chapter.            (line 1030)
+* deffn <3>:                             chapter.            (line 1032)
+* deffn <4>:                             chapter.            (line 1862)
+* deffn <5>:                             chapter.            (line 1864)
 * deffnx:                                chapter.            (line  331)
 * deffnx <1>:                            chapter.            (line  336)
-* deffnx <2>:                            chapter.            (line 1027)
-* deffnx <3>:                            chapter.            (line 1032)
-* deffnx <4>:                            chapter.            (line 1857)
-* deffnx <5>:                            chapter.            (line 1863)
-* f---aa:                                chapter.            (line 2278)
-* f---bb, f---cc:                        chapter.            (line 2278)
-* f---ddd, f---eee, ffff:                chapter.            (line 2278)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2278)
+* deffnx <2>:                            chapter.            (line 1028)
+* deffnx <3>:                            chapter.            (line 1033)
+* deffnx <4>:                            chapter.            (line 1859)
+* deffnx <5>:                            chapter.            (line 1865)
+* f---aa:                                chapter.            (line 2281)
+* f---bb, f---cc:                        chapter.            (line 2281)
+* f---ddd, f---eee, ffff:                chapter.            (line 2281)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2281)
 * followed:                              chapter.            (line  328)
-* followed <1>:                          chapter.            (line  667)
-* followed <2>:                          chapter.            (line 1024)
-* followed <3>:                          chapter.            (line 1363)
-* followed <4>:                          chapter.            (line 1854)
-* followed <5>:                          chapter.            (line 2228)
+* followed <1>:                          chapter.            (line  668)
+* followed <2>:                          chapter.            (line 1025)
+* followed <3>:                          chapter.            (line 1365)
+* followed <4>:                          chapter.            (line 1856)
+* followed <5>:                          chapter.            (line 2231)
 * I:                                     chapter.            (line  316)
 * I <1>:                                 chapter.            (line  338)
-* I <2>:                                 chapter.            (line 1012)
-* I <3>:                                 chapter.            (line 1034)
-* I <4>:                                 chapter.            (line 1842)
-* I <5>:                                 chapter.            (line 1865)
+* I <2>:                                 chapter.            (line 1013)
+* I <3>:                                 chapter.            (line 1035)
+* I <4>:                                 chapter.            (line 1844)
+* I <5>:                                 chapter.            (line 1867)
 * id i ule:                              chapter.            (line  322)
-* id i ule <1>:                          chapter.            (line 1018)
-* id i ule <2>:                          chapter.            (line 1848)
+* id i ule <1>:                          chapter.            (line 1019)
+* id i ule <2>:                          chapter.            (line 1850)
 * id ule:                                chapter.            (line  321)
-* id ule <1>:                            chapter.            (line 1017)
-* id ule <2>:                            chapter.            (line 1847)
-* INVALID:                               chapter.            (line  671)
-* INVALID <1>:                           chapter.            (line 1367)
-* INVALID <2>:                           chapter.            (line 2232)
+* id ule <1>:                            chapter.            (line 1018)
+* id ule <2>:                            chapter.            (line 1849)
+* INVALID:                               chapter.            (line  672)
+* INVALID <1>:                           chapter.            (line 1369)
+* INVALID <2>:                           chapter.            (line 2235)
 * log trap:                              chapter.            (line  318)
-* log trap <1>:                          chapter.            (line 1014)
-* log trap <2>:                          chapter.            (line 1844)
+* log trap <1>:                          chapter.            (line 1015)
+* log trap <2>:                          chapter.            (line 1846)
 * log trap1:                             chapter.            (line  319)
-* log trap1 <1>:                         chapter.            (line 1015)
-* log trap1 <2>:                         chapter.            (line 1845)
+* log trap1 <1>:                         chapter.            (line 1016)
+* log trap1 <2>:                         chapter.            (line 1847)
 * log trap2:                             chapter.            (line  320)
-* log trap2 <1>:                         chapter.            (line 1016)
-* log trap2 <2>:                         chapter.            (line 1846)
+* log trap2 <1>:                         chapter.            (line 1017)
+* log trap2 <2>:                         chapter.            (line 1848)
 * machin:                                chapter.            (line  324)
 * machin <1>:                            chapter.            (line  326)
-* machin <2>:                            chapter.            (line  663)
-* machin <3>:                            chapter.            (line  664)
-* machin <4>:                            chapter.            (line  665)
-* machin <5>:                            chapter.            (line  666)
-* machin <6>:                            chapter.            (line 1020)
-* machin <7>:                            chapter.            (line 1022)
-* machin <8>:                            chapter.            (line 1359)
-* machin <9>:                            chapter.            (line 1360)
-* machin <10>:                           chapter.            (line 1361)
-* machin <11>:                           chapter.            (line 1362)
-* machin <12>:                           chapter.            (line 1850)
-* machin <13>:                           chapter.            (line 1852)
-* machin <14>:                           chapter.            (line 2224)
-* machin <15>:                           chapter.            (line 2225)
-* machin <16>:                           chapter.            (line 2226)
-* machin <17>:                           chapter.            (line 2227)
+* machin <2>:                            chapter.            (line  664)
+* machin <3>:                            chapter.            (line  665)
+* machin <4>:                            chapter.            (line  666)
+* machin <5>:                            chapter.            (line  667)
+* machin <6>:                            chapter.            (line 1021)
+* machin <7>:                            chapter.            (line 1023)
+* machin <8>:                            chapter.            (line 1361)
+* machin <9>:                            chapter.            (line 1362)
+* machin <10>:                           chapter.            (line 1363)
+* machin <11>:                           chapter.            (line 1364)
+* machin <12>:                           chapter.            (line 1852)
+* machin <13>:                           chapter.            (line 1854)
+* machin <14>:                           chapter.            (line 2227)
+* machin <15>:                           chapter.            (line 2228)
+* machin <16>:                           chapter.            (line 2229)
+* machin <17>:                           chapter.            (line 2230)
 * n--ame:                                chapter.            (line  345)
 * n--ame <1>:                            chapter.            (line  348)
-* n--ame <2>:                            chapter.            (line 1041)
-* n--ame <3>:                            chapter.            (line 1044)
-* n--ame <4>:                            chapter.            (line 1873)
-* n--ame <5>:                            chapter.            (line 1876)
+* n--ame <2>:                            chapter.            (line 1042)
+* n--ame <3>:                            chapter.            (line 1045)
+* n--ame <4>:                            chapter.            (line 1875)
+* n--ame <5>:                            chapter.            (line 1878)
 * name2:                                 chapter.            (line  423)
-* name2 <1>:                             chapter.            (line 1119)
-* name2 <2>:                             chapter.            (line 1952)
-* t--ruc:                                chapter.            (line 2278)
-* T--ruc:                                chapter.            (line 2278)
+* name2 <1>:                             chapter.            (line 1120)
+* name2 <2>:                             chapter.            (line 1954)
+* t--ruc:                                chapter.            (line 2281)
+* T--ruc:                                chapter.            (line 2281)
 * truc:                                  chapter.            (line  317)
 * truc <1>:                              chapter.            (line  339)
-* truc <2>:                              chapter.            (line 1013)
-* truc <3>:                              chapter.            (line 1035)
-* truc <4>:                              chapter.            (line 1843)
-* truc <5>:                              chapter.            (line 1866)
-* xxx, zzz:                              chapter.            (line 2278)
+* truc <2>:                              chapter.            (line 1014)
+* truc <3>:                              chapter.            (line 1036)
+* truc <4>:                              chapter.            (line 1845)
+* truc <5>:                              chapter.            (line 1868)
+* xxx, zzz:                              chapter.            (line 2281)
 
 Top section
 1 chapter
diff --git 
a/tp/tests/coverage/res_parser/formatting_regions/formatting_regions.html 
b/tp/tests/coverage/res_parser/formatting_regions/formatting_regions.html
index 6f90860632..b0ec2aba53 100644
--- a/tp/tests/coverage/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/coverage/res_parser/formatting_regions/formatting_regions.html
@@ -1908,6 +1908,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 <strong class="author">author</strong><br>
 
@@ -3013,6 +3014,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
@@ -4167,6 +4169,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
@@ -5415,6 +5418,7 @@ Invalid use of @':
 
 
 
+
 </pre><pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
 &#262;&#807; &#262;&#807; a&#779; &#551; &aring; a&#865;
 &#259; &#462;
@@ -6530,6 +6534,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
diff --git a/tp/tests/coverage/res_parser/formatting_xhtml/formatting.html 
b/tp/tests/coverage/res_parser/formatting_xhtml/formatting.html
index a14102e6ea..9cdf53be76 100644
--- a/tp/tests/coverage/res_parser/formatting_xhtml/formatting.html
+++ b/tp/tests/coverage/res_parser/formatting_xhtml/formatting.html
@@ -1921,6 +1921,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;"/>
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@"/>
 </p>
+<br/>
 
 <strong class="author">author</strong><br/>
 
@@ -3027,6 +3028,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;"/>
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@"/>
 </p>
+<br/>
 
 
 <pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
@@ -4197,6 +4199,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;"/>
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@"/>
 </p>
+<br/>
 
 
 <pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
@@ -5301,6 +5304,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;"/>
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@"/>
 </p>
+<br/>
 
 
 <pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
@@ -6550,6 +6554,7 @@ Invalid use of @':
 
 
 
+
 </pre><pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
 &#262;&#807; &#262;&#807; a&#779; &#551; &aring; a&#865;
 &#259; &#462;
diff --git 
a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html 
b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
index 44c2eb91d7..cb1a61f6a5 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
@@ -1927,6 +1927,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
+<br>
 
 <strong class="author">author</strong><br>
 
@@ -3033,6 +3034,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
+<br>
 
 
 <pre class="displaymath">ü Ü ñ â é ō ì é Ḕ
@@ -4213,6 +4215,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
+<br>
 
 
 <pre class="displaymath">ü Ü ñ â é ō ì é Ḕ
@@ -5317,6 +5320,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" alt="jk _&quot; %@ 
in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" alt="altjk 
_&quot; %@">
 </p>
+<br>
 
 
 <pre class="displaymath">ü Ü ñ â é ō ì é Ḕ
@@ -6566,6 +6570,7 @@ Invalid use of @':
 
 
 
+
 </pre><pre class="displaymath">ü Ü ñ â é ō ì é Ḕ
 Ḉ Ḉ a̋ ȧ å a͡
 ă ǎ
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
index 397ab0e0d1..cebca1a6bb 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
@@ -1919,6 +1919,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="../images/35-f--ile.e--xt" 
alt="jk&#160;_&quot;&#160;%@ in b &quot;"/>
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="../images/36-filejk-__0022-_0025_0040.jpg" 
alt="altjk&#160;_&quot;&#160;%@"/>
 </p>
+<br/>
 
 
 <pre class="displaymath">&#252; &#220; &#241; &#226; &#233; &#333; &#236; 
&#233; &#274;&#768;
@@ -3023,6 +3024,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="../images/47-f--ile.e--xt" 
alt="jk&#160;_&quot;&#160;%@ in b &quot;"/>
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="../images/48-filejk-__0022-_0025_0040.jpg" 
alt="altjk&#160;_&quot;&#160;%@"/>
 </p>
+<br/>
 
 
 <pre class="displaymath">&#252; &#220; &#241; &#226; &#233; &#333; &#236; 
&#233; &#274;&#768;
@@ -4272,6 +4274,7 @@ Invalid use of @':
 
 
 
+
 </pre><pre class="displaymath">&#252; &#220; &#241; &#226; &#233; &#333; 
&#236; &#233; &#274;&#768;
 &#262;&#807; &#262;&#807; a&#779; &#551; &#229; a&#865;
 &#259; &#462;
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
index 0a8f59b5c2..5d7965fd10 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
@@ -1903,6 +1903,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="../images/11-f--ile.e--xt" 
alt="jk&#160;_&quot;&#160;%@ in b &quot;"/>
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="../images/12-filejk-__0022-_0025_0040.jpg" 
alt="altjk&#160;_&quot;&#160;%@"/>
 </p>
+<br/>
 
 <strong class="author">author</strong><br/>
 
@@ -3009,6 +3010,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="../images/23-f--ile.e--xt" 
alt="jk&#160;_&quot;&#160;%@ in b &quot;"/>
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="../images/24-filejk-__0022-_0025_0040.jpg" 
alt="altjk&#160;_&quot;&#160;%@"/>
 </p>
+<br/>
 
 
 <pre class="displaymath">&#252; &#220; &#241; &#226; &#233; &#333; &#236; 
&#233; &#274;&#768;
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter.html 
b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
index 9e4840060c..03351e9646 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
@@ -1932,6 +1932,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
@@ -3036,6 +3037,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
@@ -4281,6 +4283,7 @@ Invalid use of @':
 
 
 
+
 </pre><pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
 &#262;&#807; &#262;&#807; a&#779; &#551; &aring; a&#865;
 &#259; &#462;
diff --git a/tp/tests/layout/res_parser/formatting_fr/formatting.html 
b/tp/tests/layout/res_parser/formatting_fr/formatting.html
index 0206559473..f87169fcc8 100644
--- a/tp/tests/layout/res_parser/formatting_fr/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr/formatting.html
@@ -1923,6 +1923,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 <strong class="author">author</strong><br>
 
@@ -3029,6 +3030,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
@@ -4193,6 +4195,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
@@ -5297,6 +5300,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
@@ -6546,6 +6550,7 @@ Invalid use of @':
 
 
 
+
 </pre><pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
 &#262;&#807; &#262;&#807; a&#779; &#551; &aring; a&#865;
 &#259; &#462;
diff --git a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html 
b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
index 452db9f60a..0104ad65ba 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -1924,6 +1924,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 <strong class="author">author</strong><br>
 
@@ -3030,6 +3031,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
@@ -4194,6 +4196,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
@@ -5298,6 +5301,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
@@ -6547,6 +6551,7 @@ Invalid use of @':
 
 
 
+
 </pre><pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
 &#262;&#807; &#262;&#807; a&#779; &#551; &aring; a&#865;
 &#259; &#462;
diff --git a/tp/tests/layout/res_parser/formatting_fr_info/formatting.info 
b/tp/tests/layout/res_parser/formatting_fr_info/formatting.info
index 1fec78f1f0..6217be9e34 100644
--- a/tp/tests/layout/res_parser/formatting_fr_info/formatting.info
+++ b/tp/tests/layout/res_parser/formatting_fr_info/formatting.info
@@ -618,6 +618,7 @@ aaa"]
 aaa"]
 ‘@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}’ [altjk _" %@]
 
+
 ü Ü ñ â é ō ì é Ḕ
 Ḉ Ḉ a̋ ȧ å a͡
 ă ǎ
@@ -1357,6 +1358,7 @@ aaa"]
 aaa"]
 ‘@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}’ [altjk _" %@]
 
+
 ü Ü ñ â é ō ì é Ḕ
 Ḉ Ḉ a̋ ȧ å a͡
 ă ǎ
@@ -2053,6 +2055,7 @@ aaa"]
 aaa"]
 ‘@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}’ [altjk _" %@]
 
+
 ü Ü ñ â é ō ì é Ḕ
 Ḉ Ḉ a̋ ȧ å a͡
 ă ǎ
@@ -2918,6 +2921,7 @@ aaa"]
 
 
 
+
      ü Ü ñ â é ō ì é Ḕ
      Ḉ Ḉ a̋ ȧ å a͡
      ă ǎ
@@ -3009,14 +3013,14 @@ aaa"]
 [index]
 * Menu:
 
-* truc:                                  chapter.            (line 2278)
+* truc:                                  chapter.            (line 2281)
 
    codeidx
 
 [index]
 * Menu:
 
-* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2278)
+* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2281)
 
    cp
 
@@ -3024,116 +3028,116 @@ aaa"]
 * Menu:
 
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  724)
-* -option <2>:                           chapter.            (line 1431)
-* ?:                                     chapter.            (line 2278)
-* .:                                     chapter.            (line 2278)
+* -option <1>:                           chapter.            (line  725)
+* -option <2>:                           chapter.            (line 1433)
+* ?:                                     chapter.            (line 2281)
+* .:                                     chapter.            (line 2281)
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  724)
-* " <2>:                                 chapter.            (line 1431)
-* a:                                     chapter.            (line 2278)
-* aaa, bbb:                              chapter.            (line 2278)
-* a--a:                                  chapter.            (line 2278)
+* " <1>:                                 chapter.            (line  725)
+* " <2>:                                 chapter.            (line 1433)
+* a:                                     chapter.            (line 2281)
+* aaa, bbb:                              chapter.            (line 2281)
+* a--a:                                  chapter.            (line 2281)
 * a--asis:                               chapter.            (line  525)
-* a--asis <1>:                           chapter.            (line 1221)
-* a--asis <2>:                           chapter.            (line 2053)
+* a--asis <1>:                           chapter.            (line 1222)
+* a--asis <2>:                           chapter.            (line 2055)
 * b:                                     chapter.            (line  526)
-* b <1>:                                 chapter.            (line 1222)
-* b <2>:                                 chapter.            (line 2054)
-* b--b, c--c:                            chapter.            (line 2278)
+* b <1>:                                 chapter.            (line 1223)
+* b <2>:                                 chapter.            (line 2056)
+* b--b, c--c:                            chapter.            (line 2281)
 * counting entry:                        chapter.            (line    4)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2278)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2281)
 * d--efcv_name:                          chapter.            (line  366)
 * d--efcv_name <1>:                      chapter.            (line  369)
-* d--efcv_name <2>:                      chapter.            (line 1062)
-* d--efcv_name <3>:                      chapter.            (line 1065)
-* d--efcv_name <4>:                      chapter.            (line 1894)
-* d--efcv_name <5>:                      chapter.            (line 1897)
+* d--efcv_name <2>:                      chapter.            (line 1063)
+* d--efcv_name <3>:                      chapter.            (line 1066)
+* d--efcv_name <4>:                      chapter.            (line 1896)
+* d--efcv_name <5>:                      chapter.            (line 1899)
 * d--efivar_name de c--lass:             chapter.            (line  411)
-* d--efivar_name de c--lass <1>:         chapter.            (line 1107)
-* d--efivar_name de c--lass <2>:         chapter.            (line 1939)
+* d--efivar_name de c--lass <1>:         chapter.            (line 1108)
+* d--efivar_name de c--lass <2>:         chapter.            (line 1941)
 * d--efopt_name:                         chapter.            (line  402)
-* d--efopt_name <1>:                     chapter.            (line 1098)
-* d--efopt_name <2>:                     chapter.            (line 1930)
+* d--efopt_name <1>:                     chapter.            (line 1099)
+* d--efopt_name <2>:                     chapter.            (line 1932)
 * d--eftypecv_name de c--lass:           chapter.            (line  372)
 * d--eftypecv_name de c--lass <1>:       chapter.            (line  375)
-* d--eftypecv_name de c--lass <2>:       chapter.            (line 1068)
-* d--eftypecv_name de c--lass <3>:       chapter.            (line 1071)
-* d--eftypecv_name de c--lass <4>:       chapter.            (line 1900)
-* d--eftypecv_name de c--lass <5>:       chapter.            (line 1903)
+* d--eftypecv_name de c--lass <2>:       chapter.            (line 1069)
+* d--eftypecv_name de c--lass <3>:       chapter.            (line 1072)
+* d--eftypecv_name de c--lass <4>:       chapter.            (line 1902)
+* d--eftypecv_name de c--lass <5>:       chapter.            (line 1905)
 * d--eftypecv_name2 de c--lass2:         chapter.            (line  443)
 * d--eftypecv_name2 de c--lass2 <1>:     chapter.            (line  446)
-* d--eftypecv_name2 de c--lass2 <2>:     chapter.            (line 1139)
-* d--eftypecv_name2 de c--lass2 <3>:     chapter.            (line 1142)
-* d--eftypecv_name2 de c--lass2 <4>:     chapter.            (line 1972)
-* d--eftypecv_name2 de c--lass2 <5>:     chapter.            (line 1975)
+* d--eftypecv_name2 de c--lass2 <2>:     chapter.            (line 1140)
+* d--eftypecv_name2 de c--lass2 <3>:     chapter.            (line 1143)
+* d--eftypecv_name2 de c--lass2 <4>:     chapter.            (line 1974)
+* d--eftypecv_name2 de c--lass2 <5>:     chapter.            (line 1977)
 * d--eftypeivar_name de c--lass:         chapter.            (line  414)
-* d--eftypeivar_name de c--lass <1>:     chapter.            (line 1110)
-* d--eftypeivar_name de c--lass <2>:     chapter.            (line 1942)
+* d--eftypeivar_name de c--lass <1>:     chapter.            (line 1111)
+* d--eftypeivar_name de c--lass <2>:     chapter.            (line 1944)
 * d--eftypevar_name:                     chapter.            (line  408)
-* d--eftypevar_name <1>:                 chapter.            (line 1104)
-* d--eftypevar_name <2>:                 chapter.            (line 1936)
+* d--eftypevar_name <1>:                 chapter.            (line 1105)
+* d--eftypevar_name <2>:                 chapter.            (line 1938)
 * d--eftypevr_name:                      chapter.            (line  363)
-* d--eftypevr_name <1>:                  chapter.            (line 1059)
-* d--eftypevr_name <2>:                  chapter.            (line 1891)
+* d--eftypevr_name <1>:                  chapter.            (line 1060)
+* d--eftypevr_name <2>:                  chapter.            (line 1893)
 * d--efvar_name:                         chapter.            (line  396)
 * d--efvar_name <1>:                     chapter.            (line  399)
-* d--efvar_name <2>:                     chapter.            (line 1092)
-* d--efvar_name <3>:                     chapter.            (line 1095)
-* d--efvar_name <4>:                     chapter.            (line 1924)
-* d--efvar_name <5>:                     chapter.            (line 1927)
+* d--efvar_name <2>:                     chapter.            (line 1093)
+* d--efvar_name <3>:                     chapter.            (line 1096)
+* d--efvar_name <4>:                     chapter.            (line 1926)
+* d--efvar_name <5>:                     chapter.            (line 1929)
 * d--efvr_name:                          chapter.            (line  342)
-* d--efvr_name <1>:                      chapter.            (line 1038)
-* d--efvr_name <2>:                      chapter.            (line 1870)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2278)
+* d--efvr_name <1>:                      chapter.            (line 1039)
+* d--efvr_name <2>:                      chapter.            (line 1872)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2281)
 * index entry between item and itemx:    chapter.            (line  530)
-* index entry between item and itemx <1>: chapter.           (line  659)
-* index entry between item and itemx <2>: chapter.           (line 1226)
-* index entry between item and itemx <3>: chapter.           (line 1355)
-* index entry between item and itemx <4>: chapter.           (line 2058)
-* index entry between item and itemx <5>: chapter.           (line 2220)
+* index entry between item and itemx <1>: chapter.           (line  660)
+* index entry between item and itemx <2>: chapter.           (line 1227)
+* index entry between item and itemx <3>: chapter.           (line 1357)
+* index entry between item and itemx <4>: chapter.           (line 2060)
+* index entry between item and itemx <5>: chapter.           (line 2223)
 * index entry in footnote:               chapter.            (line    4)
 * index entry within deffn:              chapter.            (line  317)
-* index entry within deffn <1>:          chapter.            (line 1013)
-* index entry within deffn <2>:          chapter.            (line 1843)
+* index entry within deffn <1>:          chapter.            (line 1014)
+* index entry within deffn <2>:          chapter.            (line 1845)
 * index entry within itemize:            chapter.            (line  228)
-* index entry within itemize <1>:        chapter.            (line  924)
-* index entry within itemize <2>:        chapter.            (line 1754)
+* index entry within itemize <1>:        chapter.            (line  925)
+* index entry within itemize <2>:        chapter.            (line 1756)
 * index entry within multitable:         chapter.            (line  250)
-* index entry within multitable <1>:     chapter.            (line  946)
-* index entry within multitable <2>:     chapter.            (line 1777)
-* t-ruc:                                 chapter.            (line 2278)
-* T-ruc:                                 chapter.            (line 2278)
+* index entry within multitable <1>:     chapter.            (line  947)
+* index entry within multitable <2>:     chapter.            (line 1779)
+* t-ruc:                                 chapter.            (line 2281)
+* T-ruc:                                 chapter.            (line 2281)
 * vtable i--tem code kbdinputstyle:      chapter.            (line  152)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  848)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1677)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  849)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1679)
 * vtable i--tem default kbdinputstyle:   chapter.            (line  147)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  843)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1672)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  844)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1674)
 * vtable i--tem distinct kbdinputstyle:  chapter.            (line  162)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  858)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1687)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  859)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1689)
 * vtable i--tem example kbdinputstyle:   chapter.            (line  157)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  853)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1682)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  854)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1684)
 * vtable i--tem in example code kbdinputstyle: chapter.      (line  154)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  850)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1679)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  851)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1681)
 * vtable i--tem in example default kbdinputstyle: chapter.   (line  149)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  845)
+                                                             (line  846)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1674)
+                                                             (line 1676)
 * vtable i--tem in example distinct kbdinputstyle: chapter.  (line  164)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  860)
+                                                             (line  861)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1689)
+                                                             (line 1691)
 * vtable i--tem in example example kbdinputstyle: chapter.   (line  159)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  855)
+                                                             (line  856)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1684)
+                                                             (line 1686)
 
    fn
 
@@ -3141,171 +3145,171 @@ aaa"]
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  724)
-* --foption <2>:                         chapter.            (line 1431)
-* ?:                                     chapter.            (line 2278)
-* .:                                     chapter.            (line 2278)
+* --foption <1>:                         chapter.            (line  725)
+* --foption <2>:                         chapter.            (line 1433)
+* ?:                                     chapter.            (line 2281)
+* .:                                     chapter.            (line 2281)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  724)
-* `` <2>:                                chapter.            (line 1431)
+* `` <1>:                                chapter.            (line  725)
+* `` <2>:                                chapter.            (line 1433)
 * a:                                     chapter.            (line  330)
 * a <1>:                                 chapter.            (line  529)
-* a <2>:                                 chapter.            (line  658)
-* a <3>:                                 chapter.            (line 1026)
-* a <4>:                                 chapter.            (line 1225)
-* a <5>:                                 chapter.            (line 1354)
-* a <6>:                                 chapter.            (line 1856)
-* a <7>:                                 chapter.            (line 2057)
-* a <8>:                                 chapter.            (line 2219)
-* a <9>:                                 chapter.            (line 2278)
-* after:                                 chapter.            (line  669)
-* after <1>:                             chapter.            (line 1365)
-* after <2>:                             chapter.            (line 2230)
+* a <2>:                                 chapter.            (line  659)
+* a <3>:                                 chapter.            (line 1027)
+* a <4>:                                 chapter.            (line 1226)
+* a <5>:                                 chapter.            (line 1356)
+* a <6>:                                 chapter.            (line 1858)
+* a <7>:                                 chapter.            (line 2059)
+* a <8>:                                 chapter.            (line 2222)
+* a <9>:                                 chapter.            (line 2281)
+* after:                                 chapter.            (line  670)
+* after <1>:                             chapter.            (line 1367)
+* after <2>:                             chapter.            (line 2233)
 * arg2:                                  chapter.            (line  449)
-* arg2 <1>:                              chapter.            (line 1145)
-* arg2 <2>:                              chapter.            (line 1979)
+* arg2 <1>:                              chapter.            (line 1146)
+* arg2 <2>:                              chapter.            (line 1981)
 * b:                                     chapter.            (line  530)
-* b <1>:                                 chapter.            (line  659)
-* b <2>:                                 chapter.            (line 1226)
-* b <3>:                                 chapter.            (line 1355)
-* b <4>:                                 chapter.            (line 2058)
-* b <5>:                                 chapter.            (line 2220)
+* b <1>:                                 chapter.            (line  660)
+* b <2>:                                 chapter.            (line 1227)
+* b <3>:                                 chapter.            (line 1357)
+* b <4>:                                 chapter.            (line 2060)
+* b <5>:                                 chapter.            (line 2223)
 * bidule machin:                         chapter.            (line  325)
-* bidule machin <1>:                     chapter.            (line 1021)
-* bidule machin <2>:                     chapter.            (line 1851)
+* bidule machin <1>:                     chapter.            (line 1022)
+* bidule machin <2>:                     chapter.            (line 1853)
 * d--effn_name:                          chapter.            (line  309)
-* d--effn_name <1>:                      chapter.            (line 1005)
-* d--effn_name <2>:                      chapter.            (line 1835)
+* d--effn_name <1>:                      chapter.            (line 1006)
+* d--effn_name <2>:                      chapter.            (line 1837)
 * d--efmac_name:                         chapter.            (line  390)
-* d--efmac_name <1>:                     chapter.            (line 1086)
-* d--efmac_name <2>:                     chapter.            (line 1918)
+* d--efmac_name <1>:                     chapter.            (line 1087)
+* d--efmac_name <2>:                     chapter.            (line 1920)
 * d--efmethod_name de c--lass:           chapter.            (line  417)
-* d--efmethod_name de c--lass <1>:       chapter.            (line 1113)
-* d--efmethod_name de c--lass <2>:       chapter.            (line 1945)
+* d--efmethod_name de c--lass <1>:       chapter.            (line 1114)
+* d--efmethod_name de c--lass <2>:       chapter.            (line 1947)
 * d--efop_name de c--lass:               chapter.            (line  378)
 * d--efop_name de c--lass <1>:           chapter.            (line  381)
-* d--efop_name de c--lass <2>:           chapter.            (line 1074)
-* d--efop_name de c--lass <3>:           chapter.            (line 1077)
-* d--efop_name de c--lass <4>:           chapter.            (line 1906)
-* d--efop_name de c--lass <5>:           chapter.            (line 1909)
+* d--efop_name de c--lass <2>:           chapter.            (line 1075)
+* d--efop_name de c--lass <3>:           chapter.            (line 1078)
+* d--efop_name de c--lass <4>:           chapter.            (line 1908)
+* d--efop_name de c--lass <5>:           chapter.            (line 1911)
 * d--efspec_name:                        chapter.            (line  393)
-* d--efspec_name <1>:                    chapter.            (line 1089)
-* d--efspec_name <2>:                    chapter.            (line 1921)
+* d--efspec_name <1>:                    chapter.            (line 1090)
+* d--efspec_name <2>:                    chapter.            (line 1923)
 * d--eftypefn_name:                      chapter.            (line  351)
 * d--eftypefn_name <1>:                  chapter.            (line  354)
-* d--eftypefn_name <2>:                  chapter.            (line 1047)
-* d--eftypefn_name <3>:                  chapter.            (line 1050)
-* d--eftypefn_name <4>:                  chapter.            (line 1879)
-* d--eftypefn_name <5>:                  chapter.            (line 1882)
+* d--eftypefn_name <2>:                  chapter.            (line 1048)
+* d--eftypefn_name <3>:                  chapter.            (line 1051)
+* d--eftypefn_name <4>:                  chapter.            (line 1881)
+* d--eftypefn_name <5>:                  chapter.            (line 1884)
 * d--eftypefn_name2:                     chapter.            (line  428)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1124)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1957)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1125)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1959)
 * d--eftypefun_name:                     chapter.            (line  405)
-* d--eftypefun_name <1>:                 chapter.            (line 1101)
-* d--eftypefun_name <2>:                 chapter.            (line 1933)
+* d--eftypefun_name <1>:                 chapter.            (line 1102)
+* d--eftypefun_name <2>:                 chapter.            (line 1935)
 * d--eftypemethod_name de c--lass:       chapter.            (line  420)
-* d--eftypemethod_name de c--lass <1>:   chapter.            (line 1116)
-* d--eftypemethod_name de c--lass <2>:   chapter.            (line 1948)
+* d--eftypemethod_name de c--lass <1>:   chapter.            (line 1117)
+* d--eftypemethod_name de c--lass <2>:   chapter.            (line 1950)
 * d--eftypeop_name de c--lass:           chapter.            (line  357)
 * d--eftypeop_name de c--lass <1>:       chapter.            (line  360)
-* d--eftypeop_name de c--lass <2>:       chapter.            (line 1053)
-* d--eftypeop_name de c--lass <3>:       chapter.            (line 1056)
-* d--eftypeop_name de c--lass <4>:       chapter.            (line 1885)
-* d--eftypeop_name de c--lass <5>:       chapter.            (line 1888)
+* d--eftypeop_name de c--lass <2>:       chapter.            (line 1054)
+* d--eftypeop_name de c--lass <3>:       chapter.            (line 1057)
+* d--eftypeop_name de c--lass <4>:       chapter.            (line 1887)
+* d--eftypeop_name de c--lass <5>:       chapter.            (line 1890)
 * d--eftypeop_name2 de c--lass2:         chapter.            (line  433)
 * d--eftypeop_name2 de c--lass2 <1>:     chapter.            (line  438)
-* d--eftypeop_name2 de c--lass2 <2>:     chapter.            (line 1129)
-* d--eftypeop_name2 de c--lass2 <3>:     chapter.            (line 1134)
-* d--eftypeop_name2 de c--lass2 <4>:     chapter.            (line 1962)
-* d--eftypeop_name2 de c--lass2 <5>:     chapter.            (line 1967)
+* d--eftypeop_name2 de c--lass2 <2>:     chapter.            (line 1130)
+* d--eftypeop_name2 de c--lass2 <3>:     chapter.            (line 1135)
+* d--eftypeop_name2 de c--lass2 <4>:     chapter.            (line 1964)
+* d--eftypeop_name2 de c--lass2 <5>:     chapter.            (line 1969)
 * d--efun_name:                          chapter.            (line  387)
-* d--efun_name <1>:                      chapter.            (line 1083)
-* d--efun_name <2>:                      chapter.            (line 1915)
+* d--efun_name <1>:                      chapter.            (line 1084)
+* d--efun_name <2>:                      chapter.            (line 1917)
 * de--ffn_name:                          chapter.            (line  312)
-* de--ffn_name <1>:                      chapter.            (line 1008)
-* de--ffn_name <2>:                      chapter.            (line 1838)
+* de--ffn_name <1>:                      chapter.            (line 1009)
+* de--ffn_name <2>:                      chapter.            (line 1840)
 * deffn:                                 chapter.            (line  333)
 * deffn <1>:                             chapter.            (line  335)
-* deffn <2>:                             chapter.            (line 1029)
-* deffn <3>:                             chapter.            (line 1031)
-* deffn <4>:                             chapter.            (line 1860)
-* deffn <5>:                             chapter.            (line 1862)
+* deffn <2>:                             chapter.            (line 1030)
+* deffn <3>:                             chapter.            (line 1032)
+* deffn <4>:                             chapter.            (line 1862)
+* deffn <5>:                             chapter.            (line 1864)
 * deffnx:                                chapter.            (line  331)
 * deffnx <1>:                            chapter.            (line  336)
-* deffnx <2>:                            chapter.            (line 1027)
-* deffnx <3>:                            chapter.            (line 1032)
-* deffnx <4>:                            chapter.            (line 1857)
-* deffnx <5>:                            chapter.            (line 1863)
-* f---aa:                                chapter.            (line 2278)
-* f---bb, f---cc:                        chapter.            (line 2278)
-* f---ddd, f---eee, ffff:                chapter.            (line 2278)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2278)
+* deffnx <2>:                            chapter.            (line 1028)
+* deffnx <3>:                            chapter.            (line 1033)
+* deffnx <4>:                            chapter.            (line 1859)
+* deffnx <5>:                            chapter.            (line 1865)
+* f---aa:                                chapter.            (line 2281)
+* f---bb, f---cc:                        chapter.            (line 2281)
+* f---ddd, f---eee, ffff:                chapter.            (line 2281)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2281)
 * followed:                              chapter.            (line  328)
-* followed <1>:                          chapter.            (line  667)
-* followed <2>:                          chapter.            (line 1024)
-* followed <3>:                          chapter.            (line 1363)
-* followed <4>:                          chapter.            (line 1854)
-* followed <5>:                          chapter.            (line 2228)
+* followed <1>:                          chapter.            (line  668)
+* followed <2>:                          chapter.            (line 1025)
+* followed <3>:                          chapter.            (line 1365)
+* followed <4>:                          chapter.            (line 1856)
+* followed <5>:                          chapter.            (line 2231)
 * I:                                     chapter.            (line  316)
 * I <1>:                                 chapter.            (line  338)
-* I <2>:                                 chapter.            (line 1012)
-* I <3>:                                 chapter.            (line 1034)
-* I <4>:                                 chapter.            (line 1842)
-* I <5>:                                 chapter.            (line 1865)
+* I <2>:                                 chapter.            (line 1013)
+* I <3>:                                 chapter.            (line 1035)
+* I <4>:                                 chapter.            (line 1844)
+* I <5>:                                 chapter.            (line 1867)
 * id i ule:                              chapter.            (line  322)
-* id i ule <1>:                          chapter.            (line 1018)
-* id i ule <2>:                          chapter.            (line 1848)
+* id i ule <1>:                          chapter.            (line 1019)
+* id i ule <2>:                          chapter.            (line 1850)
 * id ule:                                chapter.            (line  321)
-* id ule <1>:                            chapter.            (line 1017)
-* id ule <2>:                            chapter.            (line 1847)
-* INVALID:                               chapter.            (line  671)
-* INVALID <1>:                           chapter.            (line 1367)
-* INVALID <2>:                           chapter.            (line 2232)
+* id ule <1>:                            chapter.            (line 1018)
+* id ule <2>:                            chapter.            (line 1849)
+* INVALID:                               chapter.            (line  672)
+* INVALID <1>:                           chapter.            (line 1369)
+* INVALID <2>:                           chapter.            (line 2235)
 * log trap:                              chapter.            (line  318)
-* log trap <1>:                          chapter.            (line 1014)
-* log trap <2>:                          chapter.            (line 1844)
+* log trap <1>:                          chapter.            (line 1015)
+* log trap <2>:                          chapter.            (line 1846)
 * log trap1:                             chapter.            (line  319)
-* log trap1 <1>:                         chapter.            (line 1015)
-* log trap1 <2>:                         chapter.            (line 1845)
+* log trap1 <1>:                         chapter.            (line 1016)
+* log trap1 <2>:                         chapter.            (line 1847)
 * log trap2:                             chapter.            (line  320)
-* log trap2 <1>:                         chapter.            (line 1016)
-* log trap2 <2>:                         chapter.            (line 1846)
+* log trap2 <1>:                         chapter.            (line 1017)
+* log trap2 <2>:                         chapter.            (line 1848)
 * machin:                                chapter.            (line  324)
 * machin <1>:                            chapter.            (line  326)
-* machin <2>:                            chapter.            (line  663)
-* machin <3>:                            chapter.            (line  664)
-* machin <4>:                            chapter.            (line  665)
-* machin <5>:                            chapter.            (line  666)
-* machin <6>:                            chapter.            (line 1020)
-* machin <7>:                            chapter.            (line 1022)
-* machin <8>:                            chapter.            (line 1359)
-* machin <9>:                            chapter.            (line 1360)
-* machin <10>:                           chapter.            (line 1361)
-* machin <11>:                           chapter.            (line 1362)
-* machin <12>:                           chapter.            (line 1850)
-* machin <13>:                           chapter.            (line 1852)
-* machin <14>:                           chapter.            (line 2224)
-* machin <15>:                           chapter.            (line 2225)
-* machin <16>:                           chapter.            (line 2226)
-* machin <17>:                           chapter.            (line 2227)
+* machin <2>:                            chapter.            (line  664)
+* machin <3>:                            chapter.            (line  665)
+* machin <4>:                            chapter.            (line  666)
+* machin <5>:                            chapter.            (line  667)
+* machin <6>:                            chapter.            (line 1021)
+* machin <7>:                            chapter.            (line 1023)
+* machin <8>:                            chapter.            (line 1361)
+* machin <9>:                            chapter.            (line 1362)
+* machin <10>:                           chapter.            (line 1363)
+* machin <11>:                           chapter.            (line 1364)
+* machin <12>:                           chapter.            (line 1852)
+* machin <13>:                           chapter.            (line 1854)
+* machin <14>:                           chapter.            (line 2227)
+* machin <15>:                           chapter.            (line 2228)
+* machin <16>:                           chapter.            (line 2229)
+* machin <17>:                           chapter.            (line 2230)
 * n--ame:                                chapter.            (line  345)
 * n--ame <1>:                            chapter.            (line  348)
-* n--ame <2>:                            chapter.            (line 1041)
-* n--ame <3>:                            chapter.            (line 1044)
-* n--ame <4>:                            chapter.            (line 1873)
-* n--ame <5>:                            chapter.            (line 1876)
+* n--ame <2>:                            chapter.            (line 1042)
+* n--ame <3>:                            chapter.            (line 1045)
+* n--ame <4>:                            chapter.            (line 1875)
+* n--ame <5>:                            chapter.            (line 1878)
 * name2:                                 chapter.            (line  423)
-* name2 <1>:                             chapter.            (line 1119)
-* name2 <2>:                             chapter.            (line 1952)
-* t--ruc:                                chapter.            (line 2278)
-* T--ruc:                                chapter.            (line 2278)
+* name2 <1>:                             chapter.            (line 1120)
+* name2 <2>:                             chapter.            (line 1954)
+* t--ruc:                                chapter.            (line 2281)
+* T--ruc:                                chapter.            (line 2281)
 * truc:                                  chapter.            (line  317)
 * truc <1>:                              chapter.            (line  339)
-* truc <2>:                              chapter.            (line 1013)
-* truc <3>:                              chapter.            (line 1035)
-* truc <4>:                              chapter.            (line 1843)
-* truc <5>:                              chapter.            (line 1866)
-* xxx, zzz:                              chapter.            (line 2278)
+* truc <2>:                              chapter.            (line 1014)
+* truc <3>:                              chapter.            (line 1036)
+* truc <4>:                              chapter.            (line 1845)
+* truc <5>:                              chapter.            (line 1868)
+* xxx, zzz:                              chapter.            (line 2281)
 
    vr
 
@@ -3319,8 +3323,8 @@ aaa"]
 * Menu:
 
 * d--eftp_name:                          chapter.            (line  384)
-* d--eftp_name <1>:                      chapter.            (line 1080)
-* d--eftp_name <2>:                      chapter.            (line 1912)
+* d--eftp_name <1>:                      chapter.            (line 1081)
+* d--eftp_name <2>:                      chapter.            (line 1914)
 
    (8)
 
@@ -3402,305 +3406,305 @@ chapter 2
 * Menu:
 
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  724)
-* -option <2>:                           chapter.            (line 1431)
-* ?:                                     chapter.            (line 2278)
-* .:                                     chapter.            (line 2278)
+* -option <1>:                           chapter.            (line  725)
+* -option <2>:                           chapter.            (line 1433)
+* ?:                                     chapter.            (line 2281)
+* .:                                     chapter.            (line 2281)
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  724)
-* " <2>:                                 chapter.            (line 1431)
-* a:                                     chapter.            (line 2278)
-* aaa, bbb:                              chapter.            (line 2278)
-* a--a:                                  chapter.            (line 2278)
+* " <1>:                                 chapter.            (line  725)
+* " <2>:                                 chapter.            (line 1433)
+* a:                                     chapter.            (line 2281)
+* aaa, bbb:                              chapter.            (line 2281)
+* a--a:                                  chapter.            (line 2281)
 * a--asis:                               chapter.            (line  525)
-* a--asis <1>:                           chapter.            (line 1221)
-* a--asis <2>:                           chapter.            (line 2053)
+* a--asis <1>:                           chapter.            (line 1222)
+* a--asis <2>:                           chapter.            (line 2055)
 * b:                                     chapter.            (line  526)
-* b <1>:                                 chapter.            (line 1222)
-* b <2>:                                 chapter.            (line 2054)
-* b--b, c--c:                            chapter.            (line 2278)
-* counting entry:                        chapter.            (line 2627)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2278)
+* b <1>:                                 chapter.            (line 1223)
+* b <2>:                                 chapter.            (line 2056)
+* b--b, c--c:                            chapter.            (line 2281)
+* counting entry:                        chapter.            (line 2630)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2281)
 * d--efcv_name:                          chapter.            (line  366)
 * d--efcv_name <1>:                      chapter.            (line  369)
-* d--efcv_name <2>:                      chapter.            (line 1062)
-* d--efcv_name <3>:                      chapter.            (line 1065)
-* d--efcv_name <4>:                      chapter.            (line 1894)
-* d--efcv_name <5>:                      chapter.            (line 1897)
+* d--efcv_name <2>:                      chapter.            (line 1063)
+* d--efcv_name <3>:                      chapter.            (line 1066)
+* d--efcv_name <4>:                      chapter.            (line 1896)
+* d--efcv_name <5>:                      chapter.            (line 1899)
 * d--efivar_name de c--lass:             chapter.            (line  411)
-* d--efivar_name de c--lass <1>:         chapter.            (line 1107)
-* d--efivar_name de c--lass <2>:         chapter.            (line 1939)
+* d--efivar_name de c--lass <1>:         chapter.            (line 1108)
+* d--efivar_name de c--lass <2>:         chapter.            (line 1941)
 * d--efopt_name:                         chapter.            (line  402)
-* d--efopt_name <1>:                     chapter.            (line 1098)
-* d--efopt_name <2>:                     chapter.            (line 1930)
+* d--efopt_name <1>:                     chapter.            (line 1099)
+* d--efopt_name <2>:                     chapter.            (line 1932)
 * d--eftypecv_name de c--lass:           chapter.            (line  372)
 * d--eftypecv_name de c--lass <1>:       chapter.            (line  375)
-* d--eftypecv_name de c--lass <2>:       chapter.            (line 1068)
-* d--eftypecv_name de c--lass <3>:       chapter.            (line 1071)
-* d--eftypecv_name de c--lass <4>:       chapter.            (line 1900)
-* d--eftypecv_name de c--lass <5>:       chapter.            (line 1903)
+* d--eftypecv_name de c--lass <2>:       chapter.            (line 1069)
+* d--eftypecv_name de c--lass <3>:       chapter.            (line 1072)
+* d--eftypecv_name de c--lass <4>:       chapter.            (line 1902)
+* d--eftypecv_name de c--lass <5>:       chapter.            (line 1905)
 * d--eftypecv_name2 de c--lass2:         chapter.            (line  443)
 * d--eftypecv_name2 de c--lass2 <1>:     chapter.            (line  446)
-* d--eftypecv_name2 de c--lass2 <2>:     chapter.            (line 1139)
-* d--eftypecv_name2 de c--lass2 <3>:     chapter.            (line 1142)
-* d--eftypecv_name2 de c--lass2 <4>:     chapter.            (line 1972)
-* d--eftypecv_name2 de c--lass2 <5>:     chapter.            (line 1975)
+* d--eftypecv_name2 de c--lass2 <2>:     chapter.            (line 1140)
+* d--eftypecv_name2 de c--lass2 <3>:     chapter.            (line 1143)
+* d--eftypecv_name2 de c--lass2 <4>:     chapter.            (line 1974)
+* d--eftypecv_name2 de c--lass2 <5>:     chapter.            (line 1977)
 * d--eftypeivar_name de c--lass:         chapter.            (line  414)
-* d--eftypeivar_name de c--lass <1>:     chapter.            (line 1110)
-* d--eftypeivar_name de c--lass <2>:     chapter.            (line 1942)
+* d--eftypeivar_name de c--lass <1>:     chapter.            (line 1111)
+* d--eftypeivar_name de c--lass <2>:     chapter.            (line 1944)
 * d--eftypevar_name:                     chapter.            (line  408)
-* d--eftypevar_name <1>:                 chapter.            (line 1104)
-* d--eftypevar_name <2>:                 chapter.            (line 1936)
+* d--eftypevar_name <1>:                 chapter.            (line 1105)
+* d--eftypevar_name <2>:                 chapter.            (line 1938)
 * d--eftypevr_name:                      chapter.            (line  363)
-* d--eftypevr_name <1>:                  chapter.            (line 1059)
-* d--eftypevr_name <2>:                  chapter.            (line 1891)
+* d--eftypevr_name <1>:                  chapter.            (line 1060)
+* d--eftypevr_name <2>:                  chapter.            (line 1893)
 * d--efvar_name:                         chapter.            (line  396)
 * d--efvar_name <1>:                     chapter.            (line  399)
-* d--efvar_name <2>:                     chapter.            (line 1092)
-* d--efvar_name <3>:                     chapter.            (line 1095)
-* d--efvar_name <4>:                     chapter.            (line 1924)
-* d--efvar_name <5>:                     chapter.            (line 1927)
+* d--efvar_name <2>:                     chapter.            (line 1093)
+* d--efvar_name <3>:                     chapter.            (line 1096)
+* d--efvar_name <4>:                     chapter.            (line 1926)
+* d--efvar_name <5>:                     chapter.            (line 1929)
 * d--efvr_name:                          chapter.            (line  342)
-* d--efvr_name <1>:                      chapter.            (line 1038)
-* d--efvr_name <2>:                      chapter.            (line 1870)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2278)
+* d--efvr_name <1>:                      chapter.            (line 1039)
+* d--efvr_name <2>:                      chapter.            (line 1872)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2281)
 * index entry between item and itemx:    chapter.            (line  530)
-* index entry between item and itemx <1>: chapter.           (line  659)
-* index entry between item and itemx <2>: chapter.           (line 1226)
-* index entry between item and itemx <3>: chapter.           (line 1355)
-* index entry between item and itemx <4>: chapter.           (line 2058)
-* index entry between item and itemx <5>: chapter.           (line 2220)
-* index entry in footnote:               chapter.            (line 2622)
+* index entry between item and itemx <1>: chapter.           (line  660)
+* index entry between item and itemx <2>: chapter.           (line 1227)
+* index entry between item and itemx <3>: chapter.           (line 1357)
+* index entry between item and itemx <4>: chapter.           (line 2060)
+* index entry between item and itemx <5>: chapter.           (line 2223)
+* index entry in footnote:               chapter.            (line 2625)
 * index entry within deffn:              chapter.            (line  317)
-* index entry within deffn <1>:          chapter.            (line 1013)
-* index entry within deffn <2>:          chapter.            (line 1843)
+* index entry within deffn <1>:          chapter.            (line 1014)
+* index entry within deffn <2>:          chapter.            (line 1845)
 * index entry within itemize:            chapter.            (line  228)
-* index entry within itemize <1>:        chapter.            (line  924)
-* index entry within itemize <2>:        chapter.            (line 1754)
+* index entry within itemize <1>:        chapter.            (line  925)
+* index entry within itemize <2>:        chapter.            (line 1756)
 * index entry within multitable:         chapter.            (line  250)
-* index entry within multitable <1>:     chapter.            (line  946)
-* index entry within multitable <2>:     chapter.            (line 1777)
-* t-ruc:                                 chapter.            (line 2278)
-* T-ruc:                                 chapter.            (line 2278)
+* index entry within multitable <1>:     chapter.            (line  947)
+* index entry within multitable <2>:     chapter.            (line 1779)
+* t-ruc:                                 chapter.            (line 2281)
+* T-ruc:                                 chapter.            (line 2281)
 * vtable i--tem code kbdinputstyle:      chapter.            (line  152)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  848)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1677)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  849)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1679)
 * vtable i--tem default kbdinputstyle:   chapter.            (line  147)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  843)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1672)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  844)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1674)
 * vtable i--tem distinct kbdinputstyle:  chapter.            (line  162)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  858)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1687)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  859)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1689)
 * vtable i--tem example kbdinputstyle:   chapter.            (line  157)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  853)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1682)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  854)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1684)
 * vtable i--tem in example code kbdinputstyle: chapter.      (line  154)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  850)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1679)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  851)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1681)
 * vtable i--tem in example default kbdinputstyle: chapter.   (line  149)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  845)
+                                                             (line  846)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1674)
+                                                             (line 1676)
 * vtable i--tem in example distinct kbdinputstyle: chapter.  (line  164)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  860)
+                                                             (line  861)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1689)
+                                                             (line 1691)
 * vtable i--tem in example example kbdinputstyle: chapter.   (line  159)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  855)
+                                                             (line  856)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1684)
+                                                             (line 1686)
 
 [index]
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  724)
-* --foption <2>:                         chapter.            (line 1431)
-* ?:                                     chapter.            (line 2278)
-* .:                                     chapter.            (line 2278)
+* --foption <1>:                         chapter.            (line  725)
+* --foption <2>:                         chapter.            (line 1433)
+* ?:                                     chapter.            (line 2281)
+* .:                                     chapter.            (line 2281)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  724)
-* `` <2>:                                chapter.            (line 1431)
+* `` <1>:                                chapter.            (line  725)
+* `` <2>:                                chapter.            (line 1433)
 * a:                                     chapter.            (line  330)
 * a <1>:                                 chapter.            (line  529)
-* a <2>:                                 chapter.            (line  658)
-* a <3>:                                 chapter.            (line 1026)
-* a <4>:                                 chapter.            (line 1225)
-* a <5>:                                 chapter.            (line 1354)
-* a <6>:                                 chapter.            (line 1856)
-* a <7>:                                 chapter.            (line 2057)
-* a <8>:                                 chapter.            (line 2219)
-* a <9>:                                 chapter.            (line 2278)
-* after:                                 chapter.            (line  669)
-* after <1>:                             chapter.            (line 1365)
-* after <2>:                             chapter.            (line 2230)
+* a <2>:                                 chapter.            (line  659)
+* a <3>:                                 chapter.            (line 1027)
+* a <4>:                                 chapter.            (line 1226)
+* a <5>:                                 chapter.            (line 1356)
+* a <6>:                                 chapter.            (line 1858)
+* a <7>:                                 chapter.            (line 2059)
+* a <8>:                                 chapter.            (line 2222)
+* a <9>:                                 chapter.            (line 2281)
+* after:                                 chapter.            (line  670)
+* after <1>:                             chapter.            (line 1367)
+* after <2>:                             chapter.            (line 2233)
 * arg2:                                  chapter.            (line  449)
-* arg2 <1>:                              chapter.            (line 1145)
-* arg2 <2>:                              chapter.            (line 1979)
+* arg2 <1>:                              chapter.            (line 1146)
+* arg2 <2>:                              chapter.            (line 1981)
 * b:                                     chapter.            (line  530)
-* b <1>:                                 chapter.            (line  659)
-* b <2>:                                 chapter.            (line 1226)
-* b <3>:                                 chapter.            (line 1355)
-* b <4>:                                 chapter.            (line 2058)
-* b <5>:                                 chapter.            (line 2220)
+* b <1>:                                 chapter.            (line  660)
+* b <2>:                                 chapter.            (line 1227)
+* b <3>:                                 chapter.            (line 1357)
+* b <4>:                                 chapter.            (line 2060)
+* b <5>:                                 chapter.            (line 2223)
 * bidule machin:                         chapter.            (line  325)
-* bidule machin <1>:                     chapter.            (line 1021)
-* bidule machin <2>:                     chapter.            (line 1851)
+* bidule machin <1>:                     chapter.            (line 1022)
+* bidule machin <2>:                     chapter.            (line 1853)
 * d--effn_name:                          chapter.            (line  309)
-* d--effn_name <1>:                      chapter.            (line 1005)
-* d--effn_name <2>:                      chapter.            (line 1835)
+* d--effn_name <1>:                      chapter.            (line 1006)
+* d--effn_name <2>:                      chapter.            (line 1837)
 * d--efmac_name:                         chapter.            (line  390)
-* d--efmac_name <1>:                     chapter.            (line 1086)
-* d--efmac_name <2>:                     chapter.            (line 1918)
+* d--efmac_name <1>:                     chapter.            (line 1087)
+* d--efmac_name <2>:                     chapter.            (line 1920)
 * d--efmethod_name de c--lass:           chapter.            (line  417)
-* d--efmethod_name de c--lass <1>:       chapter.            (line 1113)
-* d--efmethod_name de c--lass <2>:       chapter.            (line 1945)
+* d--efmethod_name de c--lass <1>:       chapter.            (line 1114)
+* d--efmethod_name de c--lass <2>:       chapter.            (line 1947)
 * d--efop_name de c--lass:               chapter.            (line  378)
 * d--efop_name de c--lass <1>:           chapter.            (line  381)
-* d--efop_name de c--lass <2>:           chapter.            (line 1074)
-* d--efop_name de c--lass <3>:           chapter.            (line 1077)
-* d--efop_name de c--lass <4>:           chapter.            (line 1906)
-* d--efop_name de c--lass <5>:           chapter.            (line 1909)
+* d--efop_name de c--lass <2>:           chapter.            (line 1075)
+* d--efop_name de c--lass <3>:           chapter.            (line 1078)
+* d--efop_name de c--lass <4>:           chapter.            (line 1908)
+* d--efop_name de c--lass <5>:           chapter.            (line 1911)
 * d--efspec_name:                        chapter.            (line  393)
-* d--efspec_name <1>:                    chapter.            (line 1089)
-* d--efspec_name <2>:                    chapter.            (line 1921)
+* d--efspec_name <1>:                    chapter.            (line 1090)
+* d--efspec_name <2>:                    chapter.            (line 1923)
 * d--eftypefn_name:                      chapter.            (line  351)
 * d--eftypefn_name <1>:                  chapter.            (line  354)
-* d--eftypefn_name <2>:                  chapter.            (line 1047)
-* d--eftypefn_name <3>:                  chapter.            (line 1050)
-* d--eftypefn_name <4>:                  chapter.            (line 1879)
-* d--eftypefn_name <5>:                  chapter.            (line 1882)
+* d--eftypefn_name <2>:                  chapter.            (line 1048)
+* d--eftypefn_name <3>:                  chapter.            (line 1051)
+* d--eftypefn_name <4>:                  chapter.            (line 1881)
+* d--eftypefn_name <5>:                  chapter.            (line 1884)
 * d--eftypefn_name2:                     chapter.            (line  428)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1124)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1957)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1125)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1959)
 * d--eftypefun_name:                     chapter.            (line  405)
-* d--eftypefun_name <1>:                 chapter.            (line 1101)
-* d--eftypefun_name <2>:                 chapter.            (line 1933)
+* d--eftypefun_name <1>:                 chapter.            (line 1102)
+* d--eftypefun_name <2>:                 chapter.            (line 1935)
 * d--eftypemethod_name de c--lass:       chapter.            (line  420)
-* d--eftypemethod_name de c--lass <1>:   chapter.            (line 1116)
-* d--eftypemethod_name de c--lass <2>:   chapter.            (line 1948)
+* d--eftypemethod_name de c--lass <1>:   chapter.            (line 1117)
+* d--eftypemethod_name de c--lass <2>:   chapter.            (line 1950)
 * d--eftypeop_name de c--lass:           chapter.            (line  357)
 * d--eftypeop_name de c--lass <1>:       chapter.            (line  360)
-* d--eftypeop_name de c--lass <2>:       chapter.            (line 1053)
-* d--eftypeop_name de c--lass <3>:       chapter.            (line 1056)
-* d--eftypeop_name de c--lass <4>:       chapter.            (line 1885)
-* d--eftypeop_name de c--lass <5>:       chapter.            (line 1888)
+* d--eftypeop_name de c--lass <2>:       chapter.            (line 1054)
+* d--eftypeop_name de c--lass <3>:       chapter.            (line 1057)
+* d--eftypeop_name de c--lass <4>:       chapter.            (line 1887)
+* d--eftypeop_name de c--lass <5>:       chapter.            (line 1890)
 * d--eftypeop_name2 de c--lass2:         chapter.            (line  433)
 * d--eftypeop_name2 de c--lass2 <1>:     chapter.            (line  438)
-* d--eftypeop_name2 de c--lass2 <2>:     chapter.            (line 1129)
-* d--eftypeop_name2 de c--lass2 <3>:     chapter.            (line 1134)
-* d--eftypeop_name2 de c--lass2 <4>:     chapter.            (line 1962)
-* d--eftypeop_name2 de c--lass2 <5>:     chapter.            (line 1967)
+* d--eftypeop_name2 de c--lass2 <2>:     chapter.            (line 1130)
+* d--eftypeop_name2 de c--lass2 <3>:     chapter.            (line 1135)
+* d--eftypeop_name2 de c--lass2 <4>:     chapter.            (line 1964)
+* d--eftypeop_name2 de c--lass2 <5>:     chapter.            (line 1969)
 * d--efun_name:                          chapter.            (line  387)
-* d--efun_name <1>:                      chapter.            (line 1083)
-* d--efun_name <2>:                      chapter.            (line 1915)
+* d--efun_name <1>:                      chapter.            (line 1084)
+* d--efun_name <2>:                      chapter.            (line 1917)
 * de--ffn_name:                          chapter.            (line  312)
-* de--ffn_name <1>:                      chapter.            (line 1008)
-* de--ffn_name <2>:                      chapter.            (line 1838)
+* de--ffn_name <1>:                      chapter.            (line 1009)
+* de--ffn_name <2>:                      chapter.            (line 1840)
 * deffn:                                 chapter.            (line  333)
 * deffn <1>:                             chapter.            (line  335)
-* deffn <2>:                             chapter.            (line 1029)
-* deffn <3>:                             chapter.            (line 1031)
-* deffn <4>:                             chapter.            (line 1860)
-* deffn <5>:                             chapter.            (line 1862)
+* deffn <2>:                             chapter.            (line 1030)
+* deffn <3>:                             chapter.            (line 1032)
+* deffn <4>:                             chapter.            (line 1862)
+* deffn <5>:                             chapter.            (line 1864)
 * deffnx:                                chapter.            (line  331)
 * deffnx <1>:                            chapter.            (line  336)
-* deffnx <2>:                            chapter.            (line 1027)
-* deffnx <3>:                            chapter.            (line 1032)
-* deffnx <4>:                            chapter.            (line 1857)
-* deffnx <5>:                            chapter.            (line 1863)
-* f---aa:                                chapter.            (line 2278)
-* f---bb, f---cc:                        chapter.            (line 2278)
-* f---ddd, f---eee, ffff:                chapter.            (line 2278)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2278)
+* deffnx <2>:                            chapter.            (line 1028)
+* deffnx <3>:                            chapter.            (line 1033)
+* deffnx <4>:                            chapter.            (line 1859)
+* deffnx <5>:                            chapter.            (line 1865)
+* f---aa:                                chapter.            (line 2281)
+* f---bb, f---cc:                        chapter.            (line 2281)
+* f---ddd, f---eee, ffff:                chapter.            (line 2281)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2281)
 * followed:                              chapter.            (line  328)
-* followed <1>:                          chapter.            (line  667)
-* followed <2>:                          chapter.            (line 1024)
-* followed <3>:                          chapter.            (line 1363)
-* followed <4>:                          chapter.            (line 1854)
-* followed <5>:                          chapter.            (line 2228)
+* followed <1>:                          chapter.            (line  668)
+* followed <2>:                          chapter.            (line 1025)
+* followed <3>:                          chapter.            (line 1365)
+* followed <4>:                          chapter.            (line 1856)
+* followed <5>:                          chapter.            (line 2231)
 * I:                                     chapter.            (line  316)
 * I <1>:                                 chapter.            (line  338)
-* I <2>:                                 chapter.            (line 1012)
-* I <3>:                                 chapter.            (line 1034)
-* I <4>:                                 chapter.            (line 1842)
-* I <5>:                                 chapter.            (line 1865)
+* I <2>:                                 chapter.            (line 1013)
+* I <3>:                                 chapter.            (line 1035)
+* I <4>:                                 chapter.            (line 1844)
+* I <5>:                                 chapter.            (line 1867)
 * id i ule:                              chapter.            (line  322)
-* id i ule <1>:                          chapter.            (line 1018)
-* id i ule <2>:                          chapter.            (line 1848)
+* id i ule <1>:                          chapter.            (line 1019)
+* id i ule <2>:                          chapter.            (line 1850)
 * id ule:                                chapter.            (line  321)
-* id ule <1>:                            chapter.            (line 1017)
-* id ule <2>:                            chapter.            (line 1847)
-* INVALID:                               chapter.            (line  671)
-* INVALID <1>:                           chapter.            (line 1367)
-* INVALID <2>:                           chapter.            (line 2232)
+* id ule <1>:                            chapter.            (line 1018)
+* id ule <2>:                            chapter.            (line 1849)
+* INVALID:                               chapter.            (line  672)
+* INVALID <1>:                           chapter.            (line 1369)
+* INVALID <2>:                           chapter.            (line 2235)
 * log trap:                              chapter.            (line  318)
-* log trap <1>:                          chapter.            (line 1014)
-* log trap <2>:                          chapter.            (line 1844)
+* log trap <1>:                          chapter.            (line 1015)
+* log trap <2>:                          chapter.            (line 1846)
 * log trap1:                             chapter.            (line  319)
-* log trap1 <1>:                         chapter.            (line 1015)
-* log trap1 <2>:                         chapter.            (line 1845)
+* log trap1 <1>:                         chapter.            (line 1016)
+* log trap1 <2>:                         chapter.            (line 1847)
 * log trap2:                             chapter.            (line  320)
-* log trap2 <1>:                         chapter.            (line 1016)
-* log trap2 <2>:                         chapter.            (line 1846)
+* log trap2 <1>:                         chapter.            (line 1017)
+* log trap2 <2>:                         chapter.            (line 1848)
 * machin:                                chapter.            (line  324)
 * machin <1>:                            chapter.            (line  326)
-* machin <2>:                            chapter.            (line  663)
-* machin <3>:                            chapter.            (line  664)
-* machin <4>:                            chapter.            (line  665)
-* machin <5>:                            chapter.            (line  666)
-* machin <6>:                            chapter.            (line 1020)
-* machin <7>:                            chapter.            (line 1022)
-* machin <8>:                            chapter.            (line 1359)
-* machin <9>:                            chapter.            (line 1360)
-* machin <10>:                           chapter.            (line 1361)
-* machin <11>:                           chapter.            (line 1362)
-* machin <12>:                           chapter.            (line 1850)
-* machin <13>:                           chapter.            (line 1852)
-* machin <14>:                           chapter.            (line 2224)
-* machin <15>:                           chapter.            (line 2225)
-* machin <16>:                           chapter.            (line 2226)
-* machin <17>:                           chapter.            (line 2227)
+* machin <2>:                            chapter.            (line  664)
+* machin <3>:                            chapter.            (line  665)
+* machin <4>:                            chapter.            (line  666)
+* machin <5>:                            chapter.            (line  667)
+* machin <6>:                            chapter.            (line 1021)
+* machin <7>:                            chapter.            (line 1023)
+* machin <8>:                            chapter.            (line 1361)
+* machin <9>:                            chapter.            (line 1362)
+* machin <10>:                           chapter.            (line 1363)
+* machin <11>:                           chapter.            (line 1364)
+* machin <12>:                           chapter.            (line 1852)
+* machin <13>:                           chapter.            (line 1854)
+* machin <14>:                           chapter.            (line 2227)
+* machin <15>:                           chapter.            (line 2228)
+* machin <16>:                           chapter.            (line 2229)
+* machin <17>:                           chapter.            (line 2230)
 * n--ame:                                chapter.            (line  345)
 * n--ame <1>:                            chapter.            (line  348)
-* n--ame <2>:                            chapter.            (line 1041)
-* n--ame <3>:                            chapter.            (line 1044)
-* n--ame <4>:                            chapter.            (line 1873)
-* n--ame <5>:                            chapter.            (line 1876)
+* n--ame <2>:                            chapter.            (line 1042)
+* n--ame <3>:                            chapter.            (line 1045)
+* n--ame <4>:                            chapter.            (line 1875)
+* n--ame <5>:                            chapter.            (line 1878)
 * name2:                                 chapter.            (line  423)
-* name2 <1>:                             chapter.            (line 1119)
-* name2 <2>:                             chapter.            (line 1952)
-* t--ruc:                                chapter.            (line 2278)
-* T--ruc:                                chapter.            (line 2278)
+* name2 <1>:                             chapter.            (line 1120)
+* name2 <2>:                             chapter.            (line 1954)
+* t--ruc:                                chapter.            (line 2281)
+* T--ruc:                                chapter.            (line 2281)
 * truc:                                  chapter.            (line  317)
 * truc <1>:                              chapter.            (line  339)
-* truc <2>:                              chapter.            (line 1013)
-* truc <3>:                              chapter.            (line 1035)
-* truc <4>:                              chapter.            (line 1843)
-* truc <5>:                              chapter.            (line 1866)
-* xxx, zzz:                              chapter.            (line 2278)
+* truc <2>:                              chapter.            (line 1014)
+* truc <3>:                              chapter.            (line 1036)
+* truc <4>:                              chapter.            (line 1845)
+* truc <5>:                              chapter.            (line 1868)
+* xxx, zzz:                              chapter.            (line 2281)
 
 
 Tag Table:
-Node: Top20224
-Node: chapter20409
-Ref: chapter-Footnote-1102946
-Ref: chapter-Footnote-2102966
-Ref: chapter-Footnote-3102987
-Ref: chapter-Footnote-4103007
-Ref: chapter-Footnote-5103028
-Ref: chapter-Footnote-6103048
-Ref: chapter-Footnote-7103069
-Ref: chapter-Footnote-8103107
-Node: s--ect,ion103127
-Node: subsection103330
-Ref: anchor103511
-Node: subsubsection ``simple-double--103511
-Node: subsubsection three---four----''103711
-Node: chapter2103883
+Node: Top20225
+Node: chapter20410
+Ref: chapter-Footnote-1102950
+Ref: chapter-Footnote-2102970
+Ref: chapter-Footnote-3102991
+Ref: chapter-Footnote-4103011
+Ref: chapter-Footnote-5103032
+Ref: chapter-Footnote-6103052
+Ref: chapter-Footnote-7103073
+Ref: chapter-Footnote-8103111
+Node: s--ect,ion103131
+Node: subsection103334
+Ref: anchor103515
+Node: subsubsection ``simple-double--103515
+Node: subsubsection three---four----''103715
+Node: chapter2103887
 
 End Tag Table
 
diff --git 
a/tp/tests/layout/res_parser/formatting_info_ascii_punctuation/formatting.info 
b/tp/tests/layout/res_parser/formatting_info_ascii_punctuation/formatting.info
index d09e4cf232..8cc1f0eae9 100644
--- 
a/tp/tests/layout/res_parser/formatting_info_ascii_punctuation/formatting.info
+++ 
b/tp/tests/layout/res_parser/formatting_info_ascii_punctuation/formatting.info
@@ -618,6 +618,7 @@ aaa"]
 aaa"]
 '@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}' [altjk _" %@]
 
+
 ü Ü ñ â é ō ì é Ḕ
 Ḉ Ḉ a̋ ȧ å a͡
 ă ǎ
@@ -1357,6 +1358,7 @@ aaa"]
 aaa"]
 '@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}' [altjk _" %@]
 
+
 ü Ü ñ â é ō ì é Ḕ
 Ḉ Ḉ a̋ ȧ å a͡
 ă ǎ
@@ -2053,6 +2055,7 @@ aaa"]
 aaa"]
 '@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}' [altjk _" %@]
 
+
 ü Ü ñ â é ō ì é Ḕ
 Ḉ Ḉ a̋ ȧ å a͡
 ă ǎ
@@ -2918,6 +2921,7 @@ aaa"]
 
 
 
+
      ü Ü ñ â é ō ì é Ḕ
      Ḉ Ḉ a̋ ȧ å a͡
      ă ǎ
@@ -3009,14 +3013,14 @@ aaa"]
 [index]
 * Menu:
 
-* truc:                                  chapter.            (line 2278)
+* truc:                                  chapter.            (line 2281)
 
    codeidx
 
 [index]
 * Menu:
 
-* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2278)
+* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2281)
 
    cp
 
@@ -3024,116 +3028,116 @@ aaa"]
 * Menu:
 
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  724)
-* -option <2>:                           chapter.            (line 1431)
-* ?:                                     chapter.            (line 2278)
-* .:                                     chapter.            (line 2278)
+* -option <1>:                           chapter.            (line  725)
+* -option <2>:                           chapter.            (line 1433)
+* ?:                                     chapter.            (line 2281)
+* .:                                     chapter.            (line 2281)
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  724)
-* " <2>:                                 chapter.            (line 1431)
-* a:                                     chapter.            (line 2278)
-* aaa, bbb:                              chapter.            (line 2278)
-* a--a:                                  chapter.            (line 2278)
+* " <1>:                                 chapter.            (line  725)
+* " <2>:                                 chapter.            (line 1433)
+* a:                                     chapter.            (line 2281)
+* aaa, bbb:                              chapter.            (line 2281)
+* a--a:                                  chapter.            (line 2281)
 * a--asis:                               chapter.            (line  525)
-* a--asis <1>:                           chapter.            (line 1221)
-* a--asis <2>:                           chapter.            (line 2053)
+* a--asis <1>:                           chapter.            (line 1222)
+* a--asis <2>:                           chapter.            (line 2055)
 * b:                                     chapter.            (line  526)
-* b <1>:                                 chapter.            (line 1222)
-* b <2>:                                 chapter.            (line 2054)
-* b--b, c--c:                            chapter.            (line 2278)
+* b <1>:                                 chapter.            (line 1223)
+* b <2>:                                 chapter.            (line 2056)
+* b--b, c--c:                            chapter.            (line 2281)
 * counting entry:                        chapter.            (line    4)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2278)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2281)
 * d--efcv_name:                          chapter.            (line  366)
 * d--efcv_name <1>:                      chapter.            (line  369)
-* d--efcv_name <2>:                      chapter.            (line 1062)
-* d--efcv_name <3>:                      chapter.            (line 1065)
-* d--efcv_name <4>:                      chapter.            (line 1894)
-* d--efcv_name <5>:                      chapter.            (line 1897)
+* d--efcv_name <2>:                      chapter.            (line 1063)
+* d--efcv_name <3>:                      chapter.            (line 1066)
+* d--efcv_name <4>:                      chapter.            (line 1896)
+* d--efcv_name <5>:                      chapter.            (line 1899)
 * d--efivar_name of c--lass:             chapter.            (line  411)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1107)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1939)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1108)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1941)
 * d--efopt_name:                         chapter.            (line  402)
-* d--efopt_name <1>:                     chapter.            (line 1098)
-* d--efopt_name <2>:                     chapter.            (line 1930)
+* d--efopt_name <1>:                     chapter.            (line 1099)
+* d--efopt_name <2>:                     chapter.            (line 1932)
 * d--eftypecv_name of c--lass:           chapter.            (line  372)
 * d--eftypecv_name of c--lass <1>:       chapter.            (line  375)
-* d--eftypecv_name of c--lass <2>:       chapter.            (line 1068)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1071)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1900)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1903)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1069)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1072)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1902)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1905)
 * d--eftypecv_name2 of c--lass2:         chapter.            (line  443)
 * d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  446)
-* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1139)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1142)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1972)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1975)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1140)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1143)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1974)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1977)
 * d--eftypeivar_name of c--lass:         chapter.            (line  414)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1110)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1942)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1111)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1944)
 * d--eftypevar_name:                     chapter.            (line  408)
-* d--eftypevar_name <1>:                 chapter.            (line 1104)
-* d--eftypevar_name <2>:                 chapter.            (line 1936)
+* d--eftypevar_name <1>:                 chapter.            (line 1105)
+* d--eftypevar_name <2>:                 chapter.            (line 1938)
 * d--eftypevr_name:                      chapter.            (line  363)
-* d--eftypevr_name <1>:                  chapter.            (line 1059)
-* d--eftypevr_name <2>:                  chapter.            (line 1891)
+* d--eftypevr_name <1>:                  chapter.            (line 1060)
+* d--eftypevr_name <2>:                  chapter.            (line 1893)
 * d--efvar_name:                         chapter.            (line  396)
 * d--efvar_name <1>:                     chapter.            (line  399)
-* d--efvar_name <2>:                     chapter.            (line 1092)
-* d--efvar_name <3>:                     chapter.            (line 1095)
-* d--efvar_name <4>:                     chapter.            (line 1924)
-* d--efvar_name <5>:                     chapter.            (line 1927)
+* d--efvar_name <2>:                     chapter.            (line 1093)
+* d--efvar_name <3>:                     chapter.            (line 1096)
+* d--efvar_name <4>:                     chapter.            (line 1926)
+* d--efvar_name <5>:                     chapter.            (line 1929)
 * d--efvr_name:                          chapter.            (line  342)
-* d--efvr_name <1>:                      chapter.            (line 1038)
-* d--efvr_name <2>:                      chapter.            (line 1870)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2278)
+* d--efvr_name <1>:                      chapter.            (line 1039)
+* d--efvr_name <2>:                      chapter.            (line 1872)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2281)
 * index entry between item and itemx:    chapter.            (line  530)
-* index entry between item and itemx <1>: chapter.           (line  659)
-* index entry between item and itemx <2>: chapter.           (line 1226)
-* index entry between item and itemx <3>: chapter.           (line 1355)
-* index entry between item and itemx <4>: chapter.           (line 2058)
-* index entry between item and itemx <5>: chapter.           (line 2220)
+* index entry between item and itemx <1>: chapter.           (line  660)
+* index entry between item and itemx <2>: chapter.           (line 1227)
+* index entry between item and itemx <3>: chapter.           (line 1357)
+* index entry between item and itemx <4>: chapter.           (line 2060)
+* index entry between item and itemx <5>: chapter.           (line 2223)
 * index entry in footnote:               chapter.            (line    4)
 * index entry within deffn:              chapter.            (line  317)
-* index entry within deffn <1>:          chapter.            (line 1013)
-* index entry within deffn <2>:          chapter.            (line 1843)
+* index entry within deffn <1>:          chapter.            (line 1014)
+* index entry within deffn <2>:          chapter.            (line 1845)
 * index entry within itemize:            chapter.            (line  228)
-* index entry within itemize <1>:        chapter.            (line  924)
-* index entry within itemize <2>:        chapter.            (line 1754)
+* index entry within itemize <1>:        chapter.            (line  925)
+* index entry within itemize <2>:        chapter.            (line 1756)
 * index entry within multitable:         chapter.            (line  250)
-* index entry within multitable <1>:     chapter.            (line  946)
-* index entry within multitable <2>:     chapter.            (line 1777)
-* t-ruc:                                 chapter.            (line 2278)
-* T-ruc:                                 chapter.            (line 2278)
+* index entry within multitable <1>:     chapter.            (line  947)
+* index entry within multitable <2>:     chapter.            (line 1779)
+* t-ruc:                                 chapter.            (line 2281)
+* T-ruc:                                 chapter.            (line 2281)
 * vtable i--tem code kbdinputstyle:      chapter.            (line  152)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  848)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1677)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  849)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1679)
 * vtable i--tem default kbdinputstyle:   chapter.            (line  147)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  843)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1672)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  844)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1674)
 * vtable i--tem distinct kbdinputstyle:  chapter.            (line  162)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  858)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1687)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  859)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1689)
 * vtable i--tem example kbdinputstyle:   chapter.            (line  157)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  853)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1682)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  854)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1684)
 * vtable i--tem in example code kbdinputstyle: chapter.      (line  154)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  850)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1679)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  851)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1681)
 * vtable i--tem in example default kbdinputstyle: chapter.   (line  149)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  845)
+                                                             (line  846)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1674)
+                                                             (line 1676)
 * vtable i--tem in example distinct kbdinputstyle: chapter.  (line  164)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  860)
+                                                             (line  861)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1689)
+                                                             (line 1691)
 * vtable i--tem in example example kbdinputstyle: chapter.   (line  159)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  855)
+                                                             (line  856)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1684)
+                                                             (line 1686)
 
    fn
 
@@ -3141,171 +3145,171 @@ aaa"]
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  724)
-* --foption <2>:                         chapter.            (line 1431)
-* ?:                                     chapter.            (line 2278)
-* .:                                     chapter.            (line 2278)
+* --foption <1>:                         chapter.            (line  725)
+* --foption <2>:                         chapter.            (line 1433)
+* ?:                                     chapter.            (line 2281)
+* .:                                     chapter.            (line 2281)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  724)
-* `` <2>:                                chapter.            (line 1431)
+* `` <1>:                                chapter.            (line  725)
+* `` <2>:                                chapter.            (line 1433)
 * a:                                     chapter.            (line  330)
 * a <1>:                                 chapter.            (line  529)
-* a <2>:                                 chapter.            (line  658)
-* a <3>:                                 chapter.            (line 1026)
-* a <4>:                                 chapter.            (line 1225)
-* a <5>:                                 chapter.            (line 1354)
-* a <6>:                                 chapter.            (line 1856)
-* a <7>:                                 chapter.            (line 2057)
-* a <8>:                                 chapter.            (line 2219)
-* a <9>:                                 chapter.            (line 2278)
-* after:                                 chapter.            (line  669)
-* after <1>:                             chapter.            (line 1365)
-* after <2>:                             chapter.            (line 2230)
+* a <2>:                                 chapter.            (line  659)
+* a <3>:                                 chapter.            (line 1027)
+* a <4>:                                 chapter.            (line 1226)
+* a <5>:                                 chapter.            (line 1356)
+* a <6>:                                 chapter.            (line 1858)
+* a <7>:                                 chapter.            (line 2059)
+* a <8>:                                 chapter.            (line 2222)
+* a <9>:                                 chapter.            (line 2281)
+* after:                                 chapter.            (line  670)
+* after <1>:                             chapter.            (line 1367)
+* after <2>:                             chapter.            (line 2233)
 * arg2:                                  chapter.            (line  449)
-* arg2 <1>:                              chapter.            (line 1145)
-* arg2 <2>:                              chapter.            (line 1979)
+* arg2 <1>:                              chapter.            (line 1146)
+* arg2 <2>:                              chapter.            (line 1981)
 * b:                                     chapter.            (line  530)
-* b <1>:                                 chapter.            (line  659)
-* b <2>:                                 chapter.            (line 1226)
-* b <3>:                                 chapter.            (line 1355)
-* b <4>:                                 chapter.            (line 2058)
-* b <5>:                                 chapter.            (line 2220)
+* b <1>:                                 chapter.            (line  660)
+* b <2>:                                 chapter.            (line 1227)
+* b <3>:                                 chapter.            (line 1357)
+* b <4>:                                 chapter.            (line 2060)
+* b <5>:                                 chapter.            (line 2223)
 * bidule machin:                         chapter.            (line  325)
-* bidule machin <1>:                     chapter.            (line 1021)
-* bidule machin <2>:                     chapter.            (line 1851)
+* bidule machin <1>:                     chapter.            (line 1022)
+* bidule machin <2>:                     chapter.            (line 1853)
 * d--effn_name:                          chapter.            (line  309)
-* d--effn_name <1>:                      chapter.            (line 1005)
-* d--effn_name <2>:                      chapter.            (line 1835)
+* d--effn_name <1>:                      chapter.            (line 1006)
+* d--effn_name <2>:                      chapter.            (line 1837)
 * d--efmac_name:                         chapter.            (line  390)
-* d--efmac_name <1>:                     chapter.            (line 1086)
-* d--efmac_name <2>:                     chapter.            (line 1918)
+* d--efmac_name <1>:                     chapter.            (line 1087)
+* d--efmac_name <2>:                     chapter.            (line 1920)
 * d--efmethod_name on c--lass:           chapter.            (line  417)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1113)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1945)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1114)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1947)
 * d--efop_name on c--lass:               chapter.            (line  378)
 * d--efop_name on c--lass <1>:           chapter.            (line  381)
-* d--efop_name on c--lass <2>:           chapter.            (line 1074)
-* d--efop_name on c--lass <3>:           chapter.            (line 1077)
-* d--efop_name on c--lass <4>:           chapter.            (line 1906)
-* d--efop_name on c--lass <5>:           chapter.            (line 1909)
+* d--efop_name on c--lass <2>:           chapter.            (line 1075)
+* d--efop_name on c--lass <3>:           chapter.            (line 1078)
+* d--efop_name on c--lass <4>:           chapter.            (line 1908)
+* d--efop_name on c--lass <5>:           chapter.            (line 1911)
 * d--efspec_name:                        chapter.            (line  393)
-* d--efspec_name <1>:                    chapter.            (line 1089)
-* d--efspec_name <2>:                    chapter.            (line 1921)
+* d--efspec_name <1>:                    chapter.            (line 1090)
+* d--efspec_name <2>:                    chapter.            (line 1923)
 * d--eftypefn_name:                      chapter.            (line  351)
 * d--eftypefn_name <1>:                  chapter.            (line  354)
-* d--eftypefn_name <2>:                  chapter.            (line 1047)
-* d--eftypefn_name <3>:                  chapter.            (line 1050)
-* d--eftypefn_name <4>:                  chapter.            (line 1879)
-* d--eftypefn_name <5>:                  chapter.            (line 1882)
+* d--eftypefn_name <2>:                  chapter.            (line 1048)
+* d--eftypefn_name <3>:                  chapter.            (line 1051)
+* d--eftypefn_name <4>:                  chapter.            (line 1881)
+* d--eftypefn_name <5>:                  chapter.            (line 1884)
 * d--eftypefn_name2:                     chapter.            (line  428)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1124)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1957)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1125)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1959)
 * d--eftypefun_name:                     chapter.            (line  405)
-* d--eftypefun_name <1>:                 chapter.            (line 1101)
-* d--eftypefun_name <2>:                 chapter.            (line 1933)
+* d--eftypefun_name <1>:                 chapter.            (line 1102)
+* d--eftypefun_name <2>:                 chapter.            (line 1935)
 * d--eftypemethod_name on c--lass:       chapter.            (line  420)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1116)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1948)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1117)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1950)
 * d--eftypeop_name on c--lass:           chapter.            (line  357)
 * d--eftypeop_name on c--lass <1>:       chapter.            (line  360)
-* d--eftypeop_name on c--lass <2>:       chapter.            (line 1053)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1056)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1885)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1888)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1054)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1057)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1887)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1890)
 * d--eftypeop_name2 on c--lass2:         chapter.            (line  433)
 * d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  438)
-* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1129)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1134)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1962)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1967)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1130)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1135)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1964)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1969)
 * d--efun_name:                          chapter.            (line  387)
-* d--efun_name <1>:                      chapter.            (line 1083)
-* d--efun_name <2>:                      chapter.            (line 1915)
+* d--efun_name <1>:                      chapter.            (line 1084)
+* d--efun_name <2>:                      chapter.            (line 1917)
 * de--ffn_name:                          chapter.            (line  312)
-* de--ffn_name <1>:                      chapter.            (line 1008)
-* de--ffn_name <2>:                      chapter.            (line 1838)
+* de--ffn_name <1>:                      chapter.            (line 1009)
+* de--ffn_name <2>:                      chapter.            (line 1840)
 * deffn:                                 chapter.            (line  333)
 * deffn <1>:                             chapter.            (line  335)
-* deffn <2>:                             chapter.            (line 1029)
-* deffn <3>:                             chapter.            (line 1031)
-* deffn <4>:                             chapter.            (line 1860)
-* deffn <5>:                             chapter.            (line 1862)
+* deffn <2>:                             chapter.            (line 1030)
+* deffn <3>:                             chapter.            (line 1032)
+* deffn <4>:                             chapter.            (line 1862)
+* deffn <5>:                             chapter.            (line 1864)
 * deffnx:                                chapter.            (line  331)
 * deffnx <1>:                            chapter.            (line  336)
-* deffnx <2>:                            chapter.            (line 1027)
-* deffnx <3>:                            chapter.            (line 1032)
-* deffnx <4>:                            chapter.            (line 1857)
-* deffnx <5>:                            chapter.            (line 1863)
-* f---aa:                                chapter.            (line 2278)
-* f---bb, f---cc:                        chapter.            (line 2278)
-* f---ddd, f---eee, ffff:                chapter.            (line 2278)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2278)
+* deffnx <2>:                            chapter.            (line 1028)
+* deffnx <3>:                            chapter.            (line 1033)
+* deffnx <4>:                            chapter.            (line 1859)
+* deffnx <5>:                            chapter.            (line 1865)
+* f---aa:                                chapter.            (line 2281)
+* f---bb, f---cc:                        chapter.            (line 2281)
+* f---ddd, f---eee, ffff:                chapter.            (line 2281)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2281)
 * followed:                              chapter.            (line  328)
-* followed <1>:                          chapter.            (line  667)
-* followed <2>:                          chapter.            (line 1024)
-* followed <3>:                          chapter.            (line 1363)
-* followed <4>:                          chapter.            (line 1854)
-* followed <5>:                          chapter.            (line 2228)
+* followed <1>:                          chapter.            (line  668)
+* followed <2>:                          chapter.            (line 1025)
+* followed <3>:                          chapter.            (line 1365)
+* followed <4>:                          chapter.            (line 1856)
+* followed <5>:                          chapter.            (line 2231)
 * I:                                     chapter.            (line  316)
 * I <1>:                                 chapter.            (line  338)
-* I <2>:                                 chapter.            (line 1012)
-* I <3>:                                 chapter.            (line 1034)
-* I <4>:                                 chapter.            (line 1842)
-* I <5>:                                 chapter.            (line 1865)
+* I <2>:                                 chapter.            (line 1013)
+* I <3>:                                 chapter.            (line 1035)
+* I <4>:                                 chapter.            (line 1844)
+* I <5>:                                 chapter.            (line 1867)
 * id i ule:                              chapter.            (line  322)
-* id i ule <1>:                          chapter.            (line 1018)
-* id i ule <2>:                          chapter.            (line 1848)
+* id i ule <1>:                          chapter.            (line 1019)
+* id i ule <2>:                          chapter.            (line 1850)
 * id ule:                                chapter.            (line  321)
-* id ule <1>:                            chapter.            (line 1017)
-* id ule <2>:                            chapter.            (line 1847)
-* INVALID:                               chapter.            (line  671)
-* INVALID <1>:                           chapter.            (line 1367)
-* INVALID <2>:                           chapter.            (line 2232)
+* id ule <1>:                            chapter.            (line 1018)
+* id ule <2>:                            chapter.            (line 1849)
+* INVALID:                               chapter.            (line  672)
+* INVALID <1>:                           chapter.            (line 1369)
+* INVALID <2>:                           chapter.            (line 2235)
 * log trap:                              chapter.            (line  318)
-* log trap <1>:                          chapter.            (line 1014)
-* log trap <2>:                          chapter.            (line 1844)
+* log trap <1>:                          chapter.            (line 1015)
+* log trap <2>:                          chapter.            (line 1846)
 * log trap1:                             chapter.            (line  319)
-* log trap1 <1>:                         chapter.            (line 1015)
-* log trap1 <2>:                         chapter.            (line 1845)
+* log trap1 <1>:                         chapter.            (line 1016)
+* log trap1 <2>:                         chapter.            (line 1847)
 * log trap2:                             chapter.            (line  320)
-* log trap2 <1>:                         chapter.            (line 1016)
-* log trap2 <2>:                         chapter.            (line 1846)
+* log trap2 <1>:                         chapter.            (line 1017)
+* log trap2 <2>:                         chapter.            (line 1848)
 * machin:                                chapter.            (line  324)
 * machin <1>:                            chapter.            (line  326)
-* machin <2>:                            chapter.            (line  663)
-* machin <3>:                            chapter.            (line  664)
-* machin <4>:                            chapter.            (line  665)
-* machin <5>:                            chapter.            (line  666)
-* machin <6>:                            chapter.            (line 1020)
-* machin <7>:                            chapter.            (line 1022)
-* machin <8>:                            chapter.            (line 1359)
-* machin <9>:                            chapter.            (line 1360)
-* machin <10>:                           chapter.            (line 1361)
-* machin <11>:                           chapter.            (line 1362)
-* machin <12>:                           chapter.            (line 1850)
-* machin <13>:                           chapter.            (line 1852)
-* machin <14>:                           chapter.            (line 2224)
-* machin <15>:                           chapter.            (line 2225)
-* machin <16>:                           chapter.            (line 2226)
-* machin <17>:                           chapter.            (line 2227)
+* machin <2>:                            chapter.            (line  664)
+* machin <3>:                            chapter.            (line  665)
+* machin <4>:                            chapter.            (line  666)
+* machin <5>:                            chapter.            (line  667)
+* machin <6>:                            chapter.            (line 1021)
+* machin <7>:                            chapter.            (line 1023)
+* machin <8>:                            chapter.            (line 1361)
+* machin <9>:                            chapter.            (line 1362)
+* machin <10>:                           chapter.            (line 1363)
+* machin <11>:                           chapter.            (line 1364)
+* machin <12>:                           chapter.            (line 1852)
+* machin <13>:                           chapter.            (line 1854)
+* machin <14>:                           chapter.            (line 2227)
+* machin <15>:                           chapter.            (line 2228)
+* machin <16>:                           chapter.            (line 2229)
+* machin <17>:                           chapter.            (line 2230)
 * n--ame:                                chapter.            (line  345)
 * n--ame <1>:                            chapter.            (line  348)
-* n--ame <2>:                            chapter.            (line 1041)
-* n--ame <3>:                            chapter.            (line 1044)
-* n--ame <4>:                            chapter.            (line 1873)
-* n--ame <5>:                            chapter.            (line 1876)
+* n--ame <2>:                            chapter.            (line 1042)
+* n--ame <3>:                            chapter.            (line 1045)
+* n--ame <4>:                            chapter.            (line 1875)
+* n--ame <5>:                            chapter.            (line 1878)
 * name2:                                 chapter.            (line  423)
-* name2 <1>:                             chapter.            (line 1119)
-* name2 <2>:                             chapter.            (line 1952)
-* t--ruc:                                chapter.            (line 2278)
-* T--ruc:                                chapter.            (line 2278)
+* name2 <1>:                             chapter.            (line 1120)
+* name2 <2>:                             chapter.            (line 1954)
+* t--ruc:                                chapter.            (line 2281)
+* T--ruc:                                chapter.            (line 2281)
 * truc:                                  chapter.            (line  317)
 * truc <1>:                              chapter.            (line  339)
-* truc <2>:                              chapter.            (line 1013)
-* truc <3>:                              chapter.            (line 1035)
-* truc <4>:                              chapter.            (line 1843)
-* truc <5>:                              chapter.            (line 1866)
-* xxx, zzz:                              chapter.            (line 2278)
+* truc <2>:                              chapter.            (line 1014)
+* truc <3>:                              chapter.            (line 1036)
+* truc <4>:                              chapter.            (line 1845)
+* truc <5>:                              chapter.            (line 1868)
+* xxx, zzz:                              chapter.            (line 2281)
 
    vr
 
@@ -3319,8 +3323,8 @@ aaa"]
 * Menu:
 
 * d--eftp_name:                          chapter.            (line  384)
-* d--eftp_name <1>:                      chapter.            (line 1080)
-* d--eftp_name <2>:                      chapter.            (line 1912)
+* d--eftp_name <1>:                      chapter.            (line 1081)
+* d--eftp_name <2>:                      chapter.            (line 1914)
 
    (8)
 
@@ -3402,305 +3406,305 @@ chapter 2
 * Menu:
 
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  724)
-* -option <2>:                           chapter.            (line 1431)
-* ?:                                     chapter.            (line 2278)
-* .:                                     chapter.            (line 2278)
+* -option <1>:                           chapter.            (line  725)
+* -option <2>:                           chapter.            (line 1433)
+* ?:                                     chapter.            (line 2281)
+* .:                                     chapter.            (line 2281)
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  724)
-* " <2>:                                 chapter.            (line 1431)
-* a:                                     chapter.            (line 2278)
-* aaa, bbb:                              chapter.            (line 2278)
-* a--a:                                  chapter.            (line 2278)
+* " <1>:                                 chapter.            (line  725)
+* " <2>:                                 chapter.            (line 1433)
+* a:                                     chapter.            (line 2281)
+* aaa, bbb:                              chapter.            (line 2281)
+* a--a:                                  chapter.            (line 2281)
 * a--asis:                               chapter.            (line  525)
-* a--asis <1>:                           chapter.            (line 1221)
-* a--asis <2>:                           chapter.            (line 2053)
+* a--asis <1>:                           chapter.            (line 1222)
+* a--asis <2>:                           chapter.            (line 2055)
 * b:                                     chapter.            (line  526)
-* b <1>:                                 chapter.            (line 1222)
-* b <2>:                                 chapter.            (line 2054)
-* b--b, c--c:                            chapter.            (line 2278)
-* counting entry:                        chapter.            (line 2627)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2278)
+* b <1>:                                 chapter.            (line 1223)
+* b <2>:                                 chapter.            (line 2056)
+* b--b, c--c:                            chapter.            (line 2281)
+* counting entry:                        chapter.            (line 2630)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2281)
 * d--efcv_name:                          chapter.            (line  366)
 * d--efcv_name <1>:                      chapter.            (line  369)
-* d--efcv_name <2>:                      chapter.            (line 1062)
-* d--efcv_name <3>:                      chapter.            (line 1065)
-* d--efcv_name <4>:                      chapter.            (line 1894)
-* d--efcv_name <5>:                      chapter.            (line 1897)
+* d--efcv_name <2>:                      chapter.            (line 1063)
+* d--efcv_name <3>:                      chapter.            (line 1066)
+* d--efcv_name <4>:                      chapter.            (line 1896)
+* d--efcv_name <5>:                      chapter.            (line 1899)
 * d--efivar_name of c--lass:             chapter.            (line  411)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1107)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1939)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1108)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1941)
 * d--efopt_name:                         chapter.            (line  402)
-* d--efopt_name <1>:                     chapter.            (line 1098)
-* d--efopt_name <2>:                     chapter.            (line 1930)
+* d--efopt_name <1>:                     chapter.            (line 1099)
+* d--efopt_name <2>:                     chapter.            (line 1932)
 * d--eftypecv_name of c--lass:           chapter.            (line  372)
 * d--eftypecv_name of c--lass <1>:       chapter.            (line  375)
-* d--eftypecv_name of c--lass <2>:       chapter.            (line 1068)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1071)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1900)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1903)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1069)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1072)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1902)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1905)
 * d--eftypecv_name2 of c--lass2:         chapter.            (line  443)
 * d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  446)
-* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1139)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1142)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1972)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1975)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1140)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1143)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1974)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1977)
 * d--eftypeivar_name of c--lass:         chapter.            (line  414)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1110)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1942)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1111)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1944)
 * d--eftypevar_name:                     chapter.            (line  408)
-* d--eftypevar_name <1>:                 chapter.            (line 1104)
-* d--eftypevar_name <2>:                 chapter.            (line 1936)
+* d--eftypevar_name <1>:                 chapter.            (line 1105)
+* d--eftypevar_name <2>:                 chapter.            (line 1938)
 * d--eftypevr_name:                      chapter.            (line  363)
-* d--eftypevr_name <1>:                  chapter.            (line 1059)
-* d--eftypevr_name <2>:                  chapter.            (line 1891)
+* d--eftypevr_name <1>:                  chapter.            (line 1060)
+* d--eftypevr_name <2>:                  chapter.            (line 1893)
 * d--efvar_name:                         chapter.            (line  396)
 * d--efvar_name <1>:                     chapter.            (line  399)
-* d--efvar_name <2>:                     chapter.            (line 1092)
-* d--efvar_name <3>:                     chapter.            (line 1095)
-* d--efvar_name <4>:                     chapter.            (line 1924)
-* d--efvar_name <5>:                     chapter.            (line 1927)
+* d--efvar_name <2>:                     chapter.            (line 1093)
+* d--efvar_name <3>:                     chapter.            (line 1096)
+* d--efvar_name <4>:                     chapter.            (line 1926)
+* d--efvar_name <5>:                     chapter.            (line 1929)
 * d--efvr_name:                          chapter.            (line  342)
-* d--efvr_name <1>:                      chapter.            (line 1038)
-* d--efvr_name <2>:                      chapter.            (line 1870)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2278)
+* d--efvr_name <1>:                      chapter.            (line 1039)
+* d--efvr_name <2>:                      chapter.            (line 1872)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2281)
 * index entry between item and itemx:    chapter.            (line  530)
-* index entry between item and itemx <1>: chapter.           (line  659)
-* index entry between item and itemx <2>: chapter.           (line 1226)
-* index entry between item and itemx <3>: chapter.           (line 1355)
-* index entry between item and itemx <4>: chapter.           (line 2058)
-* index entry between item and itemx <5>: chapter.           (line 2220)
-* index entry in footnote:               chapter.            (line 2622)
+* index entry between item and itemx <1>: chapter.           (line  660)
+* index entry between item and itemx <2>: chapter.           (line 1227)
+* index entry between item and itemx <3>: chapter.           (line 1357)
+* index entry between item and itemx <4>: chapter.           (line 2060)
+* index entry between item and itemx <5>: chapter.           (line 2223)
+* index entry in footnote:               chapter.            (line 2625)
 * index entry within deffn:              chapter.            (line  317)
-* index entry within deffn <1>:          chapter.            (line 1013)
-* index entry within deffn <2>:          chapter.            (line 1843)
+* index entry within deffn <1>:          chapter.            (line 1014)
+* index entry within deffn <2>:          chapter.            (line 1845)
 * index entry within itemize:            chapter.            (line  228)
-* index entry within itemize <1>:        chapter.            (line  924)
-* index entry within itemize <2>:        chapter.            (line 1754)
+* index entry within itemize <1>:        chapter.            (line  925)
+* index entry within itemize <2>:        chapter.            (line 1756)
 * index entry within multitable:         chapter.            (line  250)
-* index entry within multitable <1>:     chapter.            (line  946)
-* index entry within multitable <2>:     chapter.            (line 1777)
-* t-ruc:                                 chapter.            (line 2278)
-* T-ruc:                                 chapter.            (line 2278)
+* index entry within multitable <1>:     chapter.            (line  947)
+* index entry within multitable <2>:     chapter.            (line 1779)
+* t-ruc:                                 chapter.            (line 2281)
+* T-ruc:                                 chapter.            (line 2281)
 * vtable i--tem code kbdinputstyle:      chapter.            (line  152)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  848)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1677)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  849)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1679)
 * vtable i--tem default kbdinputstyle:   chapter.            (line  147)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  843)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1672)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  844)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1674)
 * vtable i--tem distinct kbdinputstyle:  chapter.            (line  162)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  858)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1687)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  859)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1689)
 * vtable i--tem example kbdinputstyle:   chapter.            (line  157)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  853)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1682)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  854)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1684)
 * vtable i--tem in example code kbdinputstyle: chapter.      (line  154)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  850)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1679)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  851)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1681)
 * vtable i--tem in example default kbdinputstyle: chapter.   (line  149)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  845)
+                                                             (line  846)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1674)
+                                                             (line 1676)
 * vtable i--tem in example distinct kbdinputstyle: chapter.  (line  164)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  860)
+                                                             (line  861)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1689)
+                                                             (line 1691)
 * vtable i--tem in example example kbdinputstyle: chapter.   (line  159)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  855)
+                                                             (line  856)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1684)
+                                                             (line 1686)
 
 [index]
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  724)
-* --foption <2>:                         chapter.            (line 1431)
-* ?:                                     chapter.            (line 2278)
-* .:                                     chapter.            (line 2278)
+* --foption <1>:                         chapter.            (line  725)
+* --foption <2>:                         chapter.            (line 1433)
+* ?:                                     chapter.            (line 2281)
+* .:                                     chapter.            (line 2281)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  724)
-* `` <2>:                                chapter.            (line 1431)
+* `` <1>:                                chapter.            (line  725)
+* `` <2>:                                chapter.            (line 1433)
 * a:                                     chapter.            (line  330)
 * a <1>:                                 chapter.            (line  529)
-* a <2>:                                 chapter.            (line  658)
-* a <3>:                                 chapter.            (line 1026)
-* a <4>:                                 chapter.            (line 1225)
-* a <5>:                                 chapter.            (line 1354)
-* a <6>:                                 chapter.            (line 1856)
-* a <7>:                                 chapter.            (line 2057)
-* a <8>:                                 chapter.            (line 2219)
-* a <9>:                                 chapter.            (line 2278)
-* after:                                 chapter.            (line  669)
-* after <1>:                             chapter.            (line 1365)
-* after <2>:                             chapter.            (line 2230)
+* a <2>:                                 chapter.            (line  659)
+* a <3>:                                 chapter.            (line 1027)
+* a <4>:                                 chapter.            (line 1226)
+* a <5>:                                 chapter.            (line 1356)
+* a <6>:                                 chapter.            (line 1858)
+* a <7>:                                 chapter.            (line 2059)
+* a <8>:                                 chapter.            (line 2222)
+* a <9>:                                 chapter.            (line 2281)
+* after:                                 chapter.            (line  670)
+* after <1>:                             chapter.            (line 1367)
+* after <2>:                             chapter.            (line 2233)
 * arg2:                                  chapter.            (line  449)
-* arg2 <1>:                              chapter.            (line 1145)
-* arg2 <2>:                              chapter.            (line 1979)
+* arg2 <1>:                              chapter.            (line 1146)
+* arg2 <2>:                              chapter.            (line 1981)
 * b:                                     chapter.            (line  530)
-* b <1>:                                 chapter.            (line  659)
-* b <2>:                                 chapter.            (line 1226)
-* b <3>:                                 chapter.            (line 1355)
-* b <4>:                                 chapter.            (line 2058)
-* b <5>:                                 chapter.            (line 2220)
+* b <1>:                                 chapter.            (line  660)
+* b <2>:                                 chapter.            (line 1227)
+* b <3>:                                 chapter.            (line 1357)
+* b <4>:                                 chapter.            (line 2060)
+* b <5>:                                 chapter.            (line 2223)
 * bidule machin:                         chapter.            (line  325)
-* bidule machin <1>:                     chapter.            (line 1021)
-* bidule machin <2>:                     chapter.            (line 1851)
+* bidule machin <1>:                     chapter.            (line 1022)
+* bidule machin <2>:                     chapter.            (line 1853)
 * d--effn_name:                          chapter.            (line  309)
-* d--effn_name <1>:                      chapter.            (line 1005)
-* d--effn_name <2>:                      chapter.            (line 1835)
+* d--effn_name <1>:                      chapter.            (line 1006)
+* d--effn_name <2>:                      chapter.            (line 1837)
 * d--efmac_name:                         chapter.            (line  390)
-* d--efmac_name <1>:                     chapter.            (line 1086)
-* d--efmac_name <2>:                     chapter.            (line 1918)
+* d--efmac_name <1>:                     chapter.            (line 1087)
+* d--efmac_name <2>:                     chapter.            (line 1920)
 * d--efmethod_name on c--lass:           chapter.            (line  417)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1113)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1945)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1114)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1947)
 * d--efop_name on c--lass:               chapter.            (line  378)
 * d--efop_name on c--lass <1>:           chapter.            (line  381)
-* d--efop_name on c--lass <2>:           chapter.            (line 1074)
-* d--efop_name on c--lass <3>:           chapter.            (line 1077)
-* d--efop_name on c--lass <4>:           chapter.            (line 1906)
-* d--efop_name on c--lass <5>:           chapter.            (line 1909)
+* d--efop_name on c--lass <2>:           chapter.            (line 1075)
+* d--efop_name on c--lass <3>:           chapter.            (line 1078)
+* d--efop_name on c--lass <4>:           chapter.            (line 1908)
+* d--efop_name on c--lass <5>:           chapter.            (line 1911)
 * d--efspec_name:                        chapter.            (line  393)
-* d--efspec_name <1>:                    chapter.            (line 1089)
-* d--efspec_name <2>:                    chapter.            (line 1921)
+* d--efspec_name <1>:                    chapter.            (line 1090)
+* d--efspec_name <2>:                    chapter.            (line 1923)
 * d--eftypefn_name:                      chapter.            (line  351)
 * d--eftypefn_name <1>:                  chapter.            (line  354)
-* d--eftypefn_name <2>:                  chapter.            (line 1047)
-* d--eftypefn_name <3>:                  chapter.            (line 1050)
-* d--eftypefn_name <4>:                  chapter.            (line 1879)
-* d--eftypefn_name <5>:                  chapter.            (line 1882)
+* d--eftypefn_name <2>:                  chapter.            (line 1048)
+* d--eftypefn_name <3>:                  chapter.            (line 1051)
+* d--eftypefn_name <4>:                  chapter.            (line 1881)
+* d--eftypefn_name <5>:                  chapter.            (line 1884)
 * d--eftypefn_name2:                     chapter.            (line  428)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1124)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1957)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1125)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1959)
 * d--eftypefun_name:                     chapter.            (line  405)
-* d--eftypefun_name <1>:                 chapter.            (line 1101)
-* d--eftypefun_name <2>:                 chapter.            (line 1933)
+* d--eftypefun_name <1>:                 chapter.            (line 1102)
+* d--eftypefun_name <2>:                 chapter.            (line 1935)
 * d--eftypemethod_name on c--lass:       chapter.            (line  420)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1116)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1948)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1117)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1950)
 * d--eftypeop_name on c--lass:           chapter.            (line  357)
 * d--eftypeop_name on c--lass <1>:       chapter.            (line  360)
-* d--eftypeop_name on c--lass <2>:       chapter.            (line 1053)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1056)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1885)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1888)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1054)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1057)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1887)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1890)
 * d--eftypeop_name2 on c--lass2:         chapter.            (line  433)
 * d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  438)
-* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1129)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1134)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1962)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1967)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1130)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1135)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1964)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1969)
 * d--efun_name:                          chapter.            (line  387)
-* d--efun_name <1>:                      chapter.            (line 1083)
-* d--efun_name <2>:                      chapter.            (line 1915)
+* d--efun_name <1>:                      chapter.            (line 1084)
+* d--efun_name <2>:                      chapter.            (line 1917)
 * de--ffn_name:                          chapter.            (line  312)
-* de--ffn_name <1>:                      chapter.            (line 1008)
-* de--ffn_name <2>:                      chapter.            (line 1838)
+* de--ffn_name <1>:                      chapter.            (line 1009)
+* de--ffn_name <2>:                      chapter.            (line 1840)
 * deffn:                                 chapter.            (line  333)
 * deffn <1>:                             chapter.            (line  335)
-* deffn <2>:                             chapter.            (line 1029)
-* deffn <3>:                             chapter.            (line 1031)
-* deffn <4>:                             chapter.            (line 1860)
-* deffn <5>:                             chapter.            (line 1862)
+* deffn <2>:                             chapter.            (line 1030)
+* deffn <3>:                             chapter.            (line 1032)
+* deffn <4>:                             chapter.            (line 1862)
+* deffn <5>:                             chapter.            (line 1864)
 * deffnx:                                chapter.            (line  331)
 * deffnx <1>:                            chapter.            (line  336)
-* deffnx <2>:                            chapter.            (line 1027)
-* deffnx <3>:                            chapter.            (line 1032)
-* deffnx <4>:                            chapter.            (line 1857)
-* deffnx <5>:                            chapter.            (line 1863)
-* f---aa:                                chapter.            (line 2278)
-* f---bb, f---cc:                        chapter.            (line 2278)
-* f---ddd, f---eee, ffff:                chapter.            (line 2278)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2278)
+* deffnx <2>:                            chapter.            (line 1028)
+* deffnx <3>:                            chapter.            (line 1033)
+* deffnx <4>:                            chapter.            (line 1859)
+* deffnx <5>:                            chapter.            (line 1865)
+* f---aa:                                chapter.            (line 2281)
+* f---bb, f---cc:                        chapter.            (line 2281)
+* f---ddd, f---eee, ffff:                chapter.            (line 2281)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2281)
 * followed:                              chapter.            (line  328)
-* followed <1>:                          chapter.            (line  667)
-* followed <2>:                          chapter.            (line 1024)
-* followed <3>:                          chapter.            (line 1363)
-* followed <4>:                          chapter.            (line 1854)
-* followed <5>:                          chapter.            (line 2228)
+* followed <1>:                          chapter.            (line  668)
+* followed <2>:                          chapter.            (line 1025)
+* followed <3>:                          chapter.            (line 1365)
+* followed <4>:                          chapter.            (line 1856)
+* followed <5>:                          chapter.            (line 2231)
 * I:                                     chapter.            (line  316)
 * I <1>:                                 chapter.            (line  338)
-* I <2>:                                 chapter.            (line 1012)
-* I <3>:                                 chapter.            (line 1034)
-* I <4>:                                 chapter.            (line 1842)
-* I <5>:                                 chapter.            (line 1865)
+* I <2>:                                 chapter.            (line 1013)
+* I <3>:                                 chapter.            (line 1035)
+* I <4>:                                 chapter.            (line 1844)
+* I <5>:                                 chapter.            (line 1867)
 * id i ule:                              chapter.            (line  322)
-* id i ule <1>:                          chapter.            (line 1018)
-* id i ule <2>:                          chapter.            (line 1848)
+* id i ule <1>:                          chapter.            (line 1019)
+* id i ule <2>:                          chapter.            (line 1850)
 * id ule:                                chapter.            (line  321)
-* id ule <1>:                            chapter.            (line 1017)
-* id ule <2>:                            chapter.            (line 1847)
-* INVALID:                               chapter.            (line  671)
-* INVALID <1>:                           chapter.            (line 1367)
-* INVALID <2>:                           chapter.            (line 2232)
+* id ule <1>:                            chapter.            (line 1018)
+* id ule <2>:                            chapter.            (line 1849)
+* INVALID:                               chapter.            (line  672)
+* INVALID <1>:                           chapter.            (line 1369)
+* INVALID <2>:                           chapter.            (line 2235)
 * log trap:                              chapter.            (line  318)
-* log trap <1>:                          chapter.            (line 1014)
-* log trap <2>:                          chapter.            (line 1844)
+* log trap <1>:                          chapter.            (line 1015)
+* log trap <2>:                          chapter.            (line 1846)
 * log trap1:                             chapter.            (line  319)
-* log trap1 <1>:                         chapter.            (line 1015)
-* log trap1 <2>:                         chapter.            (line 1845)
+* log trap1 <1>:                         chapter.            (line 1016)
+* log trap1 <2>:                         chapter.            (line 1847)
 * log trap2:                             chapter.            (line  320)
-* log trap2 <1>:                         chapter.            (line 1016)
-* log trap2 <2>:                         chapter.            (line 1846)
+* log trap2 <1>:                         chapter.            (line 1017)
+* log trap2 <2>:                         chapter.            (line 1848)
 * machin:                                chapter.            (line  324)
 * machin <1>:                            chapter.            (line  326)
-* machin <2>:                            chapter.            (line  663)
-* machin <3>:                            chapter.            (line  664)
-* machin <4>:                            chapter.            (line  665)
-* machin <5>:                            chapter.            (line  666)
-* machin <6>:                            chapter.            (line 1020)
-* machin <7>:                            chapter.            (line 1022)
-* machin <8>:                            chapter.            (line 1359)
-* machin <9>:                            chapter.            (line 1360)
-* machin <10>:                           chapter.            (line 1361)
-* machin <11>:                           chapter.            (line 1362)
-* machin <12>:                           chapter.            (line 1850)
-* machin <13>:                           chapter.            (line 1852)
-* machin <14>:                           chapter.            (line 2224)
-* machin <15>:                           chapter.            (line 2225)
-* machin <16>:                           chapter.            (line 2226)
-* machin <17>:                           chapter.            (line 2227)
+* machin <2>:                            chapter.            (line  664)
+* machin <3>:                            chapter.            (line  665)
+* machin <4>:                            chapter.            (line  666)
+* machin <5>:                            chapter.            (line  667)
+* machin <6>:                            chapter.            (line 1021)
+* machin <7>:                            chapter.            (line 1023)
+* machin <8>:                            chapter.            (line 1361)
+* machin <9>:                            chapter.            (line 1362)
+* machin <10>:                           chapter.            (line 1363)
+* machin <11>:                           chapter.            (line 1364)
+* machin <12>:                           chapter.            (line 1852)
+* machin <13>:                           chapter.            (line 1854)
+* machin <14>:                           chapter.            (line 2227)
+* machin <15>:                           chapter.            (line 2228)
+* machin <16>:                           chapter.            (line 2229)
+* machin <17>:                           chapter.            (line 2230)
 * n--ame:                                chapter.            (line  345)
 * n--ame <1>:                            chapter.            (line  348)
-* n--ame <2>:                            chapter.            (line 1041)
-* n--ame <3>:                            chapter.            (line 1044)
-* n--ame <4>:                            chapter.            (line 1873)
-* n--ame <5>:                            chapter.            (line 1876)
+* n--ame <2>:                            chapter.            (line 1042)
+* n--ame <3>:                            chapter.            (line 1045)
+* n--ame <4>:                            chapter.            (line 1875)
+* n--ame <5>:                            chapter.            (line 1878)
 * name2:                                 chapter.            (line  423)
-* name2 <1>:                             chapter.            (line 1119)
-* name2 <2>:                             chapter.            (line 1952)
-* t--ruc:                                chapter.            (line 2278)
-* T--ruc:                                chapter.            (line 2278)
+* name2 <1>:                             chapter.            (line 1120)
+* name2 <2>:                             chapter.            (line 1954)
+* t--ruc:                                chapter.            (line 2281)
+* T--ruc:                                chapter.            (line 2281)
 * truc:                                  chapter.            (line  317)
 * truc <1>:                              chapter.            (line  339)
-* truc <2>:                              chapter.            (line 1013)
-* truc <3>:                              chapter.            (line 1035)
-* truc <4>:                              chapter.            (line 1843)
-* truc <5>:                              chapter.            (line 1866)
-* xxx, zzz:                              chapter.            (line 2278)
+* truc <2>:                              chapter.            (line 1014)
+* truc <3>:                              chapter.            (line 1036)
+* truc <4>:                              chapter.            (line 1845)
+* truc <5>:                              chapter.            (line 1868)
+* xxx, zzz:                              chapter.            (line 2281)
 
 
 Tag Table:
-Node: Top19182
-Node: chapter19367
-Ref: chapter-Footnote-199621
-Ref: chapter-Footnote-299641
-Ref: chapter-Footnote-399662
-Ref: chapter-Footnote-499682
-Ref: chapter-Footnote-599703
-Ref: chapter-Footnote-699723
-Ref: chapter-Footnote-799744
-Ref: chapter-Footnote-899782
-Node: s--ect,ion99802
-Node: subsection100005
-Ref: anchor100186
-Node: subsubsection ``simple-double--100186
-Node: subsubsection three---four----''100386
-Node: chapter2100558
+Node: Top19183
+Node: chapter19368
+Ref: chapter-Footnote-199625
+Ref: chapter-Footnote-299645
+Ref: chapter-Footnote-399666
+Ref: chapter-Footnote-499686
+Ref: chapter-Footnote-599707
+Ref: chapter-Footnote-699727
+Ref: chapter-Footnote-799748
+Ref: chapter-Footnote-899786
+Node: s--ect,ion99806
+Node: subsection100009
+Ref: anchor100190
+Node: subsubsection ``simple-double--100190
+Node: subsubsection three---four----''100390
+Node: chapter2100562
 
 End Tag Table
 
diff --git 
a/tp/tests/layout/res_parser/formatting_info_disable_encoding/formatting.info 
b/tp/tests/layout/res_parser/formatting_info_disable_encoding/formatting.info
index c1b30e9dc5..383aecf077 100644
--- 
a/tp/tests/layout/res_parser/formatting_info_disable_encoding/formatting.info
+++ 
b/tp/tests/layout/res_parser/formatting_info_disable_encoding/formatting.info
@@ -618,6 +618,7 @@ aaa"]
 aaa"]
 '@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}' [altjk _" %@]
 
+
 u" U" n~ a^ e' o= i` e' E=`
 C', C', a'' a. a* a[
 a( a<
@@ -1357,6 +1358,7 @@ aaa"]
 aaa"]
 '@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}' [altjk _" %@]
 
+
 u" U" n~ a^ e' o= i` e' E=`
 C', C', a'' a. a* a[
 a( a<
@@ -2053,6 +2055,7 @@ aaa"]
 aaa"]
 '@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}' [altjk _" %@]
 
+
 u" U" n~ a^ e' o= i` e' E=`
 C', C', a'' a. a* a[
 a( a<
@@ -2918,6 +2921,7 @@ aaa"]
 
 
 
+
      u" U" n~ a^ e' o= i` e' E=`
      C', C', a'' a. a* a[
      a( a<
@@ -3009,14 +3013,14 @@ aaa"]
 [index]
 * Menu:
 
-* truc:                                  chapter.            (line 2278)
+* truc:                                  chapter.            (line 2281)
 
    codeidx
 
 [index]
 * Menu:
 
-* a INDEX---ENTRY te~ --- i^:            chapter.            (line 2278)
+* a INDEX---ENTRY te~ --- i^:            chapter.            (line 2281)
 
    cp
 
@@ -3024,116 +3028,116 @@ aaa"]
 * Menu:
 
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  724)
-* -option <2>:                           chapter.            (line 1431)
-* ?:                                     chapter.            (line 2278)
-* .:                                     chapter.            (line 2278)
+* -option <1>:                           chapter.            (line  725)
+* -option <2>:                           chapter.            (line 1433)
+* ?:                                     chapter.            (line 2281)
+* .:                                     chapter.            (line 2281)
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  724)
-* " <2>:                                 chapter.            (line 1431)
-* a:                                     chapter.            (line 2278)
-* aaa, bbb:                              chapter.            (line 2278)
-* a--a:                                  chapter.            (line 2278)
+* " <1>:                                 chapter.            (line  725)
+* " <2>:                                 chapter.            (line 1433)
+* a:                                     chapter.            (line 2281)
+* aaa, bbb:                              chapter.            (line 2281)
+* a--a:                                  chapter.            (line 2281)
 * a--asis:                               chapter.            (line  525)
-* a--asis <1>:                           chapter.            (line 1221)
-* a--asis <2>:                           chapter.            (line 2053)
+* a--asis <1>:                           chapter.            (line 1222)
+* a--asis <2>:                           chapter.            (line 2055)
 * b:                                     chapter.            (line  526)
-* b <1>:                                 chapter.            (line 1222)
-* b <2>:                                 chapter.            (line 2054)
-* b--b, c--c:                            chapter.            (line 2278)
+* b <1>:                                 chapter.            (line 1223)
+* b <2>:                                 chapter.            (line 2056)
+* b--b, c--c:                            chapter.            (line 2281)
 * counting entry:                        chapter.            (line    4)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2278)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2281)
 * d--efcv_name:                          chapter.            (line  366)
 * d--efcv_name <1>:                      chapter.            (line  369)
-* d--efcv_name <2>:                      chapter.            (line 1062)
-* d--efcv_name <3>:                      chapter.            (line 1065)
-* d--efcv_name <4>:                      chapter.            (line 1894)
-* d--efcv_name <5>:                      chapter.            (line 1897)
+* d--efcv_name <2>:                      chapter.            (line 1063)
+* d--efcv_name <3>:                      chapter.            (line 1066)
+* d--efcv_name <4>:                      chapter.            (line 1896)
+* d--efcv_name <5>:                      chapter.            (line 1899)
 * d--efivar_name of c--lass:             chapter.            (line  411)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1107)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1939)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1108)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1941)
 * d--efopt_name:                         chapter.            (line  402)
-* d--efopt_name <1>:                     chapter.            (line 1098)
-* d--efopt_name <2>:                     chapter.            (line 1930)
+* d--efopt_name <1>:                     chapter.            (line 1099)
+* d--efopt_name <2>:                     chapter.            (line 1932)
 * d--eftypecv_name of c--lass:           chapter.            (line  372)
 * d--eftypecv_name of c--lass <1>:       chapter.            (line  375)
-* d--eftypecv_name of c--lass <2>:       chapter.            (line 1068)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1071)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1900)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1903)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1069)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1072)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1902)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1905)
 * d--eftypecv_name2 of c--lass2:         chapter.            (line  443)
 * d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  446)
-* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1139)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1142)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1972)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1975)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1140)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1143)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1974)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1977)
 * d--eftypeivar_name of c--lass:         chapter.            (line  414)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1110)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1942)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1111)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1944)
 * d--eftypevar_name:                     chapter.            (line  408)
-* d--eftypevar_name <1>:                 chapter.            (line 1104)
-* d--eftypevar_name <2>:                 chapter.            (line 1936)
+* d--eftypevar_name <1>:                 chapter.            (line 1105)
+* d--eftypevar_name <2>:                 chapter.            (line 1938)
 * d--eftypevr_name:                      chapter.            (line  363)
-* d--eftypevr_name <1>:                  chapter.            (line 1059)
-* d--eftypevr_name <2>:                  chapter.            (line 1891)
+* d--eftypevr_name <1>:                  chapter.            (line 1060)
+* d--eftypevr_name <2>:                  chapter.            (line 1893)
 * d--efvar_name:                         chapter.            (line  396)
 * d--efvar_name <1>:                     chapter.            (line  399)
-* d--efvar_name <2>:                     chapter.            (line 1092)
-* d--efvar_name <3>:                     chapter.            (line 1095)
-* d--efvar_name <4>:                     chapter.            (line 1924)
-* d--efvar_name <5>:                     chapter.            (line 1927)
+* d--efvar_name <2>:                     chapter.            (line 1093)
+* d--efvar_name <3>:                     chapter.            (line 1096)
+* d--efvar_name <4>:                     chapter.            (line 1926)
+* d--efvar_name <5>:                     chapter.            (line 1929)
 * d--efvr_name:                          chapter.            (line  342)
-* d--efvr_name <1>:                      chapter.            (line 1038)
-* d--efvr_name <2>:                      chapter.            (line 1870)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2278)
+* d--efvr_name <1>:                      chapter.            (line 1039)
+* d--efvr_name <2>:                      chapter.            (line 1872)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2281)
 * index entry between item and itemx:    chapter.            (line  530)
-* index entry between item and itemx <1>: chapter.           (line  659)
-* index entry between item and itemx <2>: chapter.           (line 1226)
-* index entry between item and itemx <3>: chapter.           (line 1355)
-* index entry between item and itemx <4>: chapter.           (line 2058)
-* index entry between item and itemx <5>: chapter.           (line 2220)
+* index entry between item and itemx <1>: chapter.           (line  660)
+* index entry between item and itemx <2>: chapter.           (line 1227)
+* index entry between item and itemx <3>: chapter.           (line 1357)
+* index entry between item and itemx <4>: chapter.           (line 2060)
+* index entry between item and itemx <5>: chapter.           (line 2223)
 * index entry in footnote:               chapter.            (line    4)
 * index entry within deffn:              chapter.            (line  317)
-* index entry within deffn <1>:          chapter.            (line 1013)
-* index entry within deffn <2>:          chapter.            (line 1843)
+* index entry within deffn <1>:          chapter.            (line 1014)
+* index entry within deffn <2>:          chapter.            (line 1845)
 * index entry within itemize:            chapter.            (line  228)
-* index entry within itemize <1>:        chapter.            (line  924)
-* index entry within itemize <2>:        chapter.            (line 1754)
+* index entry within itemize <1>:        chapter.            (line  925)
+* index entry within itemize <2>:        chapter.            (line 1756)
 * index entry within multitable:         chapter.            (line  250)
-* index entry within multitable <1>:     chapter.            (line  946)
-* index entry within multitable <2>:     chapter.            (line 1777)
-* t-ruc:                                 chapter.            (line 2278)
-* T-ruc:                                 chapter.            (line 2278)
+* index entry within multitable <1>:     chapter.            (line  947)
+* index entry within multitable <2>:     chapter.            (line 1779)
+* t-ruc:                                 chapter.            (line 2281)
+* T-ruc:                                 chapter.            (line 2281)
 * vtable i--tem code kbdinputstyle:      chapter.            (line  152)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  848)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1677)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  849)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1679)
 * vtable i--tem default kbdinputstyle:   chapter.            (line  147)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  843)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1672)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  844)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1674)
 * vtable i--tem distinct kbdinputstyle:  chapter.            (line  162)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  858)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1687)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  859)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1689)
 * vtable i--tem example kbdinputstyle:   chapter.            (line  157)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  853)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1682)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  854)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1684)
 * vtable i--tem in example code kbdinputstyle: chapter.      (line  154)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  850)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1679)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  851)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1681)
 * vtable i--tem in example default kbdinputstyle: chapter.   (line  149)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  845)
+                                                             (line  846)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1674)
+                                                             (line 1676)
 * vtable i--tem in example distinct kbdinputstyle: chapter.  (line  164)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  860)
+                                                             (line  861)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1689)
+                                                             (line 1691)
 * vtable i--tem in example example kbdinputstyle: chapter.   (line  159)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  855)
+                                                             (line  856)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1684)
+                                                             (line 1686)
 
    fn
 
@@ -3141,171 +3145,171 @@ aaa"]
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  724)
-* --foption <2>:                         chapter.            (line 1431)
-* ?:                                     chapter.            (line 2278)
-* .:                                     chapter.            (line 2278)
+* --foption <1>:                         chapter.            (line  725)
+* --foption <2>:                         chapter.            (line 1433)
+* ?:                                     chapter.            (line 2281)
+* .:                                     chapter.            (line 2281)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  724)
-* `` <2>:                                chapter.            (line 1431)
+* `` <1>:                                chapter.            (line  725)
+* `` <2>:                                chapter.            (line 1433)
 * a:                                     chapter.            (line  330)
 * a <1>:                                 chapter.            (line  529)
-* a <2>:                                 chapter.            (line  658)
-* a <3>:                                 chapter.            (line 1026)
-* a <4>:                                 chapter.            (line 1225)
-* a <5>:                                 chapter.            (line 1354)
-* a <6>:                                 chapter.            (line 1856)
-* a <7>:                                 chapter.            (line 2057)
-* a <8>:                                 chapter.            (line 2219)
-* a <9>:                                 chapter.            (line 2278)
-* after:                                 chapter.            (line  669)
-* after <1>:                             chapter.            (line 1365)
-* after <2>:                             chapter.            (line 2230)
+* a <2>:                                 chapter.            (line  659)
+* a <3>:                                 chapter.            (line 1027)
+* a <4>:                                 chapter.            (line 1226)
+* a <5>:                                 chapter.            (line 1356)
+* a <6>:                                 chapter.            (line 1858)
+* a <7>:                                 chapter.            (line 2059)
+* a <8>:                                 chapter.            (line 2222)
+* a <9>:                                 chapter.            (line 2281)
+* after:                                 chapter.            (line  670)
+* after <1>:                             chapter.            (line 1367)
+* after <2>:                             chapter.            (line 2233)
 * arg2:                                  chapter.            (line  449)
-* arg2 <1>:                              chapter.            (line 1145)
-* arg2 <2>:                              chapter.            (line 1979)
+* arg2 <1>:                              chapter.            (line 1146)
+* arg2 <2>:                              chapter.            (line 1981)
 * b:                                     chapter.            (line  530)
-* b <1>:                                 chapter.            (line  659)
-* b <2>:                                 chapter.            (line 1226)
-* b <3>:                                 chapter.            (line 1355)
-* b <4>:                                 chapter.            (line 2058)
-* b <5>:                                 chapter.            (line 2220)
+* b <1>:                                 chapter.            (line  660)
+* b <2>:                                 chapter.            (line 1227)
+* b <3>:                                 chapter.            (line 1357)
+* b <4>:                                 chapter.            (line 2060)
+* b <5>:                                 chapter.            (line 2223)
 * bidule machin:                         chapter.            (line  325)
-* bidule machin <1>:                     chapter.            (line 1021)
-* bidule machin <2>:                     chapter.            (line 1851)
+* bidule machin <1>:                     chapter.            (line 1022)
+* bidule machin <2>:                     chapter.            (line 1853)
 * d--effn_name:                          chapter.            (line  309)
-* d--effn_name <1>:                      chapter.            (line 1005)
-* d--effn_name <2>:                      chapter.            (line 1835)
+* d--effn_name <1>:                      chapter.            (line 1006)
+* d--effn_name <2>:                      chapter.            (line 1837)
 * d--efmac_name:                         chapter.            (line  390)
-* d--efmac_name <1>:                     chapter.            (line 1086)
-* d--efmac_name <2>:                     chapter.            (line 1918)
+* d--efmac_name <1>:                     chapter.            (line 1087)
+* d--efmac_name <2>:                     chapter.            (line 1920)
 * d--efmethod_name on c--lass:           chapter.            (line  417)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1113)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1945)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1114)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1947)
 * d--efop_name on c--lass:               chapter.            (line  378)
 * d--efop_name on c--lass <1>:           chapter.            (line  381)
-* d--efop_name on c--lass <2>:           chapter.            (line 1074)
-* d--efop_name on c--lass <3>:           chapter.            (line 1077)
-* d--efop_name on c--lass <4>:           chapter.            (line 1906)
-* d--efop_name on c--lass <5>:           chapter.            (line 1909)
+* d--efop_name on c--lass <2>:           chapter.            (line 1075)
+* d--efop_name on c--lass <3>:           chapter.            (line 1078)
+* d--efop_name on c--lass <4>:           chapter.            (line 1908)
+* d--efop_name on c--lass <5>:           chapter.            (line 1911)
 * d--efspec_name:                        chapter.            (line  393)
-* d--efspec_name <1>:                    chapter.            (line 1089)
-* d--efspec_name <2>:                    chapter.            (line 1921)
+* d--efspec_name <1>:                    chapter.            (line 1090)
+* d--efspec_name <2>:                    chapter.            (line 1923)
 * d--eftypefn_name:                      chapter.            (line  351)
 * d--eftypefn_name <1>:                  chapter.            (line  354)
-* d--eftypefn_name <2>:                  chapter.            (line 1047)
-* d--eftypefn_name <3>:                  chapter.            (line 1050)
-* d--eftypefn_name <4>:                  chapter.            (line 1879)
-* d--eftypefn_name <5>:                  chapter.            (line 1882)
+* d--eftypefn_name <2>:                  chapter.            (line 1048)
+* d--eftypefn_name <3>:                  chapter.            (line 1051)
+* d--eftypefn_name <4>:                  chapter.            (line 1881)
+* d--eftypefn_name <5>:                  chapter.            (line 1884)
 * d--eftypefn_name2:                     chapter.            (line  428)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1124)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1957)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1125)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1959)
 * d--eftypefun_name:                     chapter.            (line  405)
-* d--eftypefun_name <1>:                 chapter.            (line 1101)
-* d--eftypefun_name <2>:                 chapter.            (line 1933)
+* d--eftypefun_name <1>:                 chapter.            (line 1102)
+* d--eftypefun_name <2>:                 chapter.            (line 1935)
 * d--eftypemethod_name on c--lass:       chapter.            (line  420)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1116)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1948)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1117)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1950)
 * d--eftypeop_name on c--lass:           chapter.            (line  357)
 * d--eftypeop_name on c--lass <1>:       chapter.            (line  360)
-* d--eftypeop_name on c--lass <2>:       chapter.            (line 1053)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1056)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1885)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1888)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1054)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1057)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1887)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1890)
 * d--eftypeop_name2 on c--lass2:         chapter.            (line  433)
 * d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  438)
-* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1129)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1134)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1962)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1967)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1130)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1135)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1964)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1969)
 * d--efun_name:                          chapter.            (line  387)
-* d--efun_name <1>:                      chapter.            (line 1083)
-* d--efun_name <2>:                      chapter.            (line 1915)
+* d--efun_name <1>:                      chapter.            (line 1084)
+* d--efun_name <2>:                      chapter.            (line 1917)
 * de--ffn_name:                          chapter.            (line  312)
-* de--ffn_name <1>:                      chapter.            (line 1008)
-* de--ffn_name <2>:                      chapter.            (line 1838)
+* de--ffn_name <1>:                      chapter.            (line 1009)
+* de--ffn_name <2>:                      chapter.            (line 1840)
 * deffn:                                 chapter.            (line  333)
 * deffn <1>:                             chapter.            (line  335)
-* deffn <2>:                             chapter.            (line 1029)
-* deffn <3>:                             chapter.            (line 1031)
-* deffn <4>:                             chapter.            (line 1860)
-* deffn <5>:                             chapter.            (line 1862)
+* deffn <2>:                             chapter.            (line 1030)
+* deffn <3>:                             chapter.            (line 1032)
+* deffn <4>:                             chapter.            (line 1862)
+* deffn <5>:                             chapter.            (line 1864)
 * deffnx:                                chapter.            (line  331)
 * deffnx <1>:                            chapter.            (line  336)
-* deffnx <2>:                            chapter.            (line 1027)
-* deffnx <3>:                            chapter.            (line 1032)
-* deffnx <4>:                            chapter.            (line 1857)
-* deffnx <5>:                            chapter.            (line 1863)
-* f---aa:                                chapter.            (line 2278)
-* f---bb, f---cc:                        chapter.            (line 2278)
-* f---ddd, f---eee, ffff:                chapter.            (line 2278)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2278)
+* deffnx <2>:                            chapter.            (line 1028)
+* deffnx <3>:                            chapter.            (line 1033)
+* deffnx <4>:                            chapter.            (line 1859)
+* deffnx <5>:                            chapter.            (line 1865)
+* f---aa:                                chapter.            (line 2281)
+* f---bb, f---cc:                        chapter.            (line 2281)
+* f---ddd, f---eee, ffff:                chapter.            (line 2281)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2281)
 * followed:                              chapter.            (line  328)
-* followed <1>:                          chapter.            (line  667)
-* followed <2>:                          chapter.            (line 1024)
-* followed <3>:                          chapter.            (line 1363)
-* followed <4>:                          chapter.            (line 1854)
-* followed <5>:                          chapter.            (line 2228)
+* followed <1>:                          chapter.            (line  668)
+* followed <2>:                          chapter.            (line 1025)
+* followed <3>:                          chapter.            (line 1365)
+* followed <4>:                          chapter.            (line 1856)
+* followed <5>:                          chapter.            (line 2231)
 * I:                                     chapter.            (line  316)
 * I <1>:                                 chapter.            (line  338)
-* I <2>:                                 chapter.            (line 1012)
-* I <3>:                                 chapter.            (line 1034)
-* I <4>:                                 chapter.            (line 1842)
-* I <5>:                                 chapter.            (line 1865)
+* I <2>:                                 chapter.            (line 1013)
+* I <3>:                                 chapter.            (line 1035)
+* I <4>:                                 chapter.            (line 1844)
+* I <5>:                                 chapter.            (line 1867)
 * id i ule:                              chapter.            (line  322)
-* id i ule <1>:                          chapter.            (line 1018)
-* id i ule <2>:                          chapter.            (line 1848)
+* id i ule <1>:                          chapter.            (line 1019)
+* id i ule <2>:                          chapter.            (line 1850)
 * id ule:                                chapter.            (line  321)
-* id ule <1>:                            chapter.            (line 1017)
-* id ule <2>:                            chapter.            (line 1847)
-* INVALID:                               chapter.            (line  671)
-* INVALID <1>:                           chapter.            (line 1367)
-* INVALID <2>:                           chapter.            (line 2232)
+* id ule <1>:                            chapter.            (line 1018)
+* id ule <2>:                            chapter.            (line 1849)
+* INVALID:                               chapter.            (line  672)
+* INVALID <1>:                           chapter.            (line 1369)
+* INVALID <2>:                           chapter.            (line 2235)
 * log trap:                              chapter.            (line  318)
-* log trap <1>:                          chapter.            (line 1014)
-* log trap <2>:                          chapter.            (line 1844)
+* log trap <1>:                          chapter.            (line 1015)
+* log trap <2>:                          chapter.            (line 1846)
 * log trap1:                             chapter.            (line  319)
-* log trap1 <1>:                         chapter.            (line 1015)
-* log trap1 <2>:                         chapter.            (line 1845)
+* log trap1 <1>:                         chapter.            (line 1016)
+* log trap1 <2>:                         chapter.            (line 1847)
 * log trap2:                             chapter.            (line  320)
-* log trap2 <1>:                         chapter.            (line 1016)
-* log trap2 <2>:                         chapter.            (line 1846)
+* log trap2 <1>:                         chapter.            (line 1017)
+* log trap2 <2>:                         chapter.            (line 1848)
 * machin:                                chapter.            (line  324)
 * machin <1>:                            chapter.            (line  326)
-* machin <2>:                            chapter.            (line  663)
-* machin <3>:                            chapter.            (line  664)
-* machin <4>:                            chapter.            (line  665)
-* machin <5>:                            chapter.            (line  666)
-* machin <6>:                            chapter.            (line 1020)
-* machin <7>:                            chapter.            (line 1022)
-* machin <8>:                            chapter.            (line 1359)
-* machin <9>:                            chapter.            (line 1360)
-* machin <10>:                           chapter.            (line 1361)
-* machin <11>:                           chapter.            (line 1362)
-* machin <12>:                           chapter.            (line 1850)
-* machin <13>:                           chapter.            (line 1852)
-* machin <14>:                           chapter.            (line 2224)
-* machin <15>:                           chapter.            (line 2225)
-* machin <16>:                           chapter.            (line 2226)
-* machin <17>:                           chapter.            (line 2227)
+* machin <2>:                            chapter.            (line  664)
+* machin <3>:                            chapter.            (line  665)
+* machin <4>:                            chapter.            (line  666)
+* machin <5>:                            chapter.            (line  667)
+* machin <6>:                            chapter.            (line 1021)
+* machin <7>:                            chapter.            (line 1023)
+* machin <8>:                            chapter.            (line 1361)
+* machin <9>:                            chapter.            (line 1362)
+* machin <10>:                           chapter.            (line 1363)
+* machin <11>:                           chapter.            (line 1364)
+* machin <12>:                           chapter.            (line 1852)
+* machin <13>:                           chapter.            (line 1854)
+* machin <14>:                           chapter.            (line 2227)
+* machin <15>:                           chapter.            (line 2228)
+* machin <16>:                           chapter.            (line 2229)
+* machin <17>:                           chapter.            (line 2230)
 * n--ame:                                chapter.            (line  345)
 * n--ame <1>:                            chapter.            (line  348)
-* n--ame <2>:                            chapter.            (line 1041)
-* n--ame <3>:                            chapter.            (line 1044)
-* n--ame <4>:                            chapter.            (line 1873)
-* n--ame <5>:                            chapter.            (line 1876)
+* n--ame <2>:                            chapter.            (line 1042)
+* n--ame <3>:                            chapter.            (line 1045)
+* n--ame <4>:                            chapter.            (line 1875)
+* n--ame <5>:                            chapter.            (line 1878)
 * name2:                                 chapter.            (line  423)
-* name2 <1>:                             chapter.            (line 1119)
-* name2 <2>:                             chapter.            (line 1952)
-* t--ruc:                                chapter.            (line 2278)
-* T--ruc:                                chapter.            (line 2278)
+* name2 <1>:                             chapter.            (line 1120)
+* name2 <2>:                             chapter.            (line 1954)
+* t--ruc:                                chapter.            (line 2281)
+* T--ruc:                                chapter.            (line 2281)
 * truc:                                  chapter.            (line  317)
 * truc <1>:                              chapter.            (line  339)
-* truc <2>:                              chapter.            (line 1013)
-* truc <3>:                              chapter.            (line 1035)
-* truc <4>:                              chapter.            (line 1843)
-* truc <5>:                              chapter.            (line 1866)
-* xxx, zzz:                              chapter.            (line 2278)
+* truc <2>:                              chapter.            (line 1014)
+* truc <3>:                              chapter.            (line 1036)
+* truc <4>:                              chapter.            (line 1845)
+* truc <5>:                              chapter.            (line 1868)
+* xxx, zzz:                              chapter.            (line 2281)
 
    vr
 
@@ -3319,8 +3323,8 @@ aaa"]
 * Menu:
 
 * d--eftp_name:                          chapter.            (line  384)
-* d--eftp_name <1>:                      chapter.            (line 1080)
-* d--eftp_name <2>:                      chapter.            (line 1912)
+* d--eftp_name <1>:                      chapter.            (line 1081)
+* d--eftp_name <2>:                      chapter.            (line 1914)
 
    (8)
 
@@ -3402,305 +3406,305 @@ chapter 2
 * Menu:
 
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  724)
-* -option <2>:                           chapter.            (line 1431)
-* ?:                                     chapter.            (line 2278)
-* .:                                     chapter.            (line 2278)
+* -option <1>:                           chapter.            (line  725)
+* -option <2>:                           chapter.            (line 1433)
+* ?:                                     chapter.            (line 2281)
+* .:                                     chapter.            (line 2281)
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  724)
-* " <2>:                                 chapter.            (line 1431)
-* a:                                     chapter.            (line 2278)
-* aaa, bbb:                              chapter.            (line 2278)
-* a--a:                                  chapter.            (line 2278)
+* " <1>:                                 chapter.            (line  725)
+* " <2>:                                 chapter.            (line 1433)
+* a:                                     chapter.            (line 2281)
+* aaa, bbb:                              chapter.            (line 2281)
+* a--a:                                  chapter.            (line 2281)
 * a--asis:                               chapter.            (line  525)
-* a--asis <1>:                           chapter.            (line 1221)
-* a--asis <2>:                           chapter.            (line 2053)
+* a--asis <1>:                           chapter.            (line 1222)
+* a--asis <2>:                           chapter.            (line 2055)
 * b:                                     chapter.            (line  526)
-* b <1>:                                 chapter.            (line 1222)
-* b <2>:                                 chapter.            (line 2054)
-* b--b, c--c:                            chapter.            (line 2278)
-* counting entry:                        chapter.            (line 2627)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2278)
+* b <1>:                                 chapter.            (line 1223)
+* b <2>:                                 chapter.            (line 2056)
+* b--b, c--c:                            chapter.            (line 2281)
+* counting entry:                        chapter.            (line 2630)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2281)
 * d--efcv_name:                          chapter.            (line  366)
 * d--efcv_name <1>:                      chapter.            (line  369)
-* d--efcv_name <2>:                      chapter.            (line 1062)
-* d--efcv_name <3>:                      chapter.            (line 1065)
-* d--efcv_name <4>:                      chapter.            (line 1894)
-* d--efcv_name <5>:                      chapter.            (line 1897)
+* d--efcv_name <2>:                      chapter.            (line 1063)
+* d--efcv_name <3>:                      chapter.            (line 1066)
+* d--efcv_name <4>:                      chapter.            (line 1896)
+* d--efcv_name <5>:                      chapter.            (line 1899)
 * d--efivar_name of c--lass:             chapter.            (line  411)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1107)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1939)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1108)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1941)
 * d--efopt_name:                         chapter.            (line  402)
-* d--efopt_name <1>:                     chapter.            (line 1098)
-* d--efopt_name <2>:                     chapter.            (line 1930)
+* d--efopt_name <1>:                     chapter.            (line 1099)
+* d--efopt_name <2>:                     chapter.            (line 1932)
 * d--eftypecv_name of c--lass:           chapter.            (line  372)
 * d--eftypecv_name of c--lass <1>:       chapter.            (line  375)
-* d--eftypecv_name of c--lass <2>:       chapter.            (line 1068)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1071)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1900)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1903)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1069)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1072)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1902)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1905)
 * d--eftypecv_name2 of c--lass2:         chapter.            (line  443)
 * d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  446)
-* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1139)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1142)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1972)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1975)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1140)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1143)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1974)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1977)
 * d--eftypeivar_name of c--lass:         chapter.            (line  414)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1110)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1942)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1111)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1944)
 * d--eftypevar_name:                     chapter.            (line  408)
-* d--eftypevar_name <1>:                 chapter.            (line 1104)
-* d--eftypevar_name <2>:                 chapter.            (line 1936)
+* d--eftypevar_name <1>:                 chapter.            (line 1105)
+* d--eftypevar_name <2>:                 chapter.            (line 1938)
 * d--eftypevr_name:                      chapter.            (line  363)
-* d--eftypevr_name <1>:                  chapter.            (line 1059)
-* d--eftypevr_name <2>:                  chapter.            (line 1891)
+* d--eftypevr_name <1>:                  chapter.            (line 1060)
+* d--eftypevr_name <2>:                  chapter.            (line 1893)
 * d--efvar_name:                         chapter.            (line  396)
 * d--efvar_name <1>:                     chapter.            (line  399)
-* d--efvar_name <2>:                     chapter.            (line 1092)
-* d--efvar_name <3>:                     chapter.            (line 1095)
-* d--efvar_name <4>:                     chapter.            (line 1924)
-* d--efvar_name <5>:                     chapter.            (line 1927)
+* d--efvar_name <2>:                     chapter.            (line 1093)
+* d--efvar_name <3>:                     chapter.            (line 1096)
+* d--efvar_name <4>:                     chapter.            (line 1926)
+* d--efvar_name <5>:                     chapter.            (line 1929)
 * d--efvr_name:                          chapter.            (line  342)
-* d--efvr_name <1>:                      chapter.            (line 1038)
-* d--efvr_name <2>:                      chapter.            (line 1870)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2278)
+* d--efvr_name <1>:                      chapter.            (line 1039)
+* d--efvr_name <2>:                      chapter.            (line 1872)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2281)
 * index entry between item and itemx:    chapter.            (line  530)
-* index entry between item and itemx <1>: chapter.           (line  659)
-* index entry between item and itemx <2>: chapter.           (line 1226)
-* index entry between item and itemx <3>: chapter.           (line 1355)
-* index entry between item and itemx <4>: chapter.           (line 2058)
-* index entry between item and itemx <5>: chapter.           (line 2220)
-* index entry in footnote:               chapter.            (line 2622)
+* index entry between item and itemx <1>: chapter.           (line  660)
+* index entry between item and itemx <2>: chapter.           (line 1227)
+* index entry between item and itemx <3>: chapter.           (line 1357)
+* index entry between item and itemx <4>: chapter.           (line 2060)
+* index entry between item and itemx <5>: chapter.           (line 2223)
+* index entry in footnote:               chapter.            (line 2625)
 * index entry within deffn:              chapter.            (line  317)
-* index entry within deffn <1>:          chapter.            (line 1013)
-* index entry within deffn <2>:          chapter.            (line 1843)
+* index entry within deffn <1>:          chapter.            (line 1014)
+* index entry within deffn <2>:          chapter.            (line 1845)
 * index entry within itemize:            chapter.            (line  228)
-* index entry within itemize <1>:        chapter.            (line  924)
-* index entry within itemize <2>:        chapter.            (line 1754)
+* index entry within itemize <1>:        chapter.            (line  925)
+* index entry within itemize <2>:        chapter.            (line 1756)
 * index entry within multitable:         chapter.            (line  250)
-* index entry within multitable <1>:     chapter.            (line  946)
-* index entry within multitable <2>:     chapter.            (line 1777)
-* t-ruc:                                 chapter.            (line 2278)
-* T-ruc:                                 chapter.            (line 2278)
+* index entry within multitable <1>:     chapter.            (line  947)
+* index entry within multitable <2>:     chapter.            (line 1779)
+* t-ruc:                                 chapter.            (line 2281)
+* T-ruc:                                 chapter.            (line 2281)
 * vtable i--tem code kbdinputstyle:      chapter.            (line  152)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  848)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1677)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  849)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1679)
 * vtable i--tem default kbdinputstyle:   chapter.            (line  147)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  843)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1672)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  844)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1674)
 * vtable i--tem distinct kbdinputstyle:  chapter.            (line  162)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  858)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1687)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  859)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1689)
 * vtable i--tem example kbdinputstyle:   chapter.            (line  157)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  853)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1682)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  854)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1684)
 * vtable i--tem in example code kbdinputstyle: chapter.      (line  154)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  850)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1679)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  851)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1681)
 * vtable i--tem in example default kbdinputstyle: chapter.   (line  149)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  845)
+                                                             (line  846)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1674)
+                                                             (line 1676)
 * vtable i--tem in example distinct kbdinputstyle: chapter.  (line  164)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  860)
+                                                             (line  861)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1689)
+                                                             (line 1691)
 * vtable i--tem in example example kbdinputstyle: chapter.   (line  159)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  855)
+                                                             (line  856)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1684)
+                                                             (line 1686)
 
 [index]
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  724)
-* --foption <2>:                         chapter.            (line 1431)
-* ?:                                     chapter.            (line 2278)
-* .:                                     chapter.            (line 2278)
+* --foption <1>:                         chapter.            (line  725)
+* --foption <2>:                         chapter.            (line 1433)
+* ?:                                     chapter.            (line 2281)
+* .:                                     chapter.            (line 2281)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  724)
-* `` <2>:                                chapter.            (line 1431)
+* `` <1>:                                chapter.            (line  725)
+* `` <2>:                                chapter.            (line 1433)
 * a:                                     chapter.            (line  330)
 * a <1>:                                 chapter.            (line  529)
-* a <2>:                                 chapter.            (line  658)
-* a <3>:                                 chapter.            (line 1026)
-* a <4>:                                 chapter.            (line 1225)
-* a <5>:                                 chapter.            (line 1354)
-* a <6>:                                 chapter.            (line 1856)
-* a <7>:                                 chapter.            (line 2057)
-* a <8>:                                 chapter.            (line 2219)
-* a <9>:                                 chapter.            (line 2278)
-* after:                                 chapter.            (line  669)
-* after <1>:                             chapter.            (line 1365)
-* after <2>:                             chapter.            (line 2230)
+* a <2>:                                 chapter.            (line  659)
+* a <3>:                                 chapter.            (line 1027)
+* a <4>:                                 chapter.            (line 1226)
+* a <5>:                                 chapter.            (line 1356)
+* a <6>:                                 chapter.            (line 1858)
+* a <7>:                                 chapter.            (line 2059)
+* a <8>:                                 chapter.            (line 2222)
+* a <9>:                                 chapter.            (line 2281)
+* after:                                 chapter.            (line  670)
+* after <1>:                             chapter.            (line 1367)
+* after <2>:                             chapter.            (line 2233)
 * arg2:                                  chapter.            (line  449)
-* arg2 <1>:                              chapter.            (line 1145)
-* arg2 <2>:                              chapter.            (line 1979)
+* arg2 <1>:                              chapter.            (line 1146)
+* arg2 <2>:                              chapter.            (line 1981)
 * b:                                     chapter.            (line  530)
-* b <1>:                                 chapter.            (line  659)
-* b <2>:                                 chapter.            (line 1226)
-* b <3>:                                 chapter.            (line 1355)
-* b <4>:                                 chapter.            (line 2058)
-* b <5>:                                 chapter.            (line 2220)
+* b <1>:                                 chapter.            (line  660)
+* b <2>:                                 chapter.            (line 1227)
+* b <3>:                                 chapter.            (line 1357)
+* b <4>:                                 chapter.            (line 2060)
+* b <5>:                                 chapter.            (line 2223)
 * bidule machin:                         chapter.            (line  325)
-* bidule machin <1>:                     chapter.            (line 1021)
-* bidule machin <2>:                     chapter.            (line 1851)
+* bidule machin <1>:                     chapter.            (line 1022)
+* bidule machin <2>:                     chapter.            (line 1853)
 * d--effn_name:                          chapter.            (line  309)
-* d--effn_name <1>:                      chapter.            (line 1005)
-* d--effn_name <2>:                      chapter.            (line 1835)
+* d--effn_name <1>:                      chapter.            (line 1006)
+* d--effn_name <2>:                      chapter.            (line 1837)
 * d--efmac_name:                         chapter.            (line  390)
-* d--efmac_name <1>:                     chapter.            (line 1086)
-* d--efmac_name <2>:                     chapter.            (line 1918)
+* d--efmac_name <1>:                     chapter.            (line 1087)
+* d--efmac_name <2>:                     chapter.            (line 1920)
 * d--efmethod_name on c--lass:           chapter.            (line  417)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1113)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1945)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1114)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1947)
 * d--efop_name on c--lass:               chapter.            (line  378)
 * d--efop_name on c--lass <1>:           chapter.            (line  381)
-* d--efop_name on c--lass <2>:           chapter.            (line 1074)
-* d--efop_name on c--lass <3>:           chapter.            (line 1077)
-* d--efop_name on c--lass <4>:           chapter.            (line 1906)
-* d--efop_name on c--lass <5>:           chapter.            (line 1909)
+* d--efop_name on c--lass <2>:           chapter.            (line 1075)
+* d--efop_name on c--lass <3>:           chapter.            (line 1078)
+* d--efop_name on c--lass <4>:           chapter.            (line 1908)
+* d--efop_name on c--lass <5>:           chapter.            (line 1911)
 * d--efspec_name:                        chapter.            (line  393)
-* d--efspec_name <1>:                    chapter.            (line 1089)
-* d--efspec_name <2>:                    chapter.            (line 1921)
+* d--efspec_name <1>:                    chapter.            (line 1090)
+* d--efspec_name <2>:                    chapter.            (line 1923)
 * d--eftypefn_name:                      chapter.            (line  351)
 * d--eftypefn_name <1>:                  chapter.            (line  354)
-* d--eftypefn_name <2>:                  chapter.            (line 1047)
-* d--eftypefn_name <3>:                  chapter.            (line 1050)
-* d--eftypefn_name <4>:                  chapter.            (line 1879)
-* d--eftypefn_name <5>:                  chapter.            (line 1882)
+* d--eftypefn_name <2>:                  chapter.            (line 1048)
+* d--eftypefn_name <3>:                  chapter.            (line 1051)
+* d--eftypefn_name <4>:                  chapter.            (line 1881)
+* d--eftypefn_name <5>:                  chapter.            (line 1884)
 * d--eftypefn_name2:                     chapter.            (line  428)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1124)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1957)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1125)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1959)
 * d--eftypefun_name:                     chapter.            (line  405)
-* d--eftypefun_name <1>:                 chapter.            (line 1101)
-* d--eftypefun_name <2>:                 chapter.            (line 1933)
+* d--eftypefun_name <1>:                 chapter.            (line 1102)
+* d--eftypefun_name <2>:                 chapter.            (line 1935)
 * d--eftypemethod_name on c--lass:       chapter.            (line  420)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1116)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1948)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1117)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1950)
 * d--eftypeop_name on c--lass:           chapter.            (line  357)
 * d--eftypeop_name on c--lass <1>:       chapter.            (line  360)
-* d--eftypeop_name on c--lass <2>:       chapter.            (line 1053)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1056)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1885)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1888)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1054)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1057)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1887)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1890)
 * d--eftypeop_name2 on c--lass2:         chapter.            (line  433)
 * d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  438)
-* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1129)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1134)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1962)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1967)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1130)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1135)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1964)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1969)
 * d--efun_name:                          chapter.            (line  387)
-* d--efun_name <1>:                      chapter.            (line 1083)
-* d--efun_name <2>:                      chapter.            (line 1915)
+* d--efun_name <1>:                      chapter.            (line 1084)
+* d--efun_name <2>:                      chapter.            (line 1917)
 * de--ffn_name:                          chapter.            (line  312)
-* de--ffn_name <1>:                      chapter.            (line 1008)
-* de--ffn_name <2>:                      chapter.            (line 1838)
+* de--ffn_name <1>:                      chapter.            (line 1009)
+* de--ffn_name <2>:                      chapter.            (line 1840)
 * deffn:                                 chapter.            (line  333)
 * deffn <1>:                             chapter.            (line  335)
-* deffn <2>:                             chapter.            (line 1029)
-* deffn <3>:                             chapter.            (line 1031)
-* deffn <4>:                             chapter.            (line 1860)
-* deffn <5>:                             chapter.            (line 1862)
+* deffn <2>:                             chapter.            (line 1030)
+* deffn <3>:                             chapter.            (line 1032)
+* deffn <4>:                             chapter.            (line 1862)
+* deffn <5>:                             chapter.            (line 1864)
 * deffnx:                                chapter.            (line  331)
 * deffnx <1>:                            chapter.            (line  336)
-* deffnx <2>:                            chapter.            (line 1027)
-* deffnx <3>:                            chapter.            (line 1032)
-* deffnx <4>:                            chapter.            (line 1857)
-* deffnx <5>:                            chapter.            (line 1863)
-* f---aa:                                chapter.            (line 2278)
-* f---bb, f---cc:                        chapter.            (line 2278)
-* f---ddd, f---eee, ffff:                chapter.            (line 2278)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2278)
+* deffnx <2>:                            chapter.            (line 1028)
+* deffnx <3>:                            chapter.            (line 1033)
+* deffnx <4>:                            chapter.            (line 1859)
+* deffnx <5>:                            chapter.            (line 1865)
+* f---aa:                                chapter.            (line 2281)
+* f---bb, f---cc:                        chapter.            (line 2281)
+* f---ddd, f---eee, ffff:                chapter.            (line 2281)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2281)
 * followed:                              chapter.            (line  328)
-* followed <1>:                          chapter.            (line  667)
-* followed <2>:                          chapter.            (line 1024)
-* followed <3>:                          chapter.            (line 1363)
-* followed <4>:                          chapter.            (line 1854)
-* followed <5>:                          chapter.            (line 2228)
+* followed <1>:                          chapter.            (line  668)
+* followed <2>:                          chapter.            (line 1025)
+* followed <3>:                          chapter.            (line 1365)
+* followed <4>:                          chapter.            (line 1856)
+* followed <5>:                          chapter.            (line 2231)
 * I:                                     chapter.            (line  316)
 * I <1>:                                 chapter.            (line  338)
-* I <2>:                                 chapter.            (line 1012)
-* I <3>:                                 chapter.            (line 1034)
-* I <4>:                                 chapter.            (line 1842)
-* I <5>:                                 chapter.            (line 1865)
+* I <2>:                                 chapter.            (line 1013)
+* I <3>:                                 chapter.            (line 1035)
+* I <4>:                                 chapter.            (line 1844)
+* I <5>:                                 chapter.            (line 1867)
 * id i ule:                              chapter.            (line  322)
-* id i ule <1>:                          chapter.            (line 1018)
-* id i ule <2>:                          chapter.            (line 1848)
+* id i ule <1>:                          chapter.            (line 1019)
+* id i ule <2>:                          chapter.            (line 1850)
 * id ule:                                chapter.            (line  321)
-* id ule <1>:                            chapter.            (line 1017)
-* id ule <2>:                            chapter.            (line 1847)
-* INVALID:                               chapter.            (line  671)
-* INVALID <1>:                           chapter.            (line 1367)
-* INVALID <2>:                           chapter.            (line 2232)
+* id ule <1>:                            chapter.            (line 1018)
+* id ule <2>:                            chapter.            (line 1849)
+* INVALID:                               chapter.            (line  672)
+* INVALID <1>:                           chapter.            (line 1369)
+* INVALID <2>:                           chapter.            (line 2235)
 * log trap:                              chapter.            (line  318)
-* log trap <1>:                          chapter.            (line 1014)
-* log trap <2>:                          chapter.            (line 1844)
+* log trap <1>:                          chapter.            (line 1015)
+* log trap <2>:                          chapter.            (line 1846)
 * log trap1:                             chapter.            (line  319)
-* log trap1 <1>:                         chapter.            (line 1015)
-* log trap1 <2>:                         chapter.            (line 1845)
+* log trap1 <1>:                         chapter.            (line 1016)
+* log trap1 <2>:                         chapter.            (line 1847)
 * log trap2:                             chapter.            (line  320)
-* log trap2 <1>:                         chapter.            (line 1016)
-* log trap2 <2>:                         chapter.            (line 1846)
+* log trap2 <1>:                         chapter.            (line 1017)
+* log trap2 <2>:                         chapter.            (line 1848)
 * machin:                                chapter.            (line  324)
 * machin <1>:                            chapter.            (line  326)
-* machin <2>:                            chapter.            (line  663)
-* machin <3>:                            chapter.            (line  664)
-* machin <4>:                            chapter.            (line  665)
-* machin <5>:                            chapter.            (line  666)
-* machin <6>:                            chapter.            (line 1020)
-* machin <7>:                            chapter.            (line 1022)
-* machin <8>:                            chapter.            (line 1359)
-* machin <9>:                            chapter.            (line 1360)
-* machin <10>:                           chapter.            (line 1361)
-* machin <11>:                           chapter.            (line 1362)
-* machin <12>:                           chapter.            (line 1850)
-* machin <13>:                           chapter.            (line 1852)
-* machin <14>:                           chapter.            (line 2224)
-* machin <15>:                           chapter.            (line 2225)
-* machin <16>:                           chapter.            (line 2226)
-* machin <17>:                           chapter.            (line 2227)
+* machin <2>:                            chapter.            (line  664)
+* machin <3>:                            chapter.            (line  665)
+* machin <4>:                            chapter.            (line  666)
+* machin <5>:                            chapter.            (line  667)
+* machin <6>:                            chapter.            (line 1021)
+* machin <7>:                            chapter.            (line 1023)
+* machin <8>:                            chapter.            (line 1361)
+* machin <9>:                            chapter.            (line 1362)
+* machin <10>:                           chapter.            (line 1363)
+* machin <11>:                           chapter.            (line 1364)
+* machin <12>:                           chapter.            (line 1852)
+* machin <13>:                           chapter.            (line 1854)
+* machin <14>:                           chapter.            (line 2227)
+* machin <15>:                           chapter.            (line 2228)
+* machin <16>:                           chapter.            (line 2229)
+* machin <17>:                           chapter.            (line 2230)
 * n--ame:                                chapter.            (line  345)
 * n--ame <1>:                            chapter.            (line  348)
-* n--ame <2>:                            chapter.            (line 1041)
-* n--ame <3>:                            chapter.            (line 1044)
-* n--ame <4>:                            chapter.            (line 1873)
-* n--ame <5>:                            chapter.            (line 1876)
+* n--ame <2>:                            chapter.            (line 1042)
+* n--ame <3>:                            chapter.            (line 1045)
+* n--ame <4>:                            chapter.            (line 1875)
+* n--ame <5>:                            chapter.            (line 1878)
 * name2:                                 chapter.            (line  423)
-* name2 <1>:                             chapter.            (line 1119)
-* name2 <2>:                             chapter.            (line 1952)
-* t--ruc:                                chapter.            (line 2278)
-* T--ruc:                                chapter.            (line 2278)
+* name2 <1>:                             chapter.            (line 1120)
+* name2 <2>:                             chapter.            (line 1954)
+* t--ruc:                                chapter.            (line 2281)
+* T--ruc:                                chapter.            (line 2281)
 * truc:                                  chapter.            (line  317)
 * truc <1>:                              chapter.            (line  339)
-* truc <2>:                              chapter.            (line 1013)
-* truc <3>:                              chapter.            (line 1035)
-* truc <4>:                              chapter.            (line 1843)
-* truc <5>:                              chapter.            (line 1866)
-* xxx, zzz:                              chapter.            (line 2278)
+* truc <2>:                              chapter.            (line 1014)
+* truc <3>:                              chapter.            (line 1036)
+* truc <4>:                              chapter.            (line 1845)
+* truc <5>:                              chapter.            (line 1868)
+* xxx, zzz:                              chapter.            (line 2281)
 
 
 Tag Table:
-Node: Top19145
-Node: chapter19330
-Ref: chapter-Footnote-199470
-Ref: chapter-Footnote-299490
-Ref: chapter-Footnote-399511
-Ref: chapter-Footnote-499531
-Ref: chapter-Footnote-599552
-Ref: chapter-Footnote-699572
-Ref: chapter-Footnote-799593
-Ref: chapter-Footnote-899631
-Node: s--ect,ion99651
-Node: subsection99854
-Ref: anchor100035
-Node: subsubsection ``simple-double--100035
-Node: subsubsection three---four----''100235
-Node: chapter2100407
+Node: Top19146
+Node: chapter19331
+Ref: chapter-Footnote-199474
+Ref: chapter-Footnote-299494
+Ref: chapter-Footnote-399515
+Ref: chapter-Footnote-499535
+Ref: chapter-Footnote-599556
+Ref: chapter-Footnote-699576
+Ref: chapter-Footnote-799597
+Ref: chapter-Footnote-899635
+Node: s--ect,ion99655
+Node: subsection99858
+Ref: anchor100039
+Node: subsubsection ``simple-double--100039
+Node: subsubsection three---four----''100239
+Node: chapter2100411
 
 End Tag Table
 
diff --git a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html 
b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
index eff6f7bc9d..f00c7449f3 100644
--- a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
@@ -1878,6 +1878,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 <strong class="author">author</strong><br>
 
@@ -2984,6 +2985,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath" style="font-style: italic; font-family: serif; 
display: flex; justify-content: center">&uuml; &Uuml; &ntilde; &acirc; &eacute; 
&#333; &igrave; &eacute; &#274;&#768;
@@ -4133,6 +4135,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath" style="font-style: italic; font-family: serif; 
display: flex; justify-content: center">&uuml; &Uuml; &ntilde; &acirc; &eacute; 
&#333; &igrave; &eacute; &#274;&#768;
@@ -5237,6 +5240,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath" style="font-style: italic; font-family: serif; 
display: flex; justify-content: center">&uuml; &Uuml; &ntilde; &acirc; &eacute; 
&#333; &igrave; &eacute; &#274;&#768;
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html 
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
index a2886bb432..9bf14f589e 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -1927,6 +1927,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 <strong class="author">author</strong><br>
 
@@ -3031,6 +3032,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath tex2jax_process">\[\ddot{u} \ddot{U} \tilde{n} \hat{a} 
\acute{e} \bar{o} \grave{i} \acute{e} \grave{\bar{E}}
@@ -4199,6 +4201,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath tex2jax_process">\[\ddot{u} \ddot{U} \tilde{n} \hat{a} 
\acute{e} \bar{o} \grave{i} \acute{e} \grave{\bar{E}}
@@ -5301,6 +5304,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath tex2jax_process">\[\ddot{u} \ddot{U} \tilde{n} \hat{a} 
\acute{e} \bar{o} \grave{i} \acute{e} \grave{\bar{E}}
@@ -6548,6 +6552,7 @@ Invalid use of @':
 
 
 
+
 </pre><pre class="displaymath tex2jax_process">\[\ddot{u} \ddot{U} \tilde{n} 
\hat{a} \acute{e} \bar{o} \grave{i} \acute{e} \grave{\bar{E}}
 \textsl{\c{\'{C}}} \textsl{\c{\'{C}}} \textsl{\H{a}} \dot{a} \mathring{a} 
\textsl{\t{a}}
 \breve{a} \check{a}
diff --git 
a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html 
b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
index 9de230a749..4b0ed14e04 100644
--- a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
@@ -1927,6 +1927,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&#160;_&quot;&#160;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&#160;_&quot;&#160;%@">
 </p>
+<br>
 
 <strong class="author">author</strong><br>
 
@@ -3033,6 +3034,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&#160;_&quot;&#160;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&#160;_&quot;&#160;%@">
 </p>
+<br>
 
 
 <pre class="displaymath">&#252; &#220; &#241; &#226; &#233; &#333; &#236; 
&#233; &#274;&#768;
@@ -4213,6 +4215,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&#160;_&quot;&#160;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&#160;_&quot;&#160;%@">
 </p>
+<br>
 
 
 <pre class="displaymath">&#252; &#220; &#241; &#226; &#233; &#333; &#236; 
&#233; &#274;&#768;
@@ -5317,6 +5320,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&#160;_&quot;&#160;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&#160;_&quot;&#160;%@">
 </p>
+<br>
 
 
 <pre class="displaymath">&#252; &#220; &#241; &#226; &#233; &#333; &#236; 
&#233; &#274;&#768;
@@ -6566,6 +6570,7 @@ Invalid use of @':
 
 
 
+
 </pre><pre class="displaymath">&#252; &#220; &#241; &#226; &#233; &#333; 
&#236; &#233; &#274;&#768;
 &#262;&#807; &#262;&#807; a&#779; &#551; &#229; a&#865;
 &#259; &#462;
diff --git 
a/tp/tests/layout/res_parser/formatting_plaintext_ascii_punctuation/formatting.txt
 
b/tp/tests/layout/res_parser/formatting_plaintext_ascii_punctuation/formatting.txt
index 812e8bc11f..95a646f213 100644
--- 
a/tp/tests/layout/res_parser/formatting_plaintext_ascii_punctuation/formatting.txt
+++ 
b/tp/tests/layout/res_parser/formatting_plaintext_ascii_punctuation/formatting.txt
@@ -631,6 +631,7 @@ aaa
 aaa
 '@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}' [altjk _" %@]
 
+
 ü Ü ñ â é ō ì é Ḕ
 Ḉ Ḉ a̋ ȧ å a͡
 ă ǎ
@@ -1327,6 +1328,7 @@ aaa
 aaa
 '@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}}' [altjk _" %@]
 
+
 ü Ü ñ â é ō ì é Ḕ
 Ḉ Ḉ a̋ ȧ å a͡
 ă ǎ
@@ -2192,6 +2194,7 @@ aaa
 
 
 
+
      ü Ü ñ â é ō ì é Ḕ
      Ḉ Ḉ a̋ ȧ å a͡
      ă ǎ
@@ -2282,300 +2285,300 @@ aaa
 
 * Menu:
 
-* truc:                                  chapter.            (line 2278)
+* truc:                                  chapter.            (line 2281)
 
    codeidx
 
 * Menu:
 
-* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2278)
+* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2281)
 
    cp
 
 * Menu:
 
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  724)
-* -option <2>:                           chapter.            (line 1431)
-* ?:                                     chapter.            (line 2278)
-* .:                                     chapter.            (line 2278)
+* -option <1>:                           chapter.            (line  725)
+* -option <2>:                           chapter.            (line 1433)
+* ?:                                     chapter.            (line 2281)
+* .:                                     chapter.            (line 2281)
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  724)
-* " <2>:                                 chapter.            (line 1431)
-* a:                                     chapter.            (line 2278)
-* aaa, bbb:                              chapter.            (line 2278)
-* a--a:                                  chapter.            (line 2278)
+* " <1>:                                 chapter.            (line  725)
+* " <2>:                                 chapter.            (line 1433)
+* a:                                     chapter.            (line 2281)
+* aaa, bbb:                              chapter.            (line 2281)
+* a--a:                                  chapter.            (line 2281)
 * a--asis:                               chapter.            (line  525)
-* a--asis <1>:                           chapter.            (line 1221)
-* a--asis <2>:                           chapter.            (line 2053)
+* a--asis <1>:                           chapter.            (line 1222)
+* a--asis <2>:                           chapter.            (line 2055)
 * b:                                     chapter.            (line  526)
-* b <1>:                                 chapter.            (line 1222)
-* b <2>:                                 chapter.            (line 2054)
-* b--b, c--c:                            chapter.            (line 2278)
+* b <1>:                                 chapter.            (line 1223)
+* b <2>:                                 chapter.            (line 2056)
+* b--b, c--c:                            chapter.            (line 2281)
 * counting entry:                        chapter.            (line    0)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2278)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2281)
 * d--efcv_name:                          chapter.            (line  366)
 * d--efcv_name <1>:                      chapter.            (line  369)
-* d--efcv_name <2>:                      chapter.            (line 1062)
-* d--efcv_name <3>:                      chapter.            (line 1065)
-* d--efcv_name <4>:                      chapter.            (line 1894)
-* d--efcv_name <5>:                      chapter.            (line 1897)
+* d--efcv_name <2>:                      chapter.            (line 1063)
+* d--efcv_name <3>:                      chapter.            (line 1066)
+* d--efcv_name <4>:                      chapter.            (line 1896)
+* d--efcv_name <5>:                      chapter.            (line 1899)
 * d--efivar_name of c--lass:             chapter.            (line  411)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1107)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1939)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1108)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1941)
 * d--efopt_name:                         chapter.            (line  402)
-* d--efopt_name <1>:                     chapter.            (line 1098)
-* d--efopt_name <2>:                     chapter.            (line 1930)
+* d--efopt_name <1>:                     chapter.            (line 1099)
+* d--efopt_name <2>:                     chapter.            (line 1932)
 * d--eftypecv_name of c--lass:           chapter.            (line  372)
 * d--eftypecv_name of c--lass <1>:       chapter.            (line  375)
-* d--eftypecv_name of c--lass <2>:       chapter.            (line 1068)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1071)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1900)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1903)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1069)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1072)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1902)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1905)
 * d--eftypecv_name2 of c--lass2:         chapter.            (line  443)
 * d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  446)
-* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1139)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1142)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1972)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1975)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1140)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1143)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1974)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1977)
 * d--eftypeivar_name of c--lass:         chapter.            (line  414)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1110)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1942)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1111)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1944)
 * d--eftypevar_name:                     chapter.            (line  408)
-* d--eftypevar_name <1>:                 chapter.            (line 1104)
-* d--eftypevar_name <2>:                 chapter.            (line 1936)
+* d--eftypevar_name <1>:                 chapter.            (line 1105)
+* d--eftypevar_name <2>:                 chapter.            (line 1938)
 * d--eftypevr_name:                      chapter.            (line  363)
-* d--eftypevr_name <1>:                  chapter.            (line 1059)
-* d--eftypevr_name <2>:                  chapter.            (line 1891)
+* d--eftypevr_name <1>:                  chapter.            (line 1060)
+* d--eftypevr_name <2>:                  chapter.            (line 1893)
 * d--efvar_name:                         chapter.            (line  396)
 * d--efvar_name <1>:                     chapter.            (line  399)
-* d--efvar_name <2>:                     chapter.            (line 1092)
-* d--efvar_name <3>:                     chapter.            (line 1095)
-* d--efvar_name <4>:                     chapter.            (line 1924)
-* d--efvar_name <5>:                     chapter.            (line 1927)
+* d--efvar_name <2>:                     chapter.            (line 1093)
+* d--efvar_name <3>:                     chapter.            (line 1096)
+* d--efvar_name <4>:                     chapter.            (line 1926)
+* d--efvar_name <5>:                     chapter.            (line 1929)
 * d--efvr_name:                          chapter.            (line  342)
-* d--efvr_name <1>:                      chapter.            (line 1038)
-* d--efvr_name <2>:                      chapter.            (line 1870)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2278)
+* d--efvr_name <1>:                      chapter.            (line 1039)
+* d--efvr_name <2>:                      chapter.            (line 1872)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2281)
 * index entry between item and itemx:    chapter.            (line  530)
-* index entry between item and itemx <1>: chapter.           (line  659)
-* index entry between item and itemx <2>: chapter.           (line 1226)
-* index entry between item and itemx <3>: chapter.           (line 1355)
-* index entry between item and itemx <4>: chapter.           (line 2058)
-* index entry between item and itemx <5>: chapter.           (line 2220)
+* index entry between item and itemx <1>: chapter.           (line  660)
+* index entry between item and itemx <2>: chapter.           (line 1227)
+* index entry between item and itemx <3>: chapter.           (line 1357)
+* index entry between item and itemx <4>: chapter.           (line 2060)
+* index entry between item and itemx <5>: chapter.           (line 2223)
 * index entry in footnote:               chapter.            (line    0)
 * index entry within deffn:              chapter.            (line  317)
-* index entry within deffn <1>:          chapter.            (line 1013)
-* index entry within deffn <2>:          chapter.            (line 1843)
+* index entry within deffn <1>:          chapter.            (line 1014)
+* index entry within deffn <2>:          chapter.            (line 1845)
 * index entry within itemize:            chapter.            (line  228)
-* index entry within itemize <1>:        chapter.            (line  924)
-* index entry within itemize <2>:        chapter.            (line 1754)
+* index entry within itemize <1>:        chapter.            (line  925)
+* index entry within itemize <2>:        chapter.            (line 1756)
 * index entry within multitable:         chapter.            (line  250)
-* index entry within multitable <1>:     chapter.            (line  946)
-* index entry within multitable <2>:     chapter.            (line 1777)
-* t-ruc:                                 chapter.            (line 2278)
-* T-ruc:                                 chapter.            (line 2278)
+* index entry within multitable <1>:     chapter.            (line  947)
+* index entry within multitable <2>:     chapter.            (line 1779)
+* t-ruc:                                 chapter.            (line 2281)
+* T-ruc:                                 chapter.            (line 2281)
 * vtable i--tem code kbdinputstyle:      chapter.            (line  152)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  848)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1677)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  849)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1679)
 * vtable i--tem default kbdinputstyle:   chapter.            (line  147)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  843)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1672)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  844)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1674)
 * vtable i--tem distinct kbdinputstyle:  chapter.            (line  162)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  858)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1687)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  859)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1689)
 * vtable i--tem example kbdinputstyle:   chapter.            (line  157)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  853)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1682)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  854)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1684)
 * vtable i--tem in example code kbdinputstyle: chapter.      (line  154)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  850)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1679)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  851)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1681)
 * vtable i--tem in example default kbdinputstyle: chapter.   (line  149)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  845)
+                                                             (line  846)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1674)
+                                                             (line 1676)
 * vtable i--tem in example distinct kbdinputstyle: chapter.  (line  164)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  860)
+                                                             (line  861)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1689)
+                                                             (line 1691)
 * vtable i--tem in example example kbdinputstyle: chapter.   (line  159)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  855)
+                                                             (line  856)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1684)
+                                                             (line 1686)
 
    fn
 
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  724)
-* --foption <2>:                         chapter.            (line 1431)
-* ?:                                     chapter.            (line 2278)
-* .:                                     chapter.            (line 2278)
+* --foption <1>:                         chapter.            (line  725)
+* --foption <2>:                         chapter.            (line 1433)
+* ?:                                     chapter.            (line 2281)
+* .:                                     chapter.            (line 2281)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  724)
-* `` <2>:                                chapter.            (line 1431)
+* `` <1>:                                chapter.            (line  725)
+* `` <2>:                                chapter.            (line 1433)
 * a:                                     chapter.            (line  330)
 * a <1>:                                 chapter.            (line  529)
-* a <2>:                                 chapter.            (line  658)
-* a <3>:                                 chapter.            (line 1026)
-* a <4>:                                 chapter.            (line 1225)
-* a <5>:                                 chapter.            (line 1354)
-* a <6>:                                 chapter.            (line 1856)
-* a <7>:                                 chapter.            (line 2057)
-* a <8>:                                 chapter.            (line 2219)
-* a <9>:                                 chapter.            (line 2278)
-* after:                                 chapter.            (line  669)
-* after <1>:                             chapter.            (line 1365)
-* after <2>:                             chapter.            (line 2230)
+* a <2>:                                 chapter.            (line  659)
+* a <3>:                                 chapter.            (line 1027)
+* a <4>:                                 chapter.            (line 1226)
+* a <5>:                                 chapter.            (line 1356)
+* a <6>:                                 chapter.            (line 1858)
+* a <7>:                                 chapter.            (line 2059)
+* a <8>:                                 chapter.            (line 2222)
+* a <9>:                                 chapter.            (line 2281)
+* after:                                 chapter.            (line  670)
+* after <1>:                             chapter.            (line 1367)
+* after <2>:                             chapter.            (line 2233)
 * arg2:                                  chapter.            (line  449)
-* arg2 <1>:                              chapter.            (line 1145)
-* arg2 <2>:                              chapter.            (line 1979)
+* arg2 <1>:                              chapter.            (line 1146)
+* arg2 <2>:                              chapter.            (line 1981)
 * b:                                     chapter.            (line  530)
-* b <1>:                                 chapter.            (line  659)
-* b <2>:                                 chapter.            (line 1226)
-* b <3>:                                 chapter.            (line 1355)
-* b <4>:                                 chapter.            (line 2058)
-* b <5>:                                 chapter.            (line 2220)
+* b <1>:                                 chapter.            (line  660)
+* b <2>:                                 chapter.            (line 1227)
+* b <3>:                                 chapter.            (line 1357)
+* b <4>:                                 chapter.            (line 2060)
+* b <5>:                                 chapter.            (line 2223)
 * bidule machin:                         chapter.            (line  325)
-* bidule machin <1>:                     chapter.            (line 1021)
-* bidule machin <2>:                     chapter.            (line 1851)
+* bidule machin <1>:                     chapter.            (line 1022)
+* bidule machin <2>:                     chapter.            (line 1853)
 * d--effn_name:                          chapter.            (line  309)
-* d--effn_name <1>:                      chapter.            (line 1005)
-* d--effn_name <2>:                      chapter.            (line 1835)
+* d--effn_name <1>:                      chapter.            (line 1006)
+* d--effn_name <2>:                      chapter.            (line 1837)
 * d--efmac_name:                         chapter.            (line  390)
-* d--efmac_name <1>:                     chapter.            (line 1086)
-* d--efmac_name <2>:                     chapter.            (line 1918)
+* d--efmac_name <1>:                     chapter.            (line 1087)
+* d--efmac_name <2>:                     chapter.            (line 1920)
 * d--efmethod_name on c--lass:           chapter.            (line  417)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1113)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1945)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1114)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1947)
 * d--efop_name on c--lass:               chapter.            (line  378)
 * d--efop_name on c--lass <1>:           chapter.            (line  381)
-* d--efop_name on c--lass <2>:           chapter.            (line 1074)
-* d--efop_name on c--lass <3>:           chapter.            (line 1077)
-* d--efop_name on c--lass <4>:           chapter.            (line 1906)
-* d--efop_name on c--lass <5>:           chapter.            (line 1909)
+* d--efop_name on c--lass <2>:           chapter.            (line 1075)
+* d--efop_name on c--lass <3>:           chapter.            (line 1078)
+* d--efop_name on c--lass <4>:           chapter.            (line 1908)
+* d--efop_name on c--lass <5>:           chapter.            (line 1911)
 * d--efspec_name:                        chapter.            (line  393)
-* d--efspec_name <1>:                    chapter.            (line 1089)
-* d--efspec_name <2>:                    chapter.            (line 1921)
+* d--efspec_name <1>:                    chapter.            (line 1090)
+* d--efspec_name <2>:                    chapter.            (line 1923)
 * d--eftypefn_name:                      chapter.            (line  351)
 * d--eftypefn_name <1>:                  chapter.            (line  354)
-* d--eftypefn_name <2>:                  chapter.            (line 1047)
-* d--eftypefn_name <3>:                  chapter.            (line 1050)
-* d--eftypefn_name <4>:                  chapter.            (line 1879)
-* d--eftypefn_name <5>:                  chapter.            (line 1882)
+* d--eftypefn_name <2>:                  chapter.            (line 1048)
+* d--eftypefn_name <3>:                  chapter.            (line 1051)
+* d--eftypefn_name <4>:                  chapter.            (line 1881)
+* d--eftypefn_name <5>:                  chapter.            (line 1884)
 * d--eftypefn_name2:                     chapter.            (line  428)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1124)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1957)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1125)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1959)
 * d--eftypefun_name:                     chapter.            (line  405)
-* d--eftypefun_name <1>:                 chapter.            (line 1101)
-* d--eftypefun_name <2>:                 chapter.            (line 1933)
+* d--eftypefun_name <1>:                 chapter.            (line 1102)
+* d--eftypefun_name <2>:                 chapter.            (line 1935)
 * d--eftypemethod_name on c--lass:       chapter.            (line  420)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1116)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1948)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1117)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1950)
 * d--eftypeop_name on c--lass:           chapter.            (line  357)
 * d--eftypeop_name on c--lass <1>:       chapter.            (line  360)
-* d--eftypeop_name on c--lass <2>:       chapter.            (line 1053)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1056)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1885)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1888)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1054)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1057)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1887)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1890)
 * d--eftypeop_name2 on c--lass2:         chapter.            (line  433)
 * d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  438)
-* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1129)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1134)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1962)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1967)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1130)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1135)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1964)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1969)
 * d--efun_name:                          chapter.            (line  387)
-* d--efun_name <1>:                      chapter.            (line 1083)
-* d--efun_name <2>:                      chapter.            (line 1915)
+* d--efun_name <1>:                      chapter.            (line 1084)
+* d--efun_name <2>:                      chapter.            (line 1917)
 * de--ffn_name:                          chapter.            (line  312)
-* de--ffn_name <1>:                      chapter.            (line 1008)
-* de--ffn_name <2>:                      chapter.            (line 1838)
+* de--ffn_name <1>:                      chapter.            (line 1009)
+* de--ffn_name <2>:                      chapter.            (line 1840)
 * deffn:                                 chapter.            (line  333)
 * deffn <1>:                             chapter.            (line  335)
-* deffn <2>:                             chapter.            (line 1029)
-* deffn <3>:                             chapter.            (line 1031)
-* deffn <4>:                             chapter.            (line 1860)
-* deffn <5>:                             chapter.            (line 1862)
+* deffn <2>:                             chapter.            (line 1030)
+* deffn <3>:                             chapter.            (line 1032)
+* deffn <4>:                             chapter.            (line 1862)
+* deffn <5>:                             chapter.            (line 1864)
 * deffnx:                                chapter.            (line  331)
 * deffnx <1>:                            chapter.            (line  336)
-* deffnx <2>:                            chapter.            (line 1027)
-* deffnx <3>:                            chapter.            (line 1032)
-* deffnx <4>:                            chapter.            (line 1857)
-* deffnx <5>:                            chapter.            (line 1863)
-* f---aa:                                chapter.            (line 2278)
-* f---bb, f---cc:                        chapter.            (line 2278)
-* f---ddd, f---eee, ffff:                chapter.            (line 2278)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2278)
+* deffnx <2>:                            chapter.            (line 1028)
+* deffnx <3>:                            chapter.            (line 1033)
+* deffnx <4>:                            chapter.            (line 1859)
+* deffnx <5>:                            chapter.            (line 1865)
+* f---aa:                                chapter.            (line 2281)
+* f---bb, f---cc:                        chapter.            (line 2281)
+* f---ddd, f---eee, ffff:                chapter.            (line 2281)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2281)
 * followed:                              chapter.            (line  328)
-* followed <1>:                          chapter.            (line  667)
-* followed <2>:                          chapter.            (line 1024)
-* followed <3>:                          chapter.            (line 1363)
-* followed <4>:                          chapter.            (line 1854)
-* followed <5>:                          chapter.            (line 2228)
+* followed <1>:                          chapter.            (line  668)
+* followed <2>:                          chapter.            (line 1025)
+* followed <3>:                          chapter.            (line 1365)
+* followed <4>:                          chapter.            (line 1856)
+* followed <5>:                          chapter.            (line 2231)
 * I:                                     chapter.            (line  316)
 * I <1>:                                 chapter.            (line  338)
-* I <2>:                                 chapter.            (line 1012)
-* I <3>:                                 chapter.            (line 1034)
-* I <4>:                                 chapter.            (line 1842)
-* I <5>:                                 chapter.            (line 1865)
+* I <2>:                                 chapter.            (line 1013)
+* I <3>:                                 chapter.            (line 1035)
+* I <4>:                                 chapter.            (line 1844)
+* I <5>:                                 chapter.            (line 1867)
 * id i ule:                              chapter.            (line  322)
-* id i ule <1>:                          chapter.            (line 1018)
-* id i ule <2>:                          chapter.            (line 1848)
+* id i ule <1>:                          chapter.            (line 1019)
+* id i ule <2>:                          chapter.            (line 1850)
 * id ule:                                chapter.            (line  321)
-* id ule <1>:                            chapter.            (line 1017)
-* id ule <2>:                            chapter.            (line 1847)
-* INVALID:                               chapter.            (line  671)
-* INVALID <1>:                           chapter.            (line 1367)
-* INVALID <2>:                           chapter.            (line 2232)
+* id ule <1>:                            chapter.            (line 1018)
+* id ule <2>:                            chapter.            (line 1849)
+* INVALID:                               chapter.            (line  672)
+* INVALID <1>:                           chapter.            (line 1369)
+* INVALID <2>:                           chapter.            (line 2235)
 * log trap:                              chapter.            (line  318)
-* log trap <1>:                          chapter.            (line 1014)
-* log trap <2>:                          chapter.            (line 1844)
+* log trap <1>:                          chapter.            (line 1015)
+* log trap <2>:                          chapter.            (line 1846)
 * log trap1:                             chapter.            (line  319)
-* log trap1 <1>:                         chapter.            (line 1015)
-* log trap1 <2>:                         chapter.            (line 1845)
+* log trap1 <1>:                         chapter.            (line 1016)
+* log trap1 <2>:                         chapter.            (line 1847)
 * log trap2:                             chapter.            (line  320)
-* log trap2 <1>:                         chapter.            (line 1016)
-* log trap2 <2>:                         chapter.            (line 1846)
+* log trap2 <1>:                         chapter.            (line 1017)
+* log trap2 <2>:                         chapter.            (line 1848)
 * machin:                                chapter.            (line  324)
 * machin <1>:                            chapter.            (line  326)
-* machin <2>:                            chapter.            (line  663)
-* machin <3>:                            chapter.            (line  664)
-* machin <4>:                            chapter.            (line  665)
-* machin <5>:                            chapter.            (line  666)
-* machin <6>:                            chapter.            (line 1020)
-* machin <7>:                            chapter.            (line 1022)
-* machin <8>:                            chapter.            (line 1359)
-* machin <9>:                            chapter.            (line 1360)
-* machin <10>:                           chapter.            (line 1361)
-* machin <11>:                           chapter.            (line 1362)
-* machin <12>:                           chapter.            (line 1850)
-* machin <13>:                           chapter.            (line 1852)
-* machin <14>:                           chapter.            (line 2224)
-* machin <15>:                           chapter.            (line 2225)
-* machin <16>:                           chapter.            (line 2226)
-* machin <17>:                           chapter.            (line 2227)
+* machin <2>:                            chapter.            (line  664)
+* machin <3>:                            chapter.            (line  665)
+* machin <4>:                            chapter.            (line  666)
+* machin <5>:                            chapter.            (line  667)
+* machin <6>:                            chapter.            (line 1021)
+* machin <7>:                            chapter.            (line 1023)
+* machin <8>:                            chapter.            (line 1361)
+* machin <9>:                            chapter.            (line 1362)
+* machin <10>:                           chapter.            (line 1363)
+* machin <11>:                           chapter.            (line 1364)
+* machin <12>:                           chapter.            (line 1852)
+* machin <13>:                           chapter.            (line 1854)
+* machin <14>:                           chapter.            (line 2227)
+* machin <15>:                           chapter.            (line 2228)
+* machin <16>:                           chapter.            (line 2229)
+* machin <17>:                           chapter.            (line 2230)
 * n--ame:                                chapter.            (line  345)
 * n--ame <1>:                            chapter.            (line  348)
-* n--ame <2>:                            chapter.            (line 1041)
-* n--ame <3>:                            chapter.            (line 1044)
-* n--ame <4>:                            chapter.            (line 1873)
-* n--ame <5>:                            chapter.            (line 1876)
+* n--ame <2>:                            chapter.            (line 1042)
+* n--ame <3>:                            chapter.            (line 1045)
+* n--ame <4>:                            chapter.            (line 1875)
+* n--ame <5>:                            chapter.            (line 1878)
 * name2:                                 chapter.            (line  423)
-* name2 <1>:                             chapter.            (line 1119)
-* name2 <2>:                             chapter.            (line 1952)
-* t--ruc:                                chapter.            (line 2278)
-* T--ruc:                                chapter.            (line 2278)
+* name2 <1>:                             chapter.            (line 1120)
+* name2 <2>:                             chapter.            (line 1954)
+* t--ruc:                                chapter.            (line 2281)
+* T--ruc:                                chapter.            (line 2281)
 * truc:                                  chapter.            (line  317)
 * truc <1>:                              chapter.            (line  339)
-* truc <2>:                              chapter.            (line 1013)
-* truc <3>:                              chapter.            (line 1035)
-* truc <4>:                              chapter.            (line 1843)
-* truc <5>:                              chapter.            (line 1866)
-* xxx, zzz:                              chapter.            (line 2278)
+* truc <2>:                              chapter.            (line 1014)
+* truc <3>:                              chapter.            (line 1036)
+* truc <4>:                              chapter.            (line 1845)
+* truc <5>:                              chapter.            (line 1868)
+* xxx, zzz:                              chapter.            (line 2281)
 
    vr
 
@@ -2588,8 +2591,8 @@ aaa
 * Menu:
 
 * d--eftp_name:                          chapter.            (line  384)
-* d--eftp_name <1>:                      chapter.            (line 1080)
-* d--eftp_name <2>:                      chapter.            (line 1912)
+* d--eftp_name <1>:                      chapter.            (line 1081)
+* d--eftp_name <2>:                      chapter.            (line 1914)
 
    (8)
 
@@ -2633,285 +2636,285 @@ chapter 2
 * Menu:
 
 * -option:                               chapter.            (line   28)
-* -option <1>:                           chapter.            (line  724)
-* -option <2>:                           chapter.            (line 1431)
-* ?:                                     chapter.            (line 2278)
-* .:                                     chapter.            (line 2278)
+* -option <1>:                           chapter.            (line  725)
+* -option <2>:                           chapter.            (line 1433)
+* ?:                                     chapter.            (line 2281)
+* .:                                     chapter.            (line 2281)
 * ":                                     chapter.            (line   28)
-* " <1>:                                 chapter.            (line  724)
-* " <2>:                                 chapter.            (line 1431)
-* a:                                     chapter.            (line 2278)
-* aaa, bbb:                              chapter.            (line 2278)
-* a--a:                                  chapter.            (line 2278)
+* " <1>:                                 chapter.            (line  725)
+* " <2>:                                 chapter.            (line 1433)
+* a:                                     chapter.            (line 2281)
+* aaa, bbb:                              chapter.            (line 2281)
+* a--a:                                  chapter.            (line 2281)
 * a--asis:                               chapter.            (line  525)
-* a--asis <1>:                           chapter.            (line 1221)
-* a--asis <2>:                           chapter.            (line 2053)
+* a--asis <1>:                           chapter.            (line 1222)
+* a--asis <2>:                           chapter.            (line 2055)
 * b:                                     chapter.            (line  526)
-* b <1>:                                 chapter.            (line 1222)
-* b <2>:                                 chapter.            (line 2054)
-* b--b, c--c:                            chapter.            (line 2278)
-* counting entry:                        chapter.            (line 2614)
-* d--dd, e--ee, f--ff:                   chapter.            (line 2278)
+* b <1>:                                 chapter.            (line 1223)
+* b <2>:                                 chapter.            (line 2056)
+* b--b, c--c:                            chapter.            (line 2281)
+* counting entry:                        chapter.            (line 2617)
+* d--dd, e--ee, f--ff:                   chapter.            (line 2281)
 * d--efcv_name:                          chapter.            (line  366)
 * d--efcv_name <1>:                      chapter.            (line  369)
-* d--efcv_name <2>:                      chapter.            (line 1062)
-* d--efcv_name <3>:                      chapter.            (line 1065)
-* d--efcv_name <4>:                      chapter.            (line 1894)
-* d--efcv_name <5>:                      chapter.            (line 1897)
+* d--efcv_name <2>:                      chapter.            (line 1063)
+* d--efcv_name <3>:                      chapter.            (line 1066)
+* d--efcv_name <4>:                      chapter.            (line 1896)
+* d--efcv_name <5>:                      chapter.            (line 1899)
 * d--efivar_name of c--lass:             chapter.            (line  411)
-* d--efivar_name of c--lass <1>:         chapter.            (line 1107)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1939)
+* d--efivar_name of c--lass <1>:         chapter.            (line 1108)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1941)
 * d--efopt_name:                         chapter.            (line  402)
-* d--efopt_name <1>:                     chapter.            (line 1098)
-* d--efopt_name <2>:                     chapter.            (line 1930)
+* d--efopt_name <1>:                     chapter.            (line 1099)
+* d--efopt_name <2>:                     chapter.            (line 1932)
 * d--eftypecv_name of c--lass:           chapter.            (line  372)
 * d--eftypecv_name of c--lass <1>:       chapter.            (line  375)
-* d--eftypecv_name of c--lass <2>:       chapter.            (line 1068)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line 1071)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1900)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1903)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line 1069)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line 1072)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1902)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1905)
 * d--eftypecv_name2 of c--lass2:         chapter.            (line  443)
 * d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  446)
-* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1139)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1142)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1972)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1975)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1140)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1143)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1974)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1977)
 * d--eftypeivar_name of c--lass:         chapter.            (line  414)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1110)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1942)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1111)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1944)
 * d--eftypevar_name:                     chapter.            (line  408)
-* d--eftypevar_name <1>:                 chapter.            (line 1104)
-* d--eftypevar_name <2>:                 chapter.            (line 1936)
+* d--eftypevar_name <1>:                 chapter.            (line 1105)
+* d--eftypevar_name <2>:                 chapter.            (line 1938)
 * d--eftypevr_name:                      chapter.            (line  363)
-* d--eftypevr_name <1>:                  chapter.            (line 1059)
-* d--eftypevr_name <2>:                  chapter.            (line 1891)
+* d--eftypevr_name <1>:                  chapter.            (line 1060)
+* d--eftypevr_name <2>:                  chapter.            (line 1893)
 * d--efvar_name:                         chapter.            (line  396)
 * d--efvar_name <1>:                     chapter.            (line  399)
-* d--efvar_name <2>:                     chapter.            (line 1092)
-* d--efvar_name <3>:                     chapter.            (line 1095)
-* d--efvar_name <4>:                     chapter.            (line 1924)
-* d--efvar_name <5>:                     chapter.            (line 1927)
+* d--efvar_name <2>:                     chapter.            (line 1093)
+* d--efvar_name <3>:                     chapter.            (line 1096)
+* d--efvar_name <4>:                     chapter.            (line 1926)
+* d--efvar_name <5>:                     chapter.            (line 1929)
 * d--efvr_name:                          chapter.            (line  342)
-* d--efvr_name <1>:                      chapter.            (line 1038)
-* d--efvr_name <2>:                      chapter.            (line 1870)
-* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2278)
+* d--efvr_name <1>:                      chapter.            (line 1039)
+* d--efvr_name <2>:                      chapter.            (line 1872)
+* g--gg, h--hh jjj, k--kk, l--ll:        chapter.            (line 2281)
 * index entry between item and itemx:    chapter.            (line  530)
-* index entry between item and itemx <1>: chapter.           (line  659)
-* index entry between item and itemx <2>: chapter.           (line 1226)
-* index entry between item and itemx <3>: chapter.           (line 1355)
-* index entry between item and itemx <4>: chapter.           (line 2058)
-* index entry between item and itemx <5>: chapter.           (line 2220)
-* index entry in footnote:               chapter.            (line 2609)
+* index entry between item and itemx <1>: chapter.           (line  660)
+* index entry between item and itemx <2>: chapter.           (line 1227)
+* index entry between item and itemx <3>: chapter.           (line 1357)
+* index entry between item and itemx <4>: chapter.           (line 2060)
+* index entry between item and itemx <5>: chapter.           (line 2223)
+* index entry in footnote:               chapter.            (line 2612)
 * index entry within deffn:              chapter.            (line  317)
-* index entry within deffn <1>:          chapter.            (line 1013)
-* index entry within deffn <2>:          chapter.            (line 1843)
+* index entry within deffn <1>:          chapter.            (line 1014)
+* index entry within deffn <2>:          chapter.            (line 1845)
 * index entry within itemize:            chapter.            (line  228)
-* index entry within itemize <1>:        chapter.            (line  924)
-* index entry within itemize <2>:        chapter.            (line 1754)
+* index entry within itemize <1>:        chapter.            (line  925)
+* index entry within itemize <2>:        chapter.            (line 1756)
 * index entry within multitable:         chapter.            (line  250)
-* index entry within multitable <1>:     chapter.            (line  946)
-* index entry within multitable <2>:     chapter.            (line 1777)
-* t-ruc:                                 chapter.            (line 2278)
-* T-ruc:                                 chapter.            (line 2278)
+* index entry within multitable <1>:     chapter.            (line  947)
+* index entry within multitable <2>:     chapter.            (line 1779)
+* t-ruc:                                 chapter.            (line 2281)
+* T-ruc:                                 chapter.            (line 2281)
 * vtable i--tem code kbdinputstyle:      chapter.            (line  152)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  848)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1677)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  849)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1679)
 * vtable i--tem default kbdinputstyle:   chapter.            (line  147)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  843)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1672)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  844)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1674)
 * vtable i--tem distinct kbdinputstyle:  chapter.            (line  162)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  858)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1687)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  859)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1689)
 * vtable i--tem example kbdinputstyle:   chapter.            (line  157)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  853)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1682)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  854)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1684)
 * vtable i--tem in example code kbdinputstyle: chapter.      (line  154)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  850)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1679)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  851)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1681)
 * vtable i--tem in example default kbdinputstyle: chapter.   (line  149)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  845)
+                                                             (line  846)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1674)
+                                                             (line 1676)
 * vtable i--tem in example distinct kbdinputstyle: chapter.  (line  164)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  860)
+                                                             (line  861)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1689)
+                                                             (line 1691)
 * vtable i--tem in example example kbdinputstyle: chapter.   (line  159)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  855)
+                                                             (line  856)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1684)
+                                                             (line 1686)
 
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  724)
-* --foption <2>:                         chapter.            (line 1431)
-* ?:                                     chapter.            (line 2278)
-* .:                                     chapter.            (line 2278)
+* --foption <1>:                         chapter.            (line  725)
+* --foption <2>:                         chapter.            (line 1433)
+* ?:                                     chapter.            (line 2281)
+* .:                                     chapter.            (line 2281)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  724)
-* `` <2>:                                chapter.            (line 1431)
+* `` <1>:                                chapter.            (line  725)
+* `` <2>:                                chapter.            (line 1433)
 * a:                                     chapter.            (line  330)
 * a <1>:                                 chapter.            (line  529)
-* a <2>:                                 chapter.            (line  658)
-* a <3>:                                 chapter.            (line 1026)
-* a <4>:                                 chapter.            (line 1225)
-* a <5>:                                 chapter.            (line 1354)
-* a <6>:                                 chapter.            (line 1856)
-* a <7>:                                 chapter.            (line 2057)
-* a <8>:                                 chapter.            (line 2219)
-* a <9>:                                 chapter.            (line 2278)
-* after:                                 chapter.            (line  669)
-* after <1>:                             chapter.            (line 1365)
-* after <2>:                             chapter.            (line 2230)
+* a <2>:                                 chapter.            (line  659)
+* a <3>:                                 chapter.            (line 1027)
+* a <4>:                                 chapter.            (line 1226)
+* a <5>:                                 chapter.            (line 1356)
+* a <6>:                                 chapter.            (line 1858)
+* a <7>:                                 chapter.            (line 2059)
+* a <8>:                                 chapter.            (line 2222)
+* a <9>:                                 chapter.            (line 2281)
+* after:                                 chapter.            (line  670)
+* after <1>:                             chapter.            (line 1367)
+* after <2>:                             chapter.            (line 2233)
 * arg2:                                  chapter.            (line  449)
-* arg2 <1>:                              chapter.            (line 1145)
-* arg2 <2>:                              chapter.            (line 1979)
+* arg2 <1>:                              chapter.            (line 1146)
+* arg2 <2>:                              chapter.            (line 1981)
 * b:                                     chapter.            (line  530)
-* b <1>:                                 chapter.            (line  659)
-* b <2>:                                 chapter.            (line 1226)
-* b <3>:                                 chapter.            (line 1355)
-* b <4>:                                 chapter.            (line 2058)
-* b <5>:                                 chapter.            (line 2220)
+* b <1>:                                 chapter.            (line  660)
+* b <2>:                                 chapter.            (line 1227)
+* b <3>:                                 chapter.            (line 1357)
+* b <4>:                                 chapter.            (line 2060)
+* b <5>:                                 chapter.            (line 2223)
 * bidule machin:                         chapter.            (line  325)
-* bidule machin <1>:                     chapter.            (line 1021)
-* bidule machin <2>:                     chapter.            (line 1851)
+* bidule machin <1>:                     chapter.            (line 1022)
+* bidule machin <2>:                     chapter.            (line 1853)
 * d--effn_name:                          chapter.            (line  309)
-* d--effn_name <1>:                      chapter.            (line 1005)
-* d--effn_name <2>:                      chapter.            (line 1835)
+* d--effn_name <1>:                      chapter.            (line 1006)
+* d--effn_name <2>:                      chapter.            (line 1837)
 * d--efmac_name:                         chapter.            (line  390)
-* d--efmac_name <1>:                     chapter.            (line 1086)
-* d--efmac_name <2>:                     chapter.            (line 1918)
+* d--efmac_name <1>:                     chapter.            (line 1087)
+* d--efmac_name <2>:                     chapter.            (line 1920)
 * d--efmethod_name on c--lass:           chapter.            (line  417)
-* d--efmethod_name on c--lass <1>:       chapter.            (line 1113)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1945)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1114)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1947)
 * d--efop_name on c--lass:               chapter.            (line  378)
 * d--efop_name on c--lass <1>:           chapter.            (line  381)
-* d--efop_name on c--lass <2>:           chapter.            (line 1074)
-* d--efop_name on c--lass <3>:           chapter.            (line 1077)
-* d--efop_name on c--lass <4>:           chapter.            (line 1906)
-* d--efop_name on c--lass <5>:           chapter.            (line 1909)
+* d--efop_name on c--lass <2>:           chapter.            (line 1075)
+* d--efop_name on c--lass <3>:           chapter.            (line 1078)
+* d--efop_name on c--lass <4>:           chapter.            (line 1908)
+* d--efop_name on c--lass <5>:           chapter.            (line 1911)
 * d--efspec_name:                        chapter.            (line  393)
-* d--efspec_name <1>:                    chapter.            (line 1089)
-* d--efspec_name <2>:                    chapter.            (line 1921)
+* d--efspec_name <1>:                    chapter.            (line 1090)
+* d--efspec_name <2>:                    chapter.            (line 1923)
 * d--eftypefn_name:                      chapter.            (line  351)
 * d--eftypefn_name <1>:                  chapter.            (line  354)
-* d--eftypefn_name <2>:                  chapter.            (line 1047)
-* d--eftypefn_name <3>:                  chapter.            (line 1050)
-* d--eftypefn_name <4>:                  chapter.            (line 1879)
-* d--eftypefn_name <5>:                  chapter.            (line 1882)
+* d--eftypefn_name <2>:                  chapter.            (line 1048)
+* d--eftypefn_name <3>:                  chapter.            (line 1051)
+* d--eftypefn_name <4>:                  chapter.            (line 1881)
+* d--eftypefn_name <5>:                  chapter.            (line 1884)
 * d--eftypefn_name2:                     chapter.            (line  428)
-* d--eftypefn_name2 <1>:                 chapter.            (line 1124)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1957)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1125)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1959)
 * d--eftypefun_name:                     chapter.            (line  405)
-* d--eftypefun_name <1>:                 chapter.            (line 1101)
-* d--eftypefun_name <2>:                 chapter.            (line 1933)
+* d--eftypefun_name <1>:                 chapter.            (line 1102)
+* d--eftypefun_name <2>:                 chapter.            (line 1935)
 * d--eftypemethod_name on c--lass:       chapter.            (line  420)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1116)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1948)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1117)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1950)
 * d--eftypeop_name on c--lass:           chapter.            (line  357)
 * d--eftypeop_name on c--lass <1>:       chapter.            (line  360)
-* d--eftypeop_name on c--lass <2>:       chapter.            (line 1053)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line 1056)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1885)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1888)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line 1054)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line 1057)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1887)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1890)
 * d--eftypeop_name2 on c--lass2:         chapter.            (line  433)
 * d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  438)
-* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1129)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1134)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1962)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1967)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1130)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1135)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1964)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1969)
 * d--efun_name:                          chapter.            (line  387)
-* d--efun_name <1>:                      chapter.            (line 1083)
-* d--efun_name <2>:                      chapter.            (line 1915)
+* d--efun_name <1>:                      chapter.            (line 1084)
+* d--efun_name <2>:                      chapter.            (line 1917)
 * de--ffn_name:                          chapter.            (line  312)
-* de--ffn_name <1>:                      chapter.            (line 1008)
-* de--ffn_name <2>:                      chapter.            (line 1838)
+* de--ffn_name <1>:                      chapter.            (line 1009)
+* de--ffn_name <2>:                      chapter.            (line 1840)
 * deffn:                                 chapter.            (line  333)
 * deffn <1>:                             chapter.            (line  335)
-* deffn <2>:                             chapter.            (line 1029)
-* deffn <3>:                             chapter.            (line 1031)
-* deffn <4>:                             chapter.            (line 1860)
-* deffn <5>:                             chapter.            (line 1862)
+* deffn <2>:                             chapter.            (line 1030)
+* deffn <3>:                             chapter.            (line 1032)
+* deffn <4>:                             chapter.            (line 1862)
+* deffn <5>:                             chapter.            (line 1864)
 * deffnx:                                chapter.            (line  331)
 * deffnx <1>:                            chapter.            (line  336)
-* deffnx <2>:                            chapter.            (line 1027)
-* deffnx <3>:                            chapter.            (line 1032)
-* deffnx <4>:                            chapter.            (line 1857)
-* deffnx <5>:                            chapter.            (line 1863)
-* f---aa:                                chapter.            (line 2278)
-* f---bb, f---cc:                        chapter.            (line 2278)
-* f---ddd, f---eee, ffff:                chapter.            (line 2278)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2278)
+* deffnx <2>:                            chapter.            (line 1028)
+* deffnx <3>:                            chapter.            (line 1033)
+* deffnx <4>:                            chapter.            (line 1859)
+* deffnx <5>:                            chapter.            (line 1865)
+* f---aa:                                chapter.            (line 2281)
+* f---bb, f---cc:                        chapter.            (line 2281)
+* f---ddd, f---eee, ffff:                chapter.            (line 2281)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2281)
 * followed:                              chapter.            (line  328)
-* followed <1>:                          chapter.            (line  667)
-* followed <2>:                          chapter.            (line 1024)
-* followed <3>:                          chapter.            (line 1363)
-* followed <4>:                          chapter.            (line 1854)
-* followed <5>:                          chapter.            (line 2228)
+* followed <1>:                          chapter.            (line  668)
+* followed <2>:                          chapter.            (line 1025)
+* followed <3>:                          chapter.            (line 1365)
+* followed <4>:                          chapter.            (line 1856)
+* followed <5>:                          chapter.            (line 2231)
 * I:                                     chapter.            (line  316)
 * I <1>:                                 chapter.            (line  338)
-* I <2>:                                 chapter.            (line 1012)
-* I <3>:                                 chapter.            (line 1034)
-* I <4>:                                 chapter.            (line 1842)
-* I <5>:                                 chapter.            (line 1865)
+* I <2>:                                 chapter.            (line 1013)
+* I <3>:                                 chapter.            (line 1035)
+* I <4>:                                 chapter.            (line 1844)
+* I <5>:                                 chapter.            (line 1867)
 * id i ule:                              chapter.            (line  322)
-* id i ule <1>:                          chapter.            (line 1018)
-* id i ule <2>:                          chapter.            (line 1848)
+* id i ule <1>:                          chapter.            (line 1019)
+* id i ule <2>:                          chapter.            (line 1850)
 * id ule:                                chapter.            (line  321)
-* id ule <1>:                            chapter.            (line 1017)
-* id ule <2>:                            chapter.            (line 1847)
-* INVALID:                               chapter.            (line  671)
-* INVALID <1>:                           chapter.            (line 1367)
-* INVALID <2>:                           chapter.            (line 2232)
+* id ule <1>:                            chapter.            (line 1018)
+* id ule <2>:                            chapter.            (line 1849)
+* INVALID:                               chapter.            (line  672)
+* INVALID <1>:                           chapter.            (line 1369)
+* INVALID <2>:                           chapter.            (line 2235)
 * log trap:                              chapter.            (line  318)
-* log trap <1>:                          chapter.            (line 1014)
-* log trap <2>:                          chapter.            (line 1844)
+* log trap <1>:                          chapter.            (line 1015)
+* log trap <2>:                          chapter.            (line 1846)
 * log trap1:                             chapter.            (line  319)
-* log trap1 <1>:                         chapter.            (line 1015)
-* log trap1 <2>:                         chapter.            (line 1845)
+* log trap1 <1>:                         chapter.            (line 1016)
+* log trap1 <2>:                         chapter.            (line 1847)
 * log trap2:                             chapter.            (line  320)
-* log trap2 <1>:                         chapter.            (line 1016)
-* log trap2 <2>:                         chapter.            (line 1846)
+* log trap2 <1>:                         chapter.            (line 1017)
+* log trap2 <2>:                         chapter.            (line 1848)
 * machin:                                chapter.            (line  324)
 * machin <1>:                            chapter.            (line  326)
-* machin <2>:                            chapter.            (line  663)
-* machin <3>:                            chapter.            (line  664)
-* machin <4>:                            chapter.            (line  665)
-* machin <5>:                            chapter.            (line  666)
-* machin <6>:                            chapter.            (line 1020)
-* machin <7>:                            chapter.            (line 1022)
-* machin <8>:                            chapter.            (line 1359)
-* machin <9>:                            chapter.            (line 1360)
-* machin <10>:                           chapter.            (line 1361)
-* machin <11>:                           chapter.            (line 1362)
-* machin <12>:                           chapter.            (line 1850)
-* machin <13>:                           chapter.            (line 1852)
-* machin <14>:                           chapter.            (line 2224)
-* machin <15>:                           chapter.            (line 2225)
-* machin <16>:                           chapter.            (line 2226)
-* machin <17>:                           chapter.            (line 2227)
+* machin <2>:                            chapter.            (line  664)
+* machin <3>:                            chapter.            (line  665)
+* machin <4>:                            chapter.            (line  666)
+* machin <5>:                            chapter.            (line  667)
+* machin <6>:                            chapter.            (line 1021)
+* machin <7>:                            chapter.            (line 1023)
+* machin <8>:                            chapter.            (line 1361)
+* machin <9>:                            chapter.            (line 1362)
+* machin <10>:                           chapter.            (line 1363)
+* machin <11>:                           chapter.            (line 1364)
+* machin <12>:                           chapter.            (line 1852)
+* machin <13>:                           chapter.            (line 1854)
+* machin <14>:                           chapter.            (line 2227)
+* machin <15>:                           chapter.            (line 2228)
+* machin <16>:                           chapter.            (line 2229)
+* machin <17>:                           chapter.            (line 2230)
 * n--ame:                                chapter.            (line  345)
 * n--ame <1>:                            chapter.            (line  348)
-* n--ame <2>:                            chapter.            (line 1041)
-* n--ame <3>:                            chapter.            (line 1044)
-* n--ame <4>:                            chapter.            (line 1873)
-* n--ame <5>:                            chapter.            (line 1876)
+* n--ame <2>:                            chapter.            (line 1042)
+* n--ame <3>:                            chapter.            (line 1045)
+* n--ame <4>:                            chapter.            (line 1875)
+* n--ame <5>:                            chapter.            (line 1878)
 * name2:                                 chapter.            (line  423)
-* name2 <1>:                             chapter.            (line 1119)
-* name2 <2>:                             chapter.            (line 1952)
-* t--ruc:                                chapter.            (line 2278)
-* T--ruc:                                chapter.            (line 2278)
+* name2 <1>:                             chapter.            (line 1120)
+* name2 <2>:                             chapter.            (line 1954)
+* t--ruc:                                chapter.            (line 2281)
+* T--ruc:                                chapter.            (line 2281)
 * truc:                                  chapter.            (line  317)
 * truc <1>:                              chapter.            (line  339)
-* truc <2>:                              chapter.            (line 1013)
-* truc <3>:                              chapter.            (line 1035)
-* truc <4>:                              chapter.            (line 1843)
-* truc <5>:                              chapter.            (line 1866)
-* xxx, zzz:                              chapter.            (line 2278)
+* truc <2>:                              chapter.            (line 1014)
+* truc <3>:                              chapter.            (line 1036)
+* truc <4>:                              chapter.            (line 1845)
+* truc <5>:                              chapter.            (line 1868)
+* xxx, zzz:                              chapter.            (line 2281)
 
 Top section
 1 chapter
diff --git 
a/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting.html 
b/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting.html
index 8ec7555b7f..cd6cd05db4 100644
--- a/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting.html
@@ -1971,6 +1971,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
@@ -3075,6 +3076,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
@@ -4324,6 +4326,7 @@ Invalid use of @':
 
 
 
+
 </pre><pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
 &#262;&#807; &#262;&#807; a&#779; &#551; &aring; a&#865;
 &#259; &#462;
diff --git a/tp/tests/layout/res_parser/formatting_texi2html/formatting.html 
b/tp/tests/layout/res_parser/formatting_texi2html/formatting.html
index 725108efdd..9e55d788cc 100644
--- a/tp/tests/layout/res_parser/formatting_texi2html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_texi2html/formatting.html
@@ -1923,6 +1923,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 <strong class="author">author</strong><br>
 
@@ -3029,6 +3030,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
@@ -4193,6 +4195,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
@@ -5297,6 +5300,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
@@ -6546,6 +6550,7 @@ Invalid use of @':
 
 
 
+
 </pre><pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
 &#262;&#807; &#262;&#807; a&#779; &#551; &aring; a&#865;
 &#259; &#462;
diff --git a/tp/tests/layout/res_parser/formatting_texi2html_nodes/chapter.html 
b/tp/tests/layout/res_parser/formatting_texi2html_nodes/chapter.html
index c09f5845a9..665027f014 100644
--- a/tp/tests/layout/res_parser/formatting_texi2html_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_texi2html_nodes/chapter.html
@@ -1934,6 +1934,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
@@ -3038,6 +3039,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
@@ -4287,6 +4289,7 @@ Invalid use of @':
 
 
 
+
 </pre><pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
 &#262;&#807; &#262;&#807; a&#779; &#551; &aring; a&#865;
 &#259; &#462;
diff --git a/tp/tests/layout/res_parser/formatting_texi2html_nodes/index.html 
b/tp/tests/layout/res_parser/formatting_texi2html_nodes/index.html
index c6cca4dcac..6bf77e2275 100644
--- a/tp/tests/layout/res_parser/formatting_texi2html_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_texi2html_nodes/index.html
@@ -1902,6 +1902,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 <strong class="author">author</strong><br>
 
@@ -3008,6 +3009,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
diff --git a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html 
b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
index 61c02a0966..4e57d0e7d5 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -1927,6 +1927,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 <strong class="author">author</strong><br>
 
@@ -3033,6 +3034,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
@@ -4213,6 +4215,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
@@ -5317,6 +5320,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
@@ -6566,6 +6570,7 @@ Invalid use of @':
 
 
 
+
 </pre><pre class="displaymath">&uuml; &Uuml; &ntilde; &acirc; &eacute; &#333; 
&igrave; &eacute; &#274;&#768;
 &#262;&#807; &#262;&#807; a&#779; &#551; &aring; a&#865;
 &#259; &#462;
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html 
b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
index 892fab494a..6a41276711 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
@@ -2058,6 +2058,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <DIV CLASS="displaymath">
@@ -3297,6 +3298,7 @@ html ''
 <p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img class="image" src="f--ile.e--xt" 
alt="jk&nbsp;_&quot;&nbsp;%@ in b &quot;">
 <code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; 
%@:}}</code> <img class="image" src="filejk%20_%22%20%25%40.jpg" 
alt="altjk&nbsp;_&quot;&nbsp;%@">
 </p>
+<br>
 
 
 <DIV CLASS="displaymath">
@@ -4681,6 +4683,7 @@ Invalid use of @':
 
 
 
+
 </pre><DIV CLASS="displaymath">
 <!-- MATH
  \begin{displaymath}



reply via email to

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