texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: Only @r stops upright. Propagate upright in non s


From: Patrice Dumas
Subject: branch master updated: Only @r stops upright. Propagate upright in non slanted
Date: Fri, 29 Jul 2022 16:52:13 -0400

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 51f9b16c7a Only @r stops upright. Propagate upright in non slanted
51f9b16c7a is described below

commit 51f9b16c7aaa0198bbd151679b6c96f19520b32b
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Jul 29 22:51:59 2022 +0200

    Only @r stops upright. Propagate upright in non slanted
    
    * tp/Texinfo/Convert/LaTeX.pm (%need_known_embrac, _convert):
    embrac is not propagated to \texttt and similar non slanted
    command.  We want to propagate, so use \EmbracMakeKnown{}.
    We do it locally because \textt redefinition, for example
    breaks \hyperref.  To do it more than once, we need to undefine
    symbols set by \EmbracMakeKnown{}.
---
 ChangeLog                                          |    11 +
 tp/Texinfo/Convert/LaTeX.pm                        |    77 +-
 tp/t/converters_tests.t                            |    12 +
 .../converters_tests/definition_commands.pl        | 10871 ++++++++++++-------
 .../definition_commands/res_html/chapter.html      |    66 +-
 .../res_latex/definition_commands.tex              |   139 +-
 tp/t/results/def/omit_def_space.pl                 |     2 +-
 .../res_latex/multiple_lang_chapters.tex           |     7 +-
 .../res_parser/formatting_latex/formatting.tex     |   331 +-
 9 files changed, 7620 insertions(+), 3896 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b67949cd14..c9fd0d6265 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2022-07-29  Patrice Dumas  <pertusus@free.fr>
+
+       Only @r stops upright. Propagate upright in non slanted
+
+       * tp/Texinfo/Convert/LaTeX.pm (%need_known_embrac, _convert):
+       embrac is not propagated to \texttt and similar non slanted
+       command.  We want to propagate, so use \EmbracMakeKnown{}.
+       We do it locally because \textt redefinition, for example
+       breaks \hyperref.  To do it more than once, we need to undefine
+       symbols set by \EmbracMakeKnown{}.
+
 2022-07-29  Gavin Smith  <gavinsmith0123@gmail.com>
 
        @r and @t in def line
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 7a61f007e5..46f6cd7ac0 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -632,6 +632,15 @@ my %LaTeX_style_brace_commands = (
   }
 );
 
+# embrac does not propagate in these commands.  But we want
+# upside braces in these commands.  So we make them known to
+# embrac.  Only locally, otherwise other commands can be broken.
+my %need_known_embrac;
+# other commands needed?
+foreach my $LaTeX_style_command_name ('textsc', 'textbf', 'texttt') {
+  $need_known_embrac{'\\'.$LaTeX_style_command_name} = 
$LaTeX_style_command_name;
+}
+
 my $code_text_context = 'codetext';
 
 # in code, we want to keep @cite result in slanted but
@@ -1354,6 +1363,9 @@ roundcorner=10pt}
   }
 
   if ($self->{'packages'}->{'embrac'}) {
+    # in order to have brackets and parenthese upright in slanted typewriter
+    # \textsl{\texttt, \EmbracMakeKnown{texttt} is needed.  However, we only 
set it
+    # locally, otherwise \hyperref in \texttt can break.
     $header_code .= '% braces are upright in italic and slanted only in @def*
 % so it is turned off here, and turned on @def* lines
 \EmbracOff{}%
@@ -1406,6 +1418,7 @@ roundcorner=10pt}
   }
   if ($self->{'packages'}->{'embrac'}) {
     $header .= "\\usepackage{embrac}\n";
+    $header .= "\\usepackage{expl3}\n";
   }
   if ($self->{'packages'}->{'mdframed'}) {
     # framemethod=tikz needed for roundcorners for @cartouche
@@ -2137,9 +2150,10 @@ sub _stop_embrac
   my $did_stop_embrac = 0;
 
   if ($self->{'formatting_context'}->[-1]->{'embrac'}
-      and $self->{'formatting_context'}->[-1]->{'embrac'} == 1) {
+      and $self->{'formatting_context'}->[-1]->{'embrac'}->[-1]
+      and $self->{'formatting_context'}->[-1]->{'embrac'}->[-1]->{'status'} == 
1) {
     $result .= '\EmbracOff{}';
-    $self->{'formatting_context'}->[-1]->{'embrac'} = 0;
+    $self->{'formatting_context'}->[-1]->{'embrac'}->[-1]->{'status'} = 0;
     $did_stop_embrac = 1;
   }
   return ($result, $did_stop_embrac)
@@ -2154,7 +2168,7 @@ sub _restart_embrac_if_needed
   my $did_stop_embrac = shift;
 
   if ($did_stop_embrac) {
-    $self->{'formatting_context'}->[-1]->{'embrac'} = 1;
+    $self->{'formatting_context'}->[-1]->{'embrac'}->[-1]->{'status'} = 1;
     $result .= '\EmbracOn{}';
   }
   return $result;
@@ -2397,7 +2411,9 @@ sub _convert($$)
     } elsif (exists($LaTeX_style_brace_commands{'text'}->{$cmdname})
          or ($element->{'type'}
              and $element->{'type'} eq 'definfoenclose_command')) {
-      ($result, $did_stop_embrac) = _stop_embrac($self, $result);
+      my $did_stop_embrac = 0;
+      ($result, $did_stop_embrac) = _stop_embrac($self, $result)
+         if ($cmdname eq 'r');
       if ($self->{'quotes_map'}->{$cmdname}) {
         $result .= $self->{'quotes_map'}->{$cmdname}->[0];
       }
@@ -2414,8 +2430,22 @@ sub _convert($$)
                                                      ->{$cmdname} = 1;
       }
       if ($LaTeX_style_brace_commands{$formatting_context}->{$cmdname}) {
-        $result
-           .= "$LaTeX_style_brace_commands{$formatting_context}->{$cmdname}\{";
+        my $LaTeX_style_command
+          = $LaTeX_style_brace_commands{$formatting_context}->{$cmdname};
+        if ($need_known_embrac{$LaTeX_style_command}
+            and $self->{'formatting_context'}->[-1]->{'embrac'}
+            and $self->{'formatting_context'}->[-1]->{'embrac'}->[-1]
+            and 
$self->{'formatting_context'}->[-1]->{'embrac'}->[-1]->{'status'} == 1) {
+          my $defined_style_embrac = $need_known_embrac{$LaTeX_style_command};
+          if (not $self->{'formatting_context'}->[-1]->{'embrac'}->[-1]
+                ->{'made_known'}->{$defined_style_embrac}) {
+            $result .= '\EmbracMakeKnown{'
+                          .$defined_style_embrac.'}';
+            $self->{'formatting_context'}->[-1]->{'embrac'}->[-1]
+                       ->{'made_known'}->{$defined_style_embrac} = 1;
+          }
+        }
+        $result .= "$LaTeX_style_command\{";
       }
       if ($element->{'args'}) {
         $result .= _convert($self, $element->{'args'}->[0]);
@@ -2432,7 +2462,6 @@ sub _convert($$)
       $result = _restart_embrac_if_needed($self, $result, $did_stop_embrac);
       return $result;
     } elsif ($cmdname eq 'kbd') {
-      ($result, $did_stop_embrac) = _stop_embrac($self, $result);
       # 'kbd' is special, distinct font is typewriter + slanted
       # @kbdinputstyle
       # 'code' Always use the same font for @kbd as @code.
@@ -2459,7 +2488,6 @@ sub _convert($$)
       } else {
         $result .= '}}';
       }
-      $result = _restart_embrac_if_needed($self, $result, $did_stop_embrac);
       return $result;
     } elsif ($cmdname eq 'verb') {
       # FIXME \verb is forbidden in other macros
@@ -3509,18 +3537,31 @@ sub _convert($$)
           }
         }
         $result .= _convert($self, $name) if $name;
+        # will contain the command names that have been made known to
+        # embrac, like texttt and need to have the symbol undefined
+        # such that they can be redefined later
+        my $known_embrac_commands;
         if ($arguments) {
           $result .= $def_space;
           if ($deftype_commands{$command}) {
             $result .= _convert($self, {'contents' => $arguments});
           } else {
             $self->{'packages'}->{'embrac'} = 1;
-            # no need to close that \EmbracOn{}, it is local to the texttt
             $result .= '\EmbracOn{}\textsl{';
-            $self->{'formatting_context'}->[-1]->{'embrac'} = 1;
+            push @{$self->{'formatting_context'}->[-1]->{'embrac'}},
+              {'status' => 1, 'made_known' => {}};
+
             $result .= _convert($self, {'contents' => $arguments});
-            $self->{'formatting_context'}->[-1]->{'embrac'} = undef;
-            $result .= '}'; # \textsl
+
+            # \EmbracOff{} is probably not really needed here as \EmbracOn{}
+            # should be local to the texttt
+            $result .= '}\EmbracOff{}'; # \textsl
+            my $closed_embrac
+              = pop @{$self->{'formatting_context'}->[-1]->{'embrac'}};
+            if (scalar(keys(%{$closed_embrac->{'made_known'}}))) {
+              $known_embrac_commands
+                = [sort(keys(%{$closed_embrac->{'made_known'}}))]
+            }
           }
         }
 
@@ -3551,6 +3592,18 @@ sub _convert($$)
           $result .= "\\hfill[$converted]\n";
         }
         $result .= "\n\n";
+        # undefine symbols associated with commands that have been made
+        # known to embrac, such that they can be redefined later
+        if (defined($known_embrac_commands)) {
+          $result .= "\\ExplSyntaxOn%\n";
+          foreach my $defined_style_embrac (@{$known_embrac_commands}) {
+            $result .= '\cs_undefine:N{\embrac_'.$defined_style_embrac.':nn}'.
+        '\cs_undefine:N{\embrac_orig_'.$defined_style_embrac.':n}'.
+        '\cs_undefine:N{\__embrac_'.$defined_style_embrac.':n}%
+';
+          }
+          $result .= "\\ExplSyntaxOff%";
+        }
       }
       $result .= "\n";
       $result .= _index_entry($self, $element);
diff --git a/tp/t/converters_tests.t b/tp/t/converters_tests.t
index f18f21381d..6aa92523b3 100644
--- a/tp/t/converters_tests.t
+++ b/tp/t/converters_tests.t
@@ -823,8 +823,11 @@ deffn r slanted for @var{a---rg1} and @var{a--rg2}
 @defspecx foobar (var @r{[}from to @r{[}inc@r{]]}) r
 @defspecx foobar (var @slanted{[}from to @slanted{[}inc@slanted{]]}) slanted
 @defspecx foobar (var @code{[}from to @code{[}inc@code{]]}) code
+@defspecx foobar (var @t{[}from to @t{[}inc@t{]]}) t
+@defspecx foobar (var @t{@b{[}}from to @t{@b{[}}inc@t{@b{]]}}) t:b
 @defspecx foobar (var @r{@slanted{[}}from to 
@r{@slanted{[}}inc@r{@slanted{]]}}) r:slanted
 @defspecx foobar (var @r{@code{[}}from to @r{@code{[}}inc@r{@code{]]}}) r:code
+@defspecx foobar (var @r{@t{[}}from to @r{@t{[}}inc@r{@t{]]}}) r:t
 separators
 @end defspec
 
@@ -833,9 +836,12 @@ separators
 @defspecx foobar @r{va---riable} r
 @defspecx foobar @slanted{va---riable} slanted
 @defspecx foobar @code{va---riable} code
+@defspecx foobar @t{va---riable} t
+@defspecx foobar @t{@b{va---riable}} t:b
 @defspecx foobar @r{@var{va---riable}} r:var
 @defspecx foobar @r{@slanted{va---riable}} r:slanted
 @defspecx foobar @r{@code{va---riable}} r:code
+@defspecx foobar @r{@t{va---riable}} r:t
 name
 @end defspec
 
@@ -894,8 +900,11 @@ In deffn with code and var used
 @deftypefnx {Library Function} int foobar  (int @var{f---oo}@r{[}, float 
@var{b--ar}@r{]}) r
 @deftypefnx {Library Function} int foobar  (int @var{f---oo}@slanted{[}, float 
@var{b--ar}@slanted{]}) slanted
 @deftypefnx {Library Function} int foobar  (int @var{f---oo}@code{[}, float 
@var{b--ar}@code{]}) code
+@deftypefnx {Library Function} int foobar  (int @var{f---oo}@t{[}, float 
@var{b--ar}@t{]}) t
+@deftypefnx {Library Function} int foobar  (int @var{f---oo}@t{@b{[}}, float 
@var{b--ar}@t{@b{]}}) t:b
 @deftypefnx {Library Function} int foobar  (int @var{f---oo}@r{@slanted{[}}, 
float @var{b--ar}@r{@slanted{]}}) r:slanted
 @deftypefnx {Library Function} int foobar  (int @var{f---oo}@r{@code{[}}, 
float @var{b--ar}@r{@code{]}}) r:code
+@deftypefnx {Library Function} int foobar  (int @var{f---oo}@r{@t{[}}, float 
@var{b--ar}@r{@t{]}}) r:t
 separators
 @end deftypefn
 
@@ -903,8 +912,11 @@ separators
 @deftypefnx {Library Function} int foobar  (@r{i--nt} @var{f---oo}[, float 
@var{b--ar}]) r
 @deftypefnx {Library Function} int foobar  (@slanted{i--nt} @var{f---oo}[, 
float @var{b--ar}]) slanted
 @deftypefnx {Library Function} int foobar  (@code{i--nt} @var{f---oo}[, float 
@var{b--ar}]) code
+@deftypefnx {Library Function} int foobar  (@t{i--nt} @var{f---oo}[, float 
@var{b--ar}]) t
+@deftypefnx {Library Function} int foobar  (@t{@b{i--nt}} @var{f---oo}[, float 
@var{b--ar}]) t:b
 @deftypefnx {Library Function} int foobar  (@r{@slanted{i--nt}} @var{f---oo}[, 
float @var{b--ar}]) r:slanted
 @deftypefnx {Library Function} int foobar  (@r{@code{i--nt}} @var{f---oo}[, 
float @var{b--ar}]) r:code
+@deftypefnx {Library Function} int foobar  (@r{@t{i--nt}} @var{f---oo}[, float 
@var{b--ar}]) r:t
 name
 @end deftypefn
 
diff --git a/tp/t/results/converters_tests/definition_commands.pl 
b/tp/t/results/converters_tests/definition_commands.pl
index b125045de6..e0d9440030 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -1981,33 +1981,15 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => '['
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'slanted',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 25,
-                                'macro' => ''
-                              }
+                              'text' => '['
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -2054,33 +2036,15 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => '['
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'slanted',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 25,
-                                'macro' => ''
-                              }
+                              'text' => '['
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -2104,33 +2068,15 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => ']]'
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'slanted',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 25,
-                                'macro' => ''
-                              }
+                              'text' => ']]'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -2163,7 +2109,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'r:slanted'
+                      'text' => 't'
                     },
                     {
                       'extra' => {
@@ -2293,7 +2239,7 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 'code',
+                              'cmdname' => 'b',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
@@ -2307,7 +2253,7 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -2366,7 +2312,7 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 'code',
+                              'cmdname' => 'b',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
@@ -2380,7 +2326,7 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -2416,7 +2362,7 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 'code',
+                              'cmdname' => 'b',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
@@ -2430,7 +2376,7 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -2463,7 +2409,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'r:code'
+                      'text' => 't:b'
                     },
                     {
                       'extra' => {
@@ -2513,74 +2459,6 @@ $result_trees{'definition_commands'} = {
               },
               'type' => 'def_line'
             },
-            {
-              'contents' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'separators
-'
-                    }
-                  ],
-                  'parent' => {},
-                  'type' => 'paragraph'
-                }
-              ],
-              'parent' => {},
-              'type' => 'def_item'
-            },
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'defspec'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'end',
-              'extra' => {
-                'command_argument' => 'defspec',
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'defspec'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 28,
-                'macro' => ''
-              }
-            }
-          ],
-          'extra' => {
-            'end_command' => {},
-            'spaces_before_argument' => ' '
-          },
-          'parent' => {},
-          'source_info' => {
-            'file_name' => '',
-            'line_nr' => 21,
-            'macro' => ''
-          }
-        },
-        {
-          'parent' => {},
-          'text' => '
-',
-          'type' => 'empty_line'
-        },
-        {
-          'cmdname' => 'defspec',
-          'contents' => [
             {
               'args' => [
                 {
@@ -2623,88 +2501,76 @@ $result_trees{'definition_commands'} = {
                     },
                     {
                       'extra' => {
-                        'def_role' => 'arg'
-                      },
-                      'parent' => {},
-                      'text' => 'va---riable'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
+                      'text' => '(',
+                      'type' => 'delimiter'
                     },
                     {
                       'extra' => {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'default'
+                      'text' => 'var'
                     },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => '
-',
-                      'type' => 'spaces_at_end'
-                    }
-                  ],
-                  'parent' => {},
-                  'type' => 'block_line_arg'
-                }
-              ],
-              'extra' => {
-                'def_command' => 'defspec',
-                'def_parsed_hash' => {
-                  'category' => {},
-                  'name' => {}
-                },
-                'index_entry' => {
-                  'command' => {},
-                  'content' => [
-                    {}
-                  ],
-                  'content_normalized' => [
-                    {}
-                  ],
-                  'in_code' => 1,
-                  'index_at_command' => 'defspec',
-                  'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 10
-                },
-                'original_def_cmdname' => 'defspec'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 30,
-                'macro' => ''
-              },
-              'type' => 'def_line'
-            },
-            {
-              'args' => [
-                {
-                  'contents' => [
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
                     {
-                      'contents' => [
+                      'args' => [
                         {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '['
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'slanted',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 27,
+                                'macro' => ''
+                              }
+                            }
+                          ],
                           'parent' => {},
-                          'text' => 'Special Form'
+                          'type' => 'brace_command_arg'
                         }
                       ],
+                      'cmdname' => 'r',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'category'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'type' => 'bracketed_inserted'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 27,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'text' => 'from'
                     },
                     {
                       'extra' => {
@@ -2712,14 +2578,14 @@ $result_trees{'definition_commands'} = {
                       },
                       'parent' => {},
                       'text' => ' ',
-                      'type' => 'spaces_inserted'
+                      'type' => 'spaces'
                     },
                     {
                       'extra' => {
-                        'def_role' => 'name'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'foobar'
+                      'text' => 'to'
                     },
                     {
                       'extra' => {
@@ -2734,15 +2600,83 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '['
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'slanted',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'va---riable'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 27,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 27,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'text' => 'inc'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ']]'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'slanted',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 27,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -2750,10 +2684,18 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 31,
+                        'line_nr' => 27,
                         'macro' => ''
                       }
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ')',
+                      'type' => 'delimiter'
+                    },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
@@ -2767,7 +2709,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'var'
+                      'text' => 'r:slanted'
                     },
                     {
                       'extra' => {
@@ -2804,7 +2746,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec',
                   'node' => {},
-                  'number' => 11
+                  'number' => 10
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -2812,7 +2754,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 31,
+                'line_nr' => 27,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -2857,13 +2799,177 @@ $result_trees{'definition_commands'} = {
                       'text' => ' ',
                       'type' => 'spaces'
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '(',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'text' => 'var'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '['
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'code',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'va---riable'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 28,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 28,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'text' => 'from'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'text' => 'to'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '['
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'code',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 28,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 28,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'text' => 'inc'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ']]'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'code',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 28,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
@@ -2878,10 +2984,18 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 32,
+                        'line_nr' => 28,
                         'macro' => ''
                       }
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ')',
+                      'type' => 'delimiter'
+                    },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
@@ -2895,7 +3009,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'r'
+                      'text' => 'r:code'
                     },
                     {
                       'extra' => {
@@ -2932,7 +3046,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec',
                   'node' => {},
-                  'number' => 12
+                  'number' => 11
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -2940,7 +3054,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 32,
+                'line_nr' => 28,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -2985,20 +3099,61 @@ $result_trees{'definition_commands'} = {
                       'text' => ' ',
                       'type' => 'spaces'
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '(',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'text' => 'var'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '['
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 't',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'va---riable'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 29,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'slanted',
+                      'cmdname' => 'r',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -3006,89 +3161,31 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 33,
+                        'line_nr' => 29,
                         'macro' => ''
                       }
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
                     {
                       'extra' => {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'slanted'
+                      'text' => 'from'
                     },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => '
-',
-                      'type' => 'spaces_at_end'
-                    }
-                  ],
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'defspecx',
-              'extra' => {
-                'def_command' => 'defspec',
-                'def_parsed_hash' => {
-                  'category' => {},
-                  'name' => {}
-                },
-                'index_entry' => {
-                  'command' => {},
-                  'content' => [
-                    {}
-                  ],
-                  'content_normalized' => [
-                    {}
-                  ],
-                  'in_code' => 1,
-                  'index_at_command' => 'defspecx',
-                  'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 13
-                },
-                'original_def_cmdname' => 'defspecx',
-                'spaces_before_argument' => ' '
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
-              },
-              'type' => 'def_line'
-            },
-            {
-              'args' => [
-                {
-                  'contents' => [
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
                     {
-                      'contents' => [
-                        {
-                          'parent' => {},
-                          'text' => 'Special Form'
-                        }
-                      ],
                       'extra' => {
-                        'def_role' => 'category'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'type' => 'bracketed_inserted'
+                      'text' => 'to'
                     },
                     {
                       'extra' => {
@@ -3096,37 +3193,90 @@ $result_trees{'definition_commands'} = {
                       },
                       'parent' => {},
                       'text' => ' ',
-                      'type' => 'spaces_inserted'
+                      'type' => 'spaces'
                     },
                     {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '['
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 't',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 29,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'name'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'foobar'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 29,
+                        'macro' => ''
+                      }
                     },
                     {
                       'extra' => {
-                        'def_role' => 'spaces'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
+                      'text' => 'inc'
                     },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ']]'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 't',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'va---riable'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 29,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'code',
+                      'cmdname' => 'r',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -3134,10 +3284,18 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 34,
+                        'line_nr' => 29,
                         'macro' => ''
                       }
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ')',
+                      'type' => 'delimiter'
+                    },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
@@ -3151,7 +3309,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'code'
+                      'text' => 'r:t'
                     },
                     {
                       'extra' => {
@@ -3188,7 +3346,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec',
                   'node' => {},
-                  'number' => 14
+                  'number' => 12
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -3196,93 +3354,125 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 34,
+                'line_nr' => 29,
                 'macro' => ''
               },
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'contents' => [
-                        {
-                          'parent' => {},
-                          'text' => 'Special Form'
-                        }
-                      ],
-                      'extra' => {
-                        'def_role' => 'category'
-                      },
-                      'parent' => {},
-                      'type' => 'bracketed_inserted'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces_inserted'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'name'
-                      },
                       'parent' => {},
-                      'text' => 'foobar'
-                    },
+                      'text' => 'separators
+'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'paragraph'
+                }
+              ],
+              'parent' => {},
+              'type' => 'def_item'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
                     {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
-                    {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => 'va---riable'
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'var',
-                              'contents' => [],
-                              'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 35,
-                                'macro' => ''
-                              }
-                            }
-                          ],
+                      'text' => 'defspec'
+                    }
+                  ],
+                  'extra' => {
+                    'spaces_after_argument' => '
+'
+                  },
+                  'parent' => {},
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'end',
+              'extra' => {
+                'command_argument' => 'defspec',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'defspec'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 31,
+                'macro' => ''
+              }
+            }
+          ],
+          'extra' => {
+            'end_command' => {},
+            'spaces_before_argument' => ' '
+          },
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 21,
+            'macro' => ''
+          }
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'cmdname' => 'defspec',
+          'contents' => [
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'contents' => [
+                        {
                           'parent' => {},
-                          'type' => 'brace_command_arg'
+                          'text' => 'Special Form'
                         }
                       ],
-                      'cmdname' => 'r',
-                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
+                      'parent' => {},
+                      'type' => 'bracketed_inserted'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces_inserted'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
+                      'parent' => {},
+                      'text' => 'foobar'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
                       'extra' => {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 35,
-                        'macro' => ''
-                      }
+                      'text' => 'va---riable'
                     },
                     {
                       'extra' => {
@@ -3297,7 +3487,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'r:var'
+                      'text' => 'default'
                     },
                     {
                       'extra' => {
@@ -3310,10 +3500,9 @@ $result_trees{'definition_commands'} = {
                     }
                   ],
                   'parent' => {},
-                  'type' => 'line_arg'
+                  'type' => 'block_line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
               'extra' => {
                 'def_command' => 'defspec',
                 'def_parsed_hash' => {
@@ -3329,20 +3518,19 @@ $result_trees{'definition_commands'} = {
                     {}
                   ],
                   'in_code' => 1,
-                  'index_at_command' => 'defspecx',
+                  'index_at_command' => 'defspec',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec',
                   'node' => {},
-                  'number' => 15
+                  'number' => 13
                 },
-                'original_def_cmdname' => 'defspecx',
-                'spaces_before_argument' => ' '
+                'original_def_cmdname' => 'defspec'
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
+                'line_nr' => 33,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -3392,33 +3580,15 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => 'va---riable'
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'slanted',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 36,
-                                'macro' => ''
-                              }
+                              'text' => 'va---riable'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 'var',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -3426,7 +3596,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 36,
+                        'line_nr' => 34,
                         'macro' => ''
                       }
                     },
@@ -3443,7 +3613,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'r:slanted'
+                      'text' => 'var'
                     },
                     {
                       'extra' => {
@@ -3480,7 +3650,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec',
                   'node' => {},
-                  'number' => 16
+                  'number' => 14
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -3488,7 +3658,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
+                'line_nr' => 34,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -3538,26 +3708,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => 'va---riable'
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'code',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 37,
-                                'macro' => ''
-                              }
+                              'text' => 'va---riable'
                             }
                           ],
                           'parent' => {},
@@ -3572,7 +3724,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 37,
+                        'line_nr' => 35,
                         'macro' => ''
                       }
                     },
@@ -3589,7 +3741,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'r:code'
+                      'text' => 'r'
                     },
                     {
                       'extra' => {
@@ -3626,7 +3778,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec',
                   'node' => {},
-                  'number' => 17
+                  'number' => 15
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -3634,89 +3786,27 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 37,
+                'line_nr' => 35,
                 'macro' => ''
               },
               'type' => 'def_line'
             },
-            {
-              'contents' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'name
-'
-                    }
-                  ],
-                  'parent' => {},
-                  'type' => 'paragraph'
-                }
-              ],
-              'parent' => {},
-              'type' => 'def_item'
-            },
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'defspec'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'end',
-              'extra' => {
-                'command_argument' => 'defspec',
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'defspec'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 39,
-                'macro' => ''
-              }
-            }
-          ],
-          'extra' => {
-            'end_command' => {},
-            'spaces_before_argument' => ' '
-          },
-          'parent' => {},
-          'source_info' => {
-            'file_name' => '',
-            'line_nr' => 30,
-            'macro' => ''
-          }
-        },
-        {
-          'parent' => {},
-          'text' => '
-',
-          'type' => 'empty_line'
-        },
-        {
-          'cmdname' => 'deffn',
-          'contents' => [
             {
               'args' => [
                 {
                   'contents' => [
                     {
+                      'contents' => [
+                        {
+                          'parent' => {},
+                          'text' => 'Special Form'
+                        }
+                      ],
                       'extra' => {
                         'def_role' => 'category'
                       },
                       'parent' => {},
-                      'text' => 'Request'
+                      'type' => 'bracketed_inserted'
                     },
                     {
                       'extra' => {
@@ -3724,32 +3814,14 @@ $result_trees{'definition_commands'} = {
                       },
                       'parent' => {},
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => '.ft'
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 't',
-                      'contents' => [],
                       'extra' => {
                         'def_role' => 'name'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 41,
-                        'macro' => ''
-                      }
+                      'text' => 'foobar'
                     },
                     {
                       'extra' => {
@@ -3759,46 +3831,20 @@ $result_trees{'definition_commands'} = {
                       'text' => ' ',
                       'type' => 'spaces'
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'delimiter'
-                      },
-                      'parent' => {},
-                      'text' => '[',
-                      'type' => 'delimiter'
-                    },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => 'font'
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'slanted',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 41,
-                                'macro' => ''
-                              }
+                              'text' => 'va---riable'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 'slanted',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -3806,17 +3852,24 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 41,
+                        'line_nr' => 36,
                         'macro' => ''
                       }
                     },
                     {
                       'extra' => {
-                        'def_role' => 'delimiter'
+                        'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => ']',
-                      'type' => 'delimiter'
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'text' => 'slanted'
                     },
                     {
                       'extra' => {
@@ -3829,11 +3882,12 @@ $result_trees{'definition_commands'} = {
                     }
                   ],
                   'parent' => {},
-                  'type' => 'block_line_arg'
+                  'type' => 'line_arg'
                 }
               ],
+              'cmdname' => 'defspecx',
               'extra' => {
-                'def_command' => 'deffn',
+                'def_command' => 'defspec',
                 'def_parsed_hash' => {
                   'category' => {},
                   'name' => {}
@@ -3847,19 +3901,20 @@ $result_trees{'definition_commands'} = {
                     {}
                   ],
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
+                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
+                  'index_type_command' => 'defspec',
                   'node' => {},
-                  'number' => 18
+                  'number' => 16
                 },
-                'original_def_cmdname' => 'deffn'
+                'original_def_cmdname' => 'defspecx',
+                'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 41,
+                'line_nr' => 36,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -3872,35 +3927,29 @@ $result_trees{'definition_commands'} = {
                       'contents' => [
                         {
                           'parent' => {},
-                          'text' => 'Escape'
-                        },
-                        {
-                          'args' => [
-                            {
-                              'contents' => [],
-                              'parent' => {},
-                              'type' => 'brace_command_arg'
-                            }
-                          ],
-                          'cmdname' => 'tie',
-                          'contents' => [],
-                          'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 42,
-                            'macro' => ''
-                          }
-                        },
-                        {
-                          'parent' => {},
-                          'text' => 'sequence'
+                          'text' => 'Special Form'
                         }
                       ],
                       'extra' => {
                         'def_role' => 'category'
                       },
                       'parent' => {},
-                      'type' => 'def_aggregate'
+                      'type' => 'bracketed_inserted'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces_inserted'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
+                      'parent' => {},
+                      'text' => 'foobar'
                     },
                     {
                       'extra' => {
@@ -3911,92 +3960,44 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
-                      'contents' => [
-                        {
-                          'args' => [
-                            {
-                              'contents' => [
-                                {
-                                  'parent' => {},
-                                  'text' => '\\f'
-                                }
-                              ],
-                              'parent' => {},
-                              'type' => 'brace_command_arg'
-                            }
-                          ],
-                          'cmdname' => 't',
-                          'contents' => [],
-                          'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 42,
-                            'macro' => ''
-                          }
-                        },
-                        {
-                          'args' => [
-                            {
-                              'contents' => [
-                                {
-                                  'args' => [
-                                    {
-                                      'contents' => [
-                                        {
-                                          'parent' => {},
-                                          'text' => 'f'
-                                        }
-                                      ],
-                                      'parent' => {},
-                                      'type' => 'brace_command_arg'
-                                    }
-                                  ],
-                                  'cmdname' => 'slanted',
-                                  'contents' => [],
-                                  'parent' => {},
-                                  'source_info' => {
-                                    'file_name' => '',
-                                    'line_nr' => 42,
-                                    'macro' => ''
-                                  }
-                                }
-                              ],
-                              'parent' => {},
-                              'type' => 'brace_command_arg'
-                            }
-                          ],
-                          'cmdname' => 'r',
-                          'contents' => [],
-                          'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 42,
-                            'macro' => ''
-                          }
-                        },
+                      'args' => [
                         {
-                          'args' => [
+                          'contents' => [
                             {
-                              'contents' => [],
                               'parent' => {},
-                              'type' => 'brace_command_arg'
+                              'text' => 'va---riable'
                             }
                           ],
-                          'cmdname' => 't',
-                          'contents' => [],
                           'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 42,
-                            'macro' => ''
-                          }
+                          'type' => 'brace_command_arg'
                         }
                       ],
+                      'cmdname' => 'code',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'name'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'type' => 'def_aggregate'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 37,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'text' => 'code'
                     },
                     {
                       'extra' => {
@@ -4012,9 +4013,9 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
+              'cmdname' => 'defspecx',
               'extra' => {
-                'def_command' => 'deffn',
+                'def_command' => 'defspec',
                 'def_parsed_hash' => {
                   'category' => {},
                   'name' => {}
@@ -4028,20 +4029,20 @@ $result_trees{'definition_commands'} = {
                     {}
                   ],
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
+                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
+                  'index_type_command' => 'defspec',
                   'node' => {},
-                  'number' => 19
+                  'number' => 17
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 42,
+                'line_nr' => 37,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -4054,35 +4055,14 @@ $result_trees{'definition_commands'} = {
                       'contents' => [
                         {
                           'parent' => {},
-                          'text' => 'Escape'
-                        },
-                        {
-                          'args' => [
-                            {
-                              'contents' => [],
-                              'parent' => {},
-                              'type' => 'brace_command_arg'
-                            }
-                          ],
-                          'cmdname' => 'tie',
-                          'contents' => [],
-                          'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 43,
-                            'macro' => ''
-                          }
-                        },
-                        {
-                          'parent' => {},
-                          'text' => 'sequence'
+                          'text' => 'Special Form'
                         }
                       ],
                       'extra' => {
                         'def_role' => 'category'
                       },
                       'parent' => {},
-                      'type' => 'def_aggregate'
+                      'type' => 'bracketed_inserted'
                     },
                     {
                       'extra' => {
@@ -4090,95 +4070,62 @@ $result_trees{'definition_commands'} = {
                       },
                       'parent' => {},
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     },
                     {
-                      'contents' => [
-                        {
-                          'args' => [
-                            {
-                              'contents' => [
-                                {
-                                  'parent' => {},
-                                  'text' => '\\f('
-                                }
-                              ],
-                              'parent' => {},
-                              'type' => 'brace_command_arg'
-                            }
-                          ],
-                          'cmdname' => 't',
-                          'contents' => [],
-                          'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 43,
-                            'macro' => ''
-                          }
-                        },
-                        {
-                          'args' => [
-                            {
-                              'contents' => [
-                                {
-                                  'args' => [
-                                    {
-                                      'contents' => [
-                                        {
-                                          'parent' => {},
-                                          'text' => 'fn'
-                                        }
-                                      ],
-                                      'parent' => {},
-                                      'type' => 'brace_command_arg'
-                                    }
-                                  ],
-                                  'cmdname' => 'slanted',
-                                  'contents' => [],
-                                  'parent' => {},
-                                  'source_info' => {
-                                    'file_name' => '',
-                                    'line_nr' => 43,
-                                    'macro' => ''
-                                  }
-                                }
-                              ],
-                              'parent' => {},
-                              'type' => 'brace_command_arg'
-                            }
-                          ],
-                          'cmdname' => 'r',
-                          'contents' => [],
-                          'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 43,
-                            'macro' => ''
-                          }
-                        },
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
+                      'parent' => {},
+                      'text' => 'foobar'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
                         {
-                          'args' => [
+                          'contents' => [
                             {
-                              'contents' => [],
                               'parent' => {},
-                              'type' => 'brace_command_arg'
+                              'text' => 'va---riable'
                             }
                           ],
-                          'cmdname' => 't',
-                          'contents' => [],
                           'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 43,
-                            'macro' => ''
-                          }
+                          'type' => 'brace_command_arg'
                         }
                       ],
+                      'cmdname' => 't',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'name'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'type' => 'def_aggregate'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 38,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'text' => 't'
                     },
                     {
                       'extra' => {
@@ -4194,9 +4141,9 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
+              'cmdname' => 'defspecx',
               'extra' => {
-                'def_command' => 'deffn',
+                'def_command' => 'defspec',
                 'def_parsed_hash' => {
                   'category' => {},
                   'name' => {}
@@ -4210,20 +4157,20 @@ $result_trees{'definition_commands'} = {
                     {}
                   ],
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
+                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
+                  'index_type_command' => 'defspec',
                   'node' => {},
-                  'number' => 20
+                  'number' => 18
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
+                'line_nr' => 38,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -4236,35 +4183,14 @@ $result_trees{'definition_commands'} = {
                       'contents' => [
                         {
                           'parent' => {},
-                          'text' => 'Escape'
-                        },
-                        {
-                          'args' => [
-                            {
-                              'contents' => [],
-                              'parent' => {},
-                              'type' => 'brace_command_arg'
-                            }
-                          ],
-                          'cmdname' => 'tie',
-                          'contents' => [],
-                          'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 44,
-                            'macro' => ''
-                          }
-                        },
-                        {
-                          'parent' => {},
-                          'text' => 'sequence'
+                          'text' => 'Special Form'
                         }
                       ],
                       'extra' => {
                         'def_role' => 'category'
                       },
                       'parent' => {},
-                      'type' => 'def_aggregate'
+                      'type' => 'bracketed_inserted'
                     },
                     {
                       'extra' => {
@@ -4272,100 +4198,14 @@ $result_trees{'definition_commands'} = {
                       },
                       'parent' => {},
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     },
                     {
-                      'contents' => [
-                        {
-                          'args' => [
-                            {
-                              'contents' => [
-                                {
-                                  'parent' => {},
-                                  'text' => '\\f['
-                                }
-                              ],
-                              'parent' => {},
-                              'type' => 'brace_command_arg'
-                            }
-                          ],
-                          'cmdname' => 't',
-                          'contents' => [],
-                          'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 44,
-                            'macro' => ''
-                          }
-                        },
-                        {
-                          'args' => [
-                            {
-                              'contents' => [
-                                {
-                                  'args' => [
-                                    {
-                                      'contents' => [
-                                        {
-                                          'parent' => {},
-                                          'text' => 'font'
-                                        }
-                                      ],
-                                      'parent' => {},
-                                      'type' => 'brace_command_arg'
-                                    }
-                                  ],
-                                  'cmdname' => 'slanted',
-                                  'contents' => [],
-                                  'parent' => {},
-                                  'source_info' => {
-                                    'file_name' => '',
-                                    'line_nr' => 44,
-                                    'macro' => ''
-                                  }
-                                }
-                              ],
-                              'parent' => {},
-                              'type' => 'brace_command_arg'
-                            }
-                          ],
-                          'cmdname' => 'r',
-                          'contents' => [],
-                          'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 44,
-                            'macro' => ''
-                          }
-                        },
-                        {
-                          'args' => [
-                            {
-                              'contents' => [
-                                {
-                                  'parent' => {},
-                                  'text' => ']'
-                                }
-                              ],
-                              'parent' => {},
-                              'type' => 'brace_command_arg'
-                            }
-                          ],
-                          'cmdname' => 't',
-                          'contents' => [],
-                          'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 44,
-                            'macro' => ''
-                          }
-                        }
-                      ],
                       'extra' => {
                         'def_role' => 'name'
                       },
                       'parent' => {},
-                      'type' => 'def_aggregate'
+                      'text' => 'foobar'
                     },
                     {
                       'extra' => {
@@ -4380,8 +4220,26 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => 'va---riable'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'b',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => '\\f['
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 39,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
@@ -4396,77 +4254,24 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 44,
+                        'line_nr' => 39,
                         'macro' => ''
                       }
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => 'font'
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'slanted',
-                              'contents' => [],
-                              'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 44,
-                                'macro' => ''
-                              }
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'r',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 44,
-                        'macro' => ''
-                      }
+                      'text' => ' ',
+                      'type' => 'spaces'
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => ']'
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 't',
-                      'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 44,
-                        'macro' => ''
-                      }
+                      'text' => 't:b'
                     },
                     {
                       'extra' => {
@@ -4482,9 +4287,9 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
+              'cmdname' => 'defspecx',
               'extra' => {
-                'def_command' => 'deffn',
+                'def_command' => 'defspec',
                 'def_parsed_hash' => {
                   'category' => {},
                   'name' => {}
@@ -4498,20 +4303,20 @@ $result_trees{'definition_commands'} = {
                     {}
                   ],
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
+                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
+                  'index_type_command' => 'defspec',
                   'node' => {},
-                  'number' => 21
+                  'number' => 19
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
+                'line_nr' => 39,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -4521,11 +4326,32 @@ $result_trees{'definition_commands'} = {
                 {
                   'contents' => [
                     {
+                      'contents' => [
+                        {
+                          'parent' => {},
+                          'text' => 'Special Form'
+                        }
+                      ],
                       'extra' => {
                         'def_role' => 'category'
                       },
                       'parent' => {},
-                      'text' => 'Register'
+                      'type' => 'bracketed_inserted'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces_inserted'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
+                      'parent' => {},
+                      'text' => 'foobar'
                     },
                     {
                       'extra' => {
@@ -4540,26 +4366,59 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => 'va---riable'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'var',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => '\\n[.sty]'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 40,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 't',
+                      'cmdname' => 'r',
                       'contents' => [],
                       'extra' => {
-                        'def_role' => 'name'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 45,
+                        'line_nr' => 40,
                         'macro' => ''
                       }
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'text' => 'r:var'
+                    },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
@@ -4574,9 +4433,9 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
+              'cmdname' => 'defspecx',
               'extra' => {
-                'def_command' => 'deffn',
+                'def_command' => 'defspec',
                 'def_parsed_hash' => {
                   'category' => {},
                   'name' => {}
@@ -4590,245 +4449,316 @@ $result_trees{'definition_commands'} = {
                     {}
                   ],
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
+                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
+                  'index_type_command' => 'defspec',
                   'node' => {},
-                  'number' => 22
+                  'number' => 20
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 45,
+                'line_nr' => 40,
                 'macro' => ''
               },
               'type' => 'def_line'
             },
             {
-              'contents' => [
+              'args' => [
                 {
                   'contents' => [
                     {
-                      'parent' => {},
-                      'text' => 'The '
-                    },
-                    {
-                      'args' => [
+                      'contents' => [
                         {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => 'ft'
-                            }
-                          ],
                           'parent' => {},
-                          'type' => 'brace_command_arg'
+                          'text' => 'Special Form'
                         }
                       ],
-                      'cmdname' => 'code',
-                      'contents' => [],
-                      'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 46,
-                        'macro' => ''
-                      }
-                    },
-                    {
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
                       'parent' => {},
-                      'text' => ' request and the '
+                      'type' => 'bracketed_inserted'
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => '\\f'
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'code',
-                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 46,
-                        'macro' => ''
-                      }
+                      'text' => ' ',
+                      'type' => 'spaces_inserted'
                     },
                     {
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
                       'parent' => {},
-                      'text' => ' escape change the current font
-'
+                      'text' => 'foobar'
                     },
                     {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       'parent' => {},
-                      'text' => 'to '
+                      'text' => ' ',
+                      'type' => 'spaces'
                     },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => 'va---riable'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'slanted',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'font'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 41,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 'r',
                       'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 47,
+                        'line_nr' => 41,
                         'macro' => ''
                       }
                     },
                     {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       'parent' => {},
-                      'text' => ' (one-character name'
+                      'text' => ' ',
+                      'type' => 'spaces'
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'tie',
-                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 47,
-                        'macro' => ''
-                      }
+                      'text' => 'r:slanted'
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => 'f'
-                            }
-                          ],
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'defspecx',
+              'extra' => {
+                'def_command' => 'defspec',
+                'def_parsed_hash' => {
+                  'category' => {},
+                  'name' => {}
+                },
+                'index_entry' => {
+                  'command' => {},
+                  'content' => [
+                    {}
+                  ],
+                  'content_normalized' => [
+                    {}
+                  ],
+                  'in_code' => 1,
+                  'index_at_command' => 'defspecx',
+                  'index_ignore_chars' => {},
+                  'index_name' => 'fn',
+                  'index_type_command' => 'defspec',
+                  'node' => {},
+                  'number' => 21
+                },
+                'original_def_cmdname' => 'defspecx',
+                'spaces_before_argument' => ' '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 41,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'contents' => [
+                        {
                           'parent' => {},
-                          'type' => 'brace_command_arg'
+                          'text' => 'Special Form'
                         }
                       ],
-                      'cmdname' => 'var',
-                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 47,
-                        'macro' => ''
-                      }
+                      'type' => 'bracketed_inserted'
                     },
                     {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       'parent' => {},
-                      'text' => ', two-character name
-'
+                      'text' => ' ',
+                      'type' => 'spaces_inserted'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
+                      'parent' => {},
+                      'text' => 'foobar'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
                     },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => 'va---riable'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'code',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'fn'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 42,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 'r',
                       'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 48,
+                        'line_nr' => 42,
                         'macro' => ''
                       }
                     },
                     {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       'parent' => {},
-                      'text' => ').
-'
-                    }
-                  ],
-                  'parent' => {},
-                  'type' => 'paragraph'
-                }
-              ],
-              'parent' => {},
-              'type' => 'def_item'
-            },
-            {
-              'args' => [
-                {
-                  'contents' => [
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
                     {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
-                      'text' => 'deffn'
+                      'text' => 'r:code'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
                     }
                   ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
                   'parent' => {},
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'end',
+              'cmdname' => 'defspecx',
               'extra' => {
-                'command_argument' => 'deffn',
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'deffn'
+                'def_command' => 'defspec',
+                'def_parsed_hash' => {
+                  'category' => {},
+                  'name' => {}
+                },
+                'index_entry' => {
+                  'command' => {},
+                  'content' => [
+                    {}
+                  ],
+                  'content_normalized' => [
+                    {}
+                  ],
+                  'in_code' => 1,
+                  'index_at_command' => 'defspecx',
+                  'index_ignore_chars' => {},
+                  'index_name' => 'fn',
+                  'index_type_command' => 'defspec',
+                  'node' => {},
+                  'number' => 22
+                },
+                'original_def_cmdname' => 'defspecx',
+                'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 49,
+                'line_nr' => 42,
                 'macro' => ''
-              }
-            }
-          ],
-          'extra' => {
-            'end_command' => {},
-            'spaces_before_argument' => ' '
-          },
-          'parent' => {},
-          'source_info' => {
-            'file_name' => '',
-            'line_nr' => 41,
-            'macro' => ''
-          }
-        },
-        {
-          'parent' => {},
-          'text' => '
-',
-          'type' => 'empty_line'
-        },
-        {
-          'cmdname' => 'defspec',
-          'contents' => [
+              },
+              'type' => 'def_line'
+            },
             {
               'args' => [
                 {
@@ -4869,29 +4799,31 @@ $result_trees{'definition_commands'} = {
                       'text' => ' ',
                       'type' => 'spaces'
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'delimiter'
-                      },
-                      'parent' => {},
-                      'text' => '[',
-                      'type' => 'delimiter'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => 'va---riable'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 't',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => '['
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 43,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
@@ -4906,7 +4838,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 51,
+                        'line_nr' => 43,
                         'macro' => ''
                       }
                     },
@@ -4919,62 +4851,138 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => '['
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'slanted',
-                      'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 51,
-                        'macro' => ''
-                      }
+                      'text' => 'r:t'
                     },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'defspecx',
+              'extra' => {
+                'def_command' => 'defspec',
+                'def_parsed_hash' => {
+                  'category' => {},
+                  'name' => {}
+                },
+                'index_entry' => {
+                  'command' => {},
+                  'content' => [
+                    {}
+                  ],
+                  'content_normalized' => [
+                    {}
+                  ],
+                  'in_code' => 1,
+                  'index_at_command' => 'defspecx',
+                  'index_ignore_chars' => {},
+                  'index_name' => 'fn',
+                  'index_type_command' => 'defspec',
+                  'node' => {},
+                  'number' => 23
+                },
+                'original_def_cmdname' => 'defspecx',
+                'spaces_before_argument' => ' '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 43,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'name
+'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'paragraph'
+                }
+              ],
+              'parent' => {},
+              'type' => 'def_item'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'defspec'
+                    }
+                  ],
+                  'extra' => {
+                    'spaces_after_argument' => '
+'
+                  },
+                  'parent' => {},
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'end',
+              'extra' => {
+                'command_argument' => 'defspec',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'defspec'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 45,
+                'macro' => ''
+              }
+            }
+          ],
+          'extra' => {
+            'end_command' => {},
+            'spaces_before_argument' => ' '
+          },
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 33,
+            'macro' => ''
+          }
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'cmdname' => 'deffn',
+          'contents' => [
+            {
+              'args' => [
+                {
+                  'contents' => [
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => '['
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'code',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'category'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 51,
-                        'macro' => ''
-                      }
+                      'text' => 'Request'
                     },
                     {
                       'extra' => {
@@ -4990,7 +4998,7 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => '['
+                              'text' => '.ft'
                             }
                           ],
                           'parent' => {},
@@ -5000,12 +5008,12 @@ $result_trees{'definition_commands'} = {
                       'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'name'
                       },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 51,
+                        'line_nr' => 47,
                         'macro' => ''
                       }
                     },
@@ -5017,6 +5025,14 @@ $result_trees{'definition_commands'} = {
                       'text' => ' ',
                       'type' => 'spaces'
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '[',
+                      'type' => 'delimiter'
+                    },
                     {
                       'args' => [
                         {
@@ -5027,7 +5043,7 @@ $result_trees{'definition_commands'} = {
                                   'contents' => [
                                     {
                                       'parent' => {},
-                                      'text' => '['
+                                      'text' => 'font'
                                     }
                                   ],
                                   'parent' => {},
@@ -5039,7 +5055,7 @@ $result_trees{'definition_commands'} = {
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 51,
+                                'line_nr' => 47,
                                 'macro' => ''
                               }
                             }
@@ -5056,60 +5072,101 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 51,
+                        'line_nr' => 47,
                         'macro' => ''
                       }
                     },
                     {
                       'extra' => {
-                        'def_role' => 'spaces'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
+                      'text' => ']',
+                      'type' => 'delimiter'
                     },
                     {
-                      'args' => [
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'block_line_arg'
+                }
+              ],
+              'extra' => {
+                'def_command' => 'deffn',
+                'def_parsed_hash' => {
+                  'category' => {},
+                  'name' => {}
+                },
+                'index_entry' => {
+                  'command' => {},
+                  'content' => [
+                    {}
+                  ],
+                  'content_normalized' => [
+                    {}
+                  ],
+                  'in_code' => 1,
+                  'index_at_command' => 'deffn',
+                  'index_ignore_chars' => {},
+                  'index_name' => 'fn',
+                  'index_type_command' => 'deffn',
+                  'node' => {},
+                  'number' => 24
+                },
+                'original_def_cmdname' => 'deffn'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 47,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'contents' => [
                         {
-                          'contents' => [
+                          'parent' => {},
+                          'text' => 'Escape'
+                        },
+                        {
+                          'args' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => '['
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'code',
                               'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 51,
-                                'macro' => ''
-                              }
+                              'type' => 'brace_command_arg'
                             }
                           ],
+                          'cmdname' => 'tie',
+                          'contents' => [],
                           'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'r',
-                      'contents' => [],
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 48,
+                            'macro' => ''
+                          }
+                        },
+                        {
+                          'parent' => {},
+                          'text' => 'sequence'
+                        }
+                      ],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'category'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 51,
-                        'macro' => ''
-                      }
+                      'type' => 'def_aggregate'
                     },
                     {
                       'extra' => {
@@ -5120,165 +5177,178 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
-                      'args' => [
+                      'contents' => [
                         {
-                          'contents' => [
+                          'args' => [
                             {
-                              'args' => [
+                              'contents' => [
                                 {
-                                  'contents' => [
-                                    {
-                                      'args' => [
-                                        {
-                                          'contents' => [
-                                            {
-                                              'parent' => {},
-                                              'text' => '['
-                                            }
-                                          ],
-                                          'parent' => {},
-                                          'type' => 'brace_command_arg'
-                                        }
-                                      ],
-                                      'cmdname' => 'slanted',
-                                      'contents' => [],
-                                      'parent' => {},
-                                      'source_info' => {
-                                        'file_name' => '',
-                                        'line_nr' => 51,
-                                        'macro' => ''
-                                      }
-                                    }
-                                  ],
                                   'parent' => {},
-                                  'type' => 'brace_command_arg'
+                                  'text' => '\\f'
                                 }
                               ],
-                              'cmdname' => 'code',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 51,
-                                'macro' => ''
-                              }
+                              'type' => 'brace_command_arg'
                             }
                           ],
+                          'cmdname' => 't',
+                          'contents' => [],
                           'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'r',
-                      'contents' => [],
-                      'extra' => {
-                        'def_role' => 'arg'
-                      },
-                      'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 51,
-                        'macro' => ''
-                      }
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
-                    {
-                      'args' => [
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 48,
+                            'macro' => ''
+                          }
+                        },
                         {
-                          'contents' => [
+                          'args' => [
                             {
-                              'args' => [
+                              'contents' => [
                                 {
-                                  'contents' => [
+                                  'args' => [
                                     {
+                                      'contents' => [
+                                        {
+                                          'parent' => {},
+                                          'text' => 'f'
+                                        }
+                                      ],
                                       'parent' => {},
-                                      'text' => '['
+                                      'type' => 'brace_command_arg'
                                     }
                                   ],
+                                  'cmdname' => 'slanted',
+                                  'contents' => [],
                                   'parent' => {},
-                                  'type' => 'brace_command_arg'
+                                  'source_info' => {
+                                    'file_name' => '',
+                                    'line_nr' => 48,
+                                    'macro' => ''
+                                  }
                                 }
                               ],
-                              'cmdname' => 't',
+                              'parent' => {},
+                              'type' => 'brace_command_arg'
+                            }
+                          ],
+                          'cmdname' => 'r',
+                          'contents' => [],
+                          'parent' => {},
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 48,
+                            'macro' => ''
+                          }
+                        },
+                        {
+                          'args' => [
+                            {
                               'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 51,
-                                'macro' => ''
-                              }
+                              'type' => 'brace_command_arg'
                             }
                           ],
+                          'cmdname' => 't',
+                          'contents' => [],
                           'parent' => {},
-                          'type' => 'brace_command_arg'
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 48,
+                            'macro' => ''
+                          }
                         }
                       ],
-                      'cmdname' => 'r',
-                      'contents' => [],
-                      'extra' => {
-                        'def_role' => 'arg'
-                      },
-                      'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 51,
-                        'macro' => ''
-                      }
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
-                    {
                       'extra' => {
-                        'def_role' => 'delimiter'
+                        'def_role' => 'name'
                       },
                       'parent' => {},
-                      'text' => ',',
-                      'type' => 'delimiter'
+                      'type' => 'def_aggregate'
                     },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'deffnx',
+              'extra' => {
+                'def_command' => 'deffn',
+                'def_parsed_hash' => {
+                  'category' => {},
+                  'name' => {}
+                },
+                'index_entry' => {
+                  'command' => {},
+                  'content' => [
+                    {}
+                  ],
+                  'content_normalized' => [
+                    {}
+                  ],
+                  'in_code' => 1,
+                  'index_at_command' => 'deffnx',
+                  'index_ignore_chars' => {},
+                  'index_name' => 'fn',
+                  'index_type_command' => 'deffn',
+                  'node' => {},
+                  'number' => 25
+                },
+                'original_def_cmdname' => 'deffnx',
+                'spaces_before_argument' => ' '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 48,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
                     {
-                      'args' => [
+                      'contents' => [
                         {
-                          'contents' => [
+                          'parent' => {},
+                          'text' => 'Escape'
+                        },
+                        {
+                          'args' => [
                             {
+                              'contents' => [],
                               'parent' => {},
-                              'text' => ','
+                              'type' => 'brace_command_arg'
                             }
                           ],
+                          'cmdname' => 'tie',
+                          'contents' => [],
                           'parent' => {},
-                          'type' => 'brace_command_arg'
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 49,
+                            'macro' => ''
+                          }
+                        },
+                        {
+                          'parent' => {},
+                          'text' => 'sequence'
                         }
                       ],
-                      'cmdname' => 'r',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'category'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 51,
-                        'macro' => ''
-                      }
+                      'type' => 'def_aggregate'
                     },
                     {
                       'extra' => {
@@ -5289,29 +5359,178 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
-                      'args' => [
+                      'contents' => [
                         {
-                          'contents' => [
+                          'args' => [
                             {
+                              'contents' => [
+                                {
+                                  'parent' => {},
+                                  'text' => '\\f('
+                                }
+                              ],
                               'parent' => {},
-                              'text' => ','
+                              'type' => 'brace_command_arg'
                             }
                           ],
+                          'cmdname' => 't',
+                          'contents' => [],
                           'parent' => {},
-                          'type' => 'brace_command_arg'
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 49,
+                            'macro' => ''
+                          }
+                        },
+                        {
+                          'args' => [
+                            {
+                              'contents' => [
+                                {
+                                  'args' => [
+                                    {
+                                      'contents' => [
+                                        {
+                                          'parent' => {},
+                                          'text' => 'fn'
+                                        }
+                                      ],
+                                      'parent' => {},
+                                      'type' => 'brace_command_arg'
+                                    }
+                                  ],
+                                  'cmdname' => 'slanted',
+                                  'contents' => [],
+                                  'parent' => {},
+                                  'source_info' => {
+                                    'file_name' => '',
+                                    'line_nr' => 49,
+                                    'macro' => ''
+                                  }
+                                }
+                              ],
+                              'parent' => {},
+                              'type' => 'brace_command_arg'
+                            }
+                          ],
+                          'cmdname' => 'r',
+                          'contents' => [],
+                          'parent' => {},
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 49,
+                            'macro' => ''
+                          }
+                        },
+                        {
+                          'args' => [
+                            {
+                              'contents' => [],
+                              'parent' => {},
+                              'type' => 'brace_command_arg'
+                            }
+                          ],
+                          'cmdname' => 't',
+                          'contents' => [],
+                          'parent' => {},
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 49,
+                            'macro' => ''
+                          }
                         }
                       ],
-                      'cmdname' => 'slanted',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'name'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 51,
-                        'macro' => ''
-                      }
+                      'type' => 'def_aggregate'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'deffnx',
+              'extra' => {
+                'def_command' => 'deffn',
+                'def_parsed_hash' => {
+                  'category' => {},
+                  'name' => {}
+                },
+                'index_entry' => {
+                  'command' => {},
+                  'content' => [
+                    {}
+                  ],
+                  'content_normalized' => [
+                    {}
+                  ],
+                  'in_code' => 1,
+                  'index_at_command' => 'deffnx',
+                  'index_ignore_chars' => {},
+                  'index_name' => 'fn',
+                  'index_type_command' => 'deffn',
+                  'node' => {},
+                  'number' => 26
+                },
+                'original_def_cmdname' => 'deffnx',
+                'spaces_before_argument' => ' '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 49,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'contents' => [
+                        {
+                          'parent' => {},
+                          'text' => 'Escape'
+                        },
+                        {
+                          'args' => [
+                            {
+                              'contents' => [],
+                              'parent' => {},
+                              'type' => 'brace_command_arg'
+                            }
+                          ],
+                          'cmdname' => 'tie',
+                          'contents' => [],
+                          'parent' => {},
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 50,
+                            'macro' => ''
+                          }
+                        },
+                        {
+                          'parent' => {},
+                          'text' => 'sequence'
+                        }
+                      ],
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
+                      'parent' => {},
+                      'type' => 'def_aggregate'
                     },
                     {
                       'extra' => {
@@ -5322,29 +5541,97 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
-                      'args' => [
+                      'contents' => [
                         {
-                          'contents' => [
+                          'args' => [
                             {
+                              'contents' => [
+                                {
+                                  'parent' => {},
+                                  'text' => '\\f['
+                                }
+                              ],
                               'parent' => {},
-                              'text' => ','
+                              'type' => 'brace_command_arg'
                             }
                           ],
+                          'cmdname' => 't',
+                          'contents' => [],
                           'parent' => {},
-                          'type' => 'brace_command_arg'
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 50,
+                            'macro' => ''
+                          }
+                        },
+                        {
+                          'args' => [
+                            {
+                              'contents' => [
+                                {
+                                  'args' => [
+                                    {
+                                      'contents' => [
+                                        {
+                                          'parent' => {},
+                                          'text' => 'font'
+                                        }
+                                      ],
+                                      'parent' => {},
+                                      'type' => 'brace_command_arg'
+                                    }
+                                  ],
+                                  'cmdname' => 'slanted',
+                                  'contents' => [],
+                                  'parent' => {},
+                                  'source_info' => {
+                                    'file_name' => '',
+                                    'line_nr' => 50,
+                                    'macro' => ''
+                                  }
+                                }
+                              ],
+                              'parent' => {},
+                              'type' => 'brace_command_arg'
+                            }
+                          ],
+                          'cmdname' => 'r',
+                          'contents' => [],
+                          'parent' => {},
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 50,
+                            'macro' => ''
+                          }
+                        },
+                        {
+                          'args' => [
+                            {
+                              'contents' => [
+                                {
+                                  'parent' => {},
+                                  'text' => ']'
+                                }
+                              ],
+                              'parent' => {},
+                              'type' => 'brace_command_arg'
+                            }
+                          ],
+                          'cmdname' => 't',
+                          'contents' => [],
+                          'parent' => {},
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 50,
+                            'macro' => ''
+                          }
                         }
                       ],
-                      'cmdname' => 'code',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'name'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 51,
-                        'macro' => ''
-                      }
+                      'type' => 'def_aggregate'
                     },
                     {
                       'extra' => {
@@ -5360,7 +5647,7 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => ','
+                              'text' => '\\f['
                             }
                           ],
                           'parent' => {},
@@ -5375,18 +5662,10 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 51,
+                        'line_nr' => 50,
                         'macro' => ''
                       }
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
                     {
                       'args' => [
                         {
@@ -5397,7 +5676,7 @@ $result_trees{'definition_commands'} = {
                                   'contents' => [
                                     {
                                       'parent' => {},
-                                      'text' => ','
+                                      'text' => 'font'
                                     }
                                   ],
                                   'parent' => {},
@@ -5409,7 +5688,7 @@ $result_trees{'definition_commands'} = {
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 51,
+                                'line_nr' => 50,
                                 'macro' => ''
                               }
                             }
@@ -5426,50 +5705,24 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 51,
+                        'line_nr' => 50,
                         'macro' => ''
                       }
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => ','
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'code',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 51,
-                                'macro' => ''
-                              }
+                              'text' => ']'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -5477,7 +5730,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 51,
+                        'line_nr' => 50,
                         'macro' => ''
                       }
                     },
@@ -5486,69 +5739,59 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'deffnx',
+              'extra' => {
+                'def_command' => 'deffn',
+                'def_parsed_hash' => {
+                  'category' => {},
+                  'name' => {}
+                },
+                'index_entry' => {
+                  'command' => {},
+                  'content' => [
+                    {}
+                  ],
+                  'content_normalized' => [
+                    {}
+                  ],
+                  'in_code' => 1,
+                  'index_at_command' => 'deffnx',
+                  'index_ignore_chars' => {},
+                  'index_name' => 'fn',
+                  'index_type_command' => 'deffn',
+                  'node' => {},
+                  'number' => 27
+                },
+                'original_def_cmdname' => 'deffnx',
+                'spaces_before_argument' => ' '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 50,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'args' => [
-                                        {
-                                          'contents' => [
-                                            {
-                                              'parent' => {},
-                                              'text' => ','
-                                            }
-                                          ],
-                                          'parent' => {},
-                                          'type' => 'brace_command_arg'
-                                        }
-                                      ],
-                                      'cmdname' => 'slanted',
-                                      'contents' => [],
-                                      'parent' => {},
-                                      'source_info' => {
-                                        'file_name' => '',
-                                        'line_nr' => 51,
-                                        'macro' => ''
-                                      }
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'code',
-                              'contents' => [],
-                              'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 51,
-                                'macro' => ''
-                              }
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'r',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'category'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 51,
-                        'macro' => ''
-                      }
+                      'text' => 'Register'
                     },
                     {
                       'extra' => {
@@ -5563,36 +5806,18 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => ','
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 't',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 51,
-                                'macro' => ''
-                              }
+                              'text' => '\\n[.sty]'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'name'
                       },
                       'parent' => {},
                       'source_info' => {
@@ -5606,24 +5831,56 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'delimiter'
-                      },
-                      'parent' => {},
-                      'text' => ']',
-                      'type' => 'delimiter'
-                    },
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'deffnx',
+              'extra' => {
+                'def_command' => 'deffn',
+                'def_parsed_hash' => {
+                  'category' => {},
+                  'name' => {}
+                },
+                'index_entry' => {
+                  'command' => {},
+                  'content' => [
+                    {}
+                  ],
+                  'content_normalized' => [
+                    {}
+                  ],
+                  'in_code' => 1,
+                  'index_at_command' => 'deffnx',
+                  'index_ignore_chars' => {},
+                  'index_name' => 'fn',
+                  'index_type_command' => 'deffn',
+                  'node' => {},
+                  'number' => 28
+                },
+                'original_def_cmdname' => 'deffnx',
+                'spaces_before_argument' => ' '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 51,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'contents' => [
+                {
+                  'contents' => [
                     {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
+                      'text' => 'The '
                     },
                     {
                       'args' => [
@@ -5631,32 +5888,25 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => ']'
+                              'text' => 'ft'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 'code',
                       'contents' => [],
-                      'extra' => {
-                        'def_role' => 'arg'
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 51,
+                        'line_nr' => 52,
                         'macro' => ''
                       }
                     },
                     {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
+                      'text' => ' request and the '
                     },
                     {
                       'args' => [
@@ -5664,65 +5914,73 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => ']'
+                              'text' => '\\f'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'slanted',
+                      'cmdname' => 'code',
                       'contents' => [],
-                      'extra' => {
-                        'def_role' => 'arg'
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 51,
+                        'line_nr' => 52,
                         'macro' => ''
                       }
                     },
                     {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
+                      'text' => ' escape change the current font
+'
                     },
                     {
-                      'args' => [
+                      'parent' => {},
+                      'text' => 'to '
+                    },
+                    {
+                      'args' => [
                         {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => ']'
+                              'text' => 'font'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'code',
+                      'cmdname' => 'var',
                       'contents' => [],
-                      'extra' => {
-                        'def_role' => 'arg'
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 51,
+                        'line_nr' => 53,
                         'macro' => ''
                       }
                     },
                     {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
+                      'text' => ' (one-character name'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'tie',
+                      'contents' => [],
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 53,
+                        'macro' => ''
+                      }
                     },
                     {
                       'args' => [
@@ -5730,76 +5988,161 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => ']'
+                              'text' => 'f'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 't',
+                      'cmdname' => 'var',
                       'contents' => [],
-                      'extra' => {
-                        'def_role' => 'arg'
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 51,
+                        'line_nr' => 53,
                         'macro' => ''
                       }
                     },
                     {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
+                      'text' => ', two-character name
+'
                     },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => ']'
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'slanted',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 51,
-                                'macro' => ''
-                              }
+                              'text' => 'fn'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 'var',
                       'contents' => [],
-                      'extra' => {
-                        'def_role' => 'arg'
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 51,
+                        'line_nr' => 54,
                         'macro' => ''
                       }
                     },
+                    {
+                      'parent' => {},
+                      'text' => ').
+'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'paragraph'
+                }
+              ],
+              'parent' => {},
+              'type' => 'def_item'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'deffn'
+                    }
+                  ],
+                  'extra' => {
+                    'spaces_after_argument' => '
+'
+                  },
+                  'parent' => {},
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'end',
+              'extra' => {
+                'command_argument' => 'deffn',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'deffn'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 55,
+                'macro' => ''
+              }
+            }
+          ],
+          'extra' => {
+            'end_command' => {},
+            'spaces_before_argument' => ' '
+          },
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 47,
+            'macro' => ''
+          }
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'cmdname' => 'defspec',
+          'contents' => [
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'contents' => [
+                        {
+                          'parent' => {},
+                          'text' => 'Special Form'
+                        }
+                      ],
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
+                      'parent' => {},
+                      'type' => 'bracketed_inserted'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces_inserted'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
+                      'parent' => {},
+                      'text' => 'foobar'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '[',
+                      'type' => 'delimiter'
+                    },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
@@ -5813,26 +6156,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => ']'
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'code',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 51,
-                                'macro' => ''
-                              }
+                              'text' => '['
                             }
                           ],
                           'parent' => {},
@@ -5847,7 +6172,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 51,
+                        'line_nr' => 57,
                         'macro' => ''
                       }
                     },
@@ -5864,51 +6189,15 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'args' => [
-                                        {
-                                          'contents' => [
-                                            {
-                                              'parent' => {},
-                                              'text' => ']'
-                                            }
-                                          ],
-                                          'parent' => {},
-                                          'type' => 'brace_command_arg'
-                                        }
-                                      ],
-                                      'cmdname' => 'slanted',
-                                      'contents' => [],
-                                      'parent' => {},
-                                      'source_info' => {
-                                        'file_name' => '',
-                                        'line_nr' => 51,
-                                        'macro' => ''
-                                      }
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'code',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 51,
-                                'macro' => ''
-                              }
+                              'text' => '['
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 'slanted',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -5916,7 +6205,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 51,
+                        'line_nr' => 57,
                         'macro' => ''
                       }
                     },
@@ -5933,33 +6222,15 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => ']'
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 't',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 51,
-                                'macro' => ''
-                              }
+                              'text' => '['
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 'code',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -5967,112 +6238,10 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 51,
+                        'line_nr' => 57,
                         'macro' => ''
                       }
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => '
-',
-                      'type' => 'spaces_at_end'
-                    }
-                  ],
-                  'parent' => {},
-                  'type' => 'block_line_arg'
-                }
-              ],
-              'extra' => {
-                'def_command' => 'defspec',
-                'def_parsed_hash' => {
-                  'category' => {},
-                  'name' => {}
-                },
-                'index_entry' => {
-                  'command' => {},
-                  'content' => [
-                    {}
-                  ],
-                  'content_normalized' => [
-                    {}
-                  ],
-                  'in_code' => 1,
-                  'index_at_command' => 'defspec',
-                  'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 23
-                },
-                'original_def_cmdname' => 'defspec'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 51,
-                'macro' => ''
-              },
-              'type' => 'def_line'
-            },
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'contents' => [
-                        {
-                          'parent' => {},
-                          'text' => 'Special Form'
-                        }
-                      ],
-                      'extra' => {
-                        'def_role' => 'category'
-                      },
-                      'parent' => {},
-                      'type' => 'bracketed_inserted'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces_inserted'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'name'
-                      },
-                      'parent' => {},
-                      'text' => 'foobar'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'delimiter'
-                      },
-                      'parent' => {},
-                      'text' => '[',
-                      'type' => 'delimiter'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'delimiter'
-                      },
-                      'parent' => {},
-                      'text' => ']',
-                      'type' => 'delimiter'
-                    },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
@@ -6087,14 +6256,14 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => '[]'
+                              'text' => '['
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -6102,7 +6271,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 52,
+                        'line_nr' => 57,
                         'macro' => ''
                       }
                     },
@@ -6119,15 +6288,33 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '['
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'slanted',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => '[]'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 57,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'slanted',
+                      'cmdname' => 'r',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -6135,7 +6322,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 52,
+                        'line_nr' => 57,
                         'macro' => ''
                       }
                     },
@@ -6152,15 +6339,33 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '['
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'code',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => '[]'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 57,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'code',
+                      'cmdname' => 'r',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -6168,7 +6373,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 52,
+                        'line_nr' => 57,
                         'macro' => ''
                       }
                     },
@@ -6185,15 +6390,51 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'args' => [
+                                        {
+                                          'contents' => [
+                                            {
+                                              'parent' => {},
+                                              'text' => '['
+                                            }
+                                          ],
+                                          'parent' => {},
+                                          'type' => 'brace_command_arg'
+                                        }
+                                      ],
+                                      'cmdname' => 'slanted',
+                                      'contents' => [],
+                                      'parent' => {},
+                                      'source_info' => {
+                                        'file_name' => '',
+                                        'line_nr' => 57,
+                                        'macro' => ''
+                                      }
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'code',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => '[]'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 57,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 't',
+                      'cmdname' => 'r',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -6201,7 +6442,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 52,
+                        'line_nr' => 57,
                         'macro' => ''
                       }
                     },
@@ -6223,19 +6464,19 @@ $result_trees{'definition_commands'} = {
                                   'contents' => [
                                     {
                                       'parent' => {},
-                                      'text' => '[]'
+                                      'text' => '['
                                     }
                                   ],
                                   'parent' => {},
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 'slanted',
+                              'cmdname' => 't',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 52,
+                                'line_nr' => 57,
                                 'macro' => ''
                               }
                             }
@@ -6252,7 +6493,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 52,
+                        'line_nr' => 57,
                         'macro' => ''
                       }
                     },
@@ -6264,31 +6505,29 @@ $result_trees{'definition_commands'} = {
                       'text' => ' ',
                       'type' => 'spaces'
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ',',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => '[]'
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'code',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 52,
-                                'macro' => ''
-                              }
+                              'text' => ','
                             }
                           ],
                           'parent' => {},
@@ -6303,7 +6542,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 52,
+                        'line_nr' => 57,
                         'macro' => ''
                       }
                     },
@@ -6320,51 +6559,15 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'args' => [
-                                        {
-                                          'contents' => [
-                                            {
-                                              'parent' => {},
-                                              'text' => '[]'
-                                            }
-                                          ],
-                                          'parent' => {},
-                                          'type' => 'brace_command_arg'
-                                        }
-                                      ],
-                                      'cmdname' => 'slanted',
-                                      'contents' => [],
-                                      'parent' => {},
-                                      'source_info' => {
-                                        'file_name' => '',
-                                        'line_nr' => 52,
-                                        'macro' => ''
-                                      }
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'code',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 52,
-                                'macro' => ''
-                              }
+                              'text' => ','
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 'slanted',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -6372,7 +6575,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 52,
+                        'line_nr' => 57,
                         'macro' => ''
                       }
                     },
@@ -6381,153 +6584,33 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => '
-',
-                      'type' => 'spaces_at_end'
-                    }
-                  ],
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'defspecx',
-              'extra' => {
-                'def_command' => 'defspec',
-                'def_parsed_hash' => {
-                  'category' => {},
-                  'name' => {}
-                },
-                'index_entry' => {
-                  'command' => {},
-                  'content' => [
-                    {}
-                  ],
-                  'content_normalized' => [
-                    {}
-                  ],
-                  'in_code' => 1,
-                  'index_at_command' => 'defspecx',
-                  'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 24
-                },
-                'original_def_cmdname' => 'defspecx',
-                'spaces_before_argument' => ' '
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 52,
-                'macro' => ''
-              },
-              'type' => 'def_line'
-            },
-            {
-              'contents' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'test formatting of separators
-'
-                    }
-                  ],
-                  'parent' => {},
-                  'type' => 'paragraph'
-                }
-              ],
-              'parent' => {},
-              'type' => 'def_item'
-            },
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'defspec'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'end',
-              'extra' => {
-                'command_argument' => 'defspec',
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'defspec'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 54,
-                'macro' => ''
-              }
-            }
-          ],
-          'extra' => {
-            'end_command' => {},
-            'spaces_before_argument' => ' '
-          },
-          'parent' => {},
-          'source_info' => {
-            'file_name' => '',
-            'line_nr' => 51,
-            'macro' => ''
-          }
-        },
-        {
-          'parent' => {},
-          'text' => '
-',
-          'type' => 'empty_line'
-        },
-        {
-          'cmdname' => 'deftypefn',
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
                     {
-                      'contents' => [
+                      'args' => [
                         {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => ','
+                            }
+                          ],
                           'parent' => {},
-                          'text' => 'Library Function'
+                          'type' => 'brace_command_arg'
                         }
                       ],
+                      'cmdname' => 'code',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'category'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 56,
+                        'line_nr' => 57,
                         'macro' => ''
-                      },
-                      'type' => 'bracketed_def_content'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'type'
-                      },
-                      'parent' => {},
-                      'text' => 'int'
+                      }
                     },
                     {
                       'extra' => {
@@ -6538,34 +6621,29 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => ','
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 't',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'name'
-                      },
-                      'parent' => {},
-                      'text' => 'foobar'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => '  ',
-                      'type' => 'spaces'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'delimiter'
-                      },
-                      'parent' => {},
-                      'text' => '(',
-                      'type' => 'delimiter'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'typearg'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'int'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 57,
+                        'macro' => ''
+                      }
                     },
                     {
                       'extra' => {
@@ -6580,15 +6658,33 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ','
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'slanted',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'f---oo'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 57,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 'r',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -6596,20 +6692,63 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 56,
+                        'line_nr' => 57,
                         'macro' => ''
                       }
                     },
                     {
                       'extra' => {
-                        'def_role' => 'delimiter'
+                        'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => ',',
-                      'type' => 'delimiter'
+                      'text' => ' ',
+                      'type' => 'spaces'
                     },
                     {
-                      'extra' => {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ','
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'code',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 57,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 57,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
                         'def_role' => 'spaces'
                       },
                       'parent' => {},
@@ -6617,11 +6756,65 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'args' => [
+                                        {
+                                          'contents' => [
+                                            {
+                                              'parent' => {},
+                                              'text' => ','
+                                            }
+                                          ],
+                                          'parent' => {},
+                                          'type' => 'brace_command_arg'
+                                        }
+                                      ],
+                                      'cmdname' => 'slanted',
+                                      'contents' => [],
+                                      'parent' => {},
+                                      'source_info' => {
+                                        'file_name' => '',
+                                        'line_nr' => 57,
+                                        'macro' => ''
+                                      }
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'code',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 57,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'typearg'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'float'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 57,
+                        'macro' => ''
+                      }
                     },
                     {
                       'extra' => {
@@ -6636,15 +6829,33 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ','
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 't',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'b--ar'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 57,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 'r',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -6652,16 +6863,24 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 56,
+                        'line_nr' => 57,
                         'macro' => ''
                       }
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
                     {
                       'extra' => {
                         'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'text' => ')',
+                      'text' => ']',
                       'type' => 'delimiter'
                     },
                     {
@@ -6669,62 +6888,27 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => '
-',
-                      'type' => 'spaces_at_end'
-                    }
-                  ],
-                  'parent' => {},
-                  'type' => 'block_line_arg'
-                }
-              ],
-              'extra' => {
-                'def_command' => 'deftypefn',
-                'def_parsed_hash' => {
-                  'category' => {},
-                  'name' => {},
-                  'type' => {}
-                },
-                'index_entry' => {
-                  'command' => {},
-                  'content' => [
-                    {}
-                  ],
-                  'content_normalized' => [
-                    {}
-                  ],
-                  'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
-                  'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 25
-                },
-                'original_def_cmdname' => 'deftypefn'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 56,
-                'macro' => ''
-              },
-              'type' => 'def_line'
-            },
-            {
-              'contents' => [
-                {
-                  'contents' => [
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
                     {
                       'args' => [
                         {
-                          'contents' => [],
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => ']'
+                            }
+                          ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'dots',
+                      'cmdname' => 'r',
                       'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
@@ -6733,8 +6917,12 @@ $result_trees{'definition_commands'} = {
                       }
                     },
                     {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       'parent' => {},
-                      'text' => ' with var for '
+                      'text' => ' ',
+                      'type' => 'spaces'
                     },
                     {
                       'args' => [
@@ -6742,15 +6930,18 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'f---oo'
+                              'text' => ']'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 'slanted',
                       'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
@@ -6759,8 +6950,12 @@ $result_trees{'definition_commands'} = {
                       }
                     },
                     {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       'parent' => {},
-                      'text' => ' and '
+                      'text' => ' ',
+                      'type' => 'spaces'
                     },
                     {
                       'args' => [
@@ -6768,15 +6963,18 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'b--ar'
+                              'text' => ']'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 'code',
                       'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
@@ -6785,105 +6983,37 @@ $result_trees{'definition_commands'} = {
                       }
                     },
                     {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       'parent' => {},
-                      'text' => '
-'
-                    }
-                  ],
-                  'parent' => {},
-                  'type' => 'paragraph'
-                }
-              ],
-              'parent' => {},
-              'type' => 'def_item'
-            },
-            {
-              'args' => [
-                {
-                  'contents' => [
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
                     {
-                      'parent' => {},
-                      'text' => 'deftypefn'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'end',
-              'extra' => {
-                'command_argument' => 'deftypefn',
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'deftypefn'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 58,
-                'macro' => ''
-              }
-            }
-          ],
-          'extra' => {
-            'end_command' => {},
-            'spaces_before_argument' => ' '
-          },
-          'parent' => {},
-          'source_info' => {
-            'file_name' => '',
-            'line_nr' => 56,
-            'macro' => ''
-          }
-        },
-        {
-          'parent' => {},
-          'text' => '
-',
-          'type' => 'empty_line'
-        },
-        {
-          'cmdname' => 'deftypefn',
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'contents' => [
-                        {
-                          'parent' => {},
-                          'text' => 'Library Function'
-                        }
-                      ],
-                      'extra' => {
-                        'def_role' => 'category'
-                      },
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => ']'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 't',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 60,
+                        'line_nr' => 57,
                         'macro' => ''
-                      },
-                      'type' => 'bracketed_def_content'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'type'
-                      },
-                      'parent' => {},
-                      'text' => 'int'
+                      }
                     },
                     {
                       'extra' => {
@@ -6894,34 +7024,47 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ']'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'slanted',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 57,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'name'
-                      },
-                      'parent' => {},
-                      'text' => 'foobar'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => '  ',
-                      'type' => 'spaces'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'delimiter'
-                      },
-                      'parent' => {},
-                      'text' => '(',
-                      'type' => 'delimiter'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'typearg'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'int'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 57,
+                        'macro' => ''
+                      }
                     },
                     {
                       'extra' => {
@@ -6941,19 +7084,19 @@ $result_trees{'definition_commands'} = {
                                   'contents' => [
                                     {
                                       'parent' => {},
-                                      'text' => 'f---oo'
+                                      'text' => ']'
                                     }
                                   ],
                                   'parent' => {},
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 'slanted',
+                              'cmdname' => 'code',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 60,
+                                'line_nr' => 57,
                                 'macro' => ''
                               }
                             }
@@ -6970,18 +7113,10 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 60,
+                        'line_nr' => 57,
                         'macro' => ''
                       }
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'delimiter'
-                      },
-                      'parent' => {},
-                      'text' => ',',
-                      'type' => 'delimiter'
-                    },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
@@ -6991,11 +7126,65 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'args' => [
+                                        {
+                                          'contents' => [
+                                            {
+                                              'parent' => {},
+                                              'text' => ']'
+                                            }
+                                          ],
+                                          'parent' => {},
+                                          'type' => 'brace_command_arg'
+                                        }
+                                      ],
+                                      'cmdname' => 'slanted',
+                                      'contents' => [],
+                                      'parent' => {},
+                                      'source_info' => {
+                                        'file_name' => '',
+                                        'line_nr' => 57,
+                                        'macro' => ''
+                                      }
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'code',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 57,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'typearg'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'float'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 57,
+                        'macro' => ''
+                      }
                     },
                     {
                       'extra' => {
@@ -7015,19 +7204,19 @@ $result_trees{'definition_commands'} = {
                                   'contents' => [
                                     {
                                       'parent' => {},
-                                      'text' => 'b--ar'
+                                      'text' => ']'
                                     }
                                   ],
                                   'parent' => {},
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 'slanted',
+                              'cmdname' => 't',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 60,
+                                'line_nr' => 57,
                                 'macro' => ''
                               }
                             }
@@ -7044,18 +7233,10 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 60,
+                        'line_nr' => 57,
                         'macro' => ''
                       }
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'delimiter'
-                      },
-                      'parent' => {},
-                      'text' => ')',
-                      'type' => 'delimiter'
-                    },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
@@ -7071,11 +7252,10 @@ $result_trees{'definition_commands'} = {
                 }
               ],
               'extra' => {
-                'def_command' => 'deftypefn',
+                'def_command' => 'defspec',
                 'def_parsed_hash' => {
                   'category' => {},
-                  'name' => {},
-                  'type' => {}
+                  'name' => {}
                 },
                 'index_entry' => {
                   'command' => {},
@@ -7086,47 +7266,86 @@ $result_trees{'definition_commands'} = {
                     {}
                   ],
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
+                  'index_at_command' => 'defspec',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
+                  'index_type_command' => 'defspec',
                   'node' => {},
-                  'number' => 26
+                  'number' => 29
                 },
-                'original_def_cmdname' => 'deftypefn'
+                'original_def_cmdname' => 'defspec'
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 60,
+                'line_nr' => 57,
                 'macro' => ''
               },
               'type' => 'def_line'
             },
             {
-              'contents' => [
+              'args' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'contents' => [
                         {
-                          'contents' => [],
                           'parent' => {},
-                          'type' => 'brace_command_arg'
+                          'text' => 'Special Form'
                         }
                       ],
-                      'cmdname' => 'dots',
-                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 61,
-                        'macro' => ''
-                      }
+                      'type' => 'bracketed_inserted'
                     },
                     {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       'parent' => {},
-                      'text' => ' with r slanted for '
+                      'text' => ' ',
+                      'type' => 'spaces_inserted'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
+                      'parent' => {},
+                      'text' => 'foobar'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '[',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ']',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
                     },
                     {
                       'args' => [
@@ -7134,25 +7353,32 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'f---oo'
+                              'text' => '[]'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 'r',
                       'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 61,
+                        'line_nr' => 58,
                         'macro' => ''
                       }
                     },
                     {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       'parent' => {},
-                      'text' => ' and '
+                      'text' => ' ',
+                      'type' => 'spaces'
                     },
                     {
                       'args' => [
@@ -7160,138 +7386,57 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'b--ar'
+                              'text' => '[]'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 'slanted',
                       'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 61,
+                        'line_nr' => 58,
                         'macro' => ''
                       }
                     },
                     {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       'parent' => {},
-                      'text' => '
-'
-                    }
-                  ],
-                  'parent' => {},
-                  'type' => 'paragraph'
-                }
-              ],
-              'parent' => {},
-              'type' => 'def_item'
-            },
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'deftypefn'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'end',
-              'extra' => {
-                'command_argument' => 'deftypefn',
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'deftypefn'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
-              }
-            }
-          ],
-          'extra' => {
-            'end_command' => {},
-            'spaces_before_argument' => ' '
-          },
-          'parent' => {},
-          'source_info' => {
-            'file_name' => '',
-            'line_nr' => 60,
-            'macro' => ''
-          }
-        },
-        {
-          'parent' => {},
-          'text' => '
-',
-          'type' => 'empty_line'
-        },
-        {
-          'cmdname' => 'noindent',
-          'parent' => {},
-          'source_info' => {
-            'file_name' => '',
-            'line_nr' => 64,
-            'macro' => ''
-          }
-        },
-        {
-          'extra' => {
-            'command' => {}
-          },
-          'parent' => {},
-          'text' => ' ',
-          'type' => 'empty_spaces_after_command'
-        },
-        {
-          'contents' => [
-            {
-              'parent' => {},
-              'text' => 'produces:
-'
-            }
-          ],
-          'extra' => {
-            'noindent' => 1
-          },
-          'parent' => {},
-          'type' => 'paragraph'
-        },
-        {
-          'cmdname' => 'defcv',
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
                     {
-                      'contents' => [
+                      'args' => [
                         {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => '[]'
+                            }
+                          ],
                           'parent' => {},
-                          'text' => 'Class Option'
+                          'type' => 'brace_command_arg'
                         }
                       ],
+                      'cmdname' => 'code',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'category'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
+                        'line_nr' => 58,
                         'macro' => ''
-                      },
-                      'type' => 'bracketed_def_content'
+                      }
                     },
                     {
                       'extra' => {
@@ -7302,11 +7447,29 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => '[]'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 't',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'class'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'Window'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 58,
+                        'macro' => ''
+                      }
                     },
                     {
                       'extra' => {
@@ -7317,35 +7480,191 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '[]'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'slanted',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 58,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'name'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'border-pattern'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 58,
+                        'macro' => ''
+                      }
                     },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => '
-',
-                      'type' => 'spaces_at_end'
-                    }
-                  ],
-                  'parent' => {},
-                  'type' => 'block_line_arg'
-                }
-              ],
-              'extra' => {
-                'def_command' => 'defcv',
-                'def_parsed_hash' => {
-                  'category' => {},
-                  'class' => {},
-                  'name' => {}
-                },
-                'index_entry' => {
-                  'command' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '[]'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'code',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 58,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 58,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'args' => [
+                                        {
+                                          'contents' => [
+                                            {
+                                              'parent' => {},
+                                              'text' => '[]'
+                                            }
+                                          ],
+                                          'parent' => {},
+                                          'type' => 'brace_command_arg'
+                                        }
+                                      ],
+                                      'cmdname' => 'slanted',
+                                      'contents' => [],
+                                      'parent' => {},
+                                      'source_info' => {
+                                        'file_name' => '',
+                                        'line_nr' => 58,
+                                        'macro' => ''
+                                      }
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'code',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 58,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 58,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'defspecx',
+              'extra' => {
+                'def_command' => 'defspec',
+                'def_parsed_hash' => {
+                  'category' => {},
+                  'name' => {}
+                },
+                'index_entry' => {
+                  'command' => {},
                   'content' => [
                     {}
                   ],
@@ -7353,19 +7672,20 @@ $result_trees{'definition_commands'} = {
                     {}
                   ],
                   'in_code' => 1,
-                  'index_at_command' => 'defcv',
+                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'defcv',
+                  'index_name' => 'fn',
+                  'index_type_command' => 'defspec',
                   'node' => {},
-                  'number' => 1
+                  'number' => 30
                 },
-                'original_def_cmdname' => 'defcv'
+                'original_def_cmdname' => 'defspecx',
+                'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 65,
+                'line_nr' => 58,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -7374,26 +7694,9 @@ $result_trees{'definition_commands'} = {
               'contents' => [
                 {
                   'contents' => [
-                    {
-                      'args' => [
-                        {
-                          'contents' => [],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'dots',
-                      'contents' => [],
-                      'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 66,
-                        'macro' => ''
-                      }
-                    },
                     {
                       'parent' => {},
-                      'text' => '
+                      'text' => 'test formatting of separators
 '
                     }
                   ],
@@ -7410,7 +7713,7 @@ $result_trees{'definition_commands'} = {
                   'contents' => [
                     {
                       'parent' => {},
-                      'text' => 'defcv'
+                      'text' => 'defspec'
                     }
                   ],
                   'extra' => {
@@ -7423,14 +7726,14 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defcv',
+                'command_argument' => 'defspec',
                 'spaces_before_argument' => ' ',
-                'text_arg' => 'defcv'
+                'text_arg' => 'defspec'
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 67,
+                'line_nr' => 60,
                 'macro' => ''
               }
             }
@@ -7442,7 +7745,7 @@ $result_trees{'definition_commands'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 65,
+            'line_nr' => 57,
             'macro' => ''
           }
         },
@@ -7453,7 +7756,7 @@ $result_trees{'definition_commands'} = {
           'type' => 'empty_line'
         },
         {
-          'cmdname' => 'deftypecv',
+          'cmdname' => 'deftypefn',
           'contents' => [
             {
               'args' => [
@@ -7463,7 +7766,7 @@ $result_trees{'definition_commands'} = {
                       'contents' => [
                         {
                           'parent' => {},
-                          'text' => 'Class Option'
+                          'text' => 'Library Function'
                         }
                       ],
                       'extra' => {
@@ -7472,7 +7775,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 69,
+                        'line_nr' => 62,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -7487,9 +7790,48 @@ $result_trees{'definition_commands'} = {
                     },
                     {
                       'extra' => {
-                        'def_role' => 'class'
+                        'def_role' => 'type'
                       },
-                      'text' => 'Window'
+                      'parent' => {},
+                      'text' => 'int'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
+                      'parent' => {},
+                      'text' => 'foobar'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '  ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '(',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'typearg'
+                      },
+                      'parent' => {},
+                      'text' => 'int'
                     },
                     {
                       'extra' => {
@@ -7505,25 +7847,33 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'int'
+                              'text' => 'f---oo'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'code',
+                      'cmdname' => 'var',
                       'contents' => [],
                       'extra' => {
-                        'def_role' => 'type'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 69,
+                        'line_nr' => 62,
                         'macro' => ''
                       }
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ',',
+                      'type' => 'delimiter'
+                    },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
@@ -7534,62 +7884,95 @@ $result_trees{'definition_commands'} = {
                     },
                     {
                       'extra' => {
-                        'def_role' => 'name'
+                        'def_role' => 'typearg'
                       },
-                      'text' => 'border-pattern'
+                      'parent' => {},
+                      'text' => 'float'
                     },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => '
-',
-                      'type' => 'spaces_at_end'
-                    }
-                  ],
-                  'parent' => {},
-                  'type' => 'block_line_arg'
-                }
-              ],
-              'extra' => {
-                'def_command' => 'deftypecv',
-                'def_parsed_hash' => {
-                  'category' => {},
-                  'class' => {},
-                  'name' => {},
-                  'type' => {}
-                },
-                'index_entry' => {
-                  'command' => {},
-                  'content' => [
-                    {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
                     {
-                      'text' => ' of '
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'b--ar'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 62,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ')',
+                      'type' => 'delimiter'
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'block_line_arg'
+                }
+              ],
+              'extra' => {
+                'def_command' => 'deftypefn',
+                'def_parsed_hash' => {
+                  'category' => {},
+                  'name' => {},
+                  'type' => {}
+                },
+                'index_entry' => {
+                  'command' => {},
+                  'content' => [
                     {}
                   ],
                   'content_normalized' => [
-                    {},
-                    {
-                      'text' => ' of '
-                    },
                     {}
                   ],
                   'in_code' => 1,
-                  'index_at_command' => 'deftypecv',
+                  'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'deftypecv',
+                  'index_name' => 'fn',
+                  'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 2
+                  'number' => 31
                 },
-                'original_def_cmdname' => 'deftypecv'
+                'original_def_cmdname' => 'deftypefn'
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 69,
+                'line_nr' => 62,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -7611,7 +7994,59 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 70,
+                        'line_nr' => 63,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'parent' => {},
+                      'text' => ' with var for '
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'f---oo'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 63,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'parent' => {},
+                      'text' => ' and '
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'b--ar'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 63,
                         'macro' => ''
                       }
                     },
@@ -7634,7 +8069,7 @@ $result_trees{'definition_commands'} = {
                   'contents' => [
                     {
                       'parent' => {},
-                      'text' => 'deftypecv'
+                      'text' => 'deftypefn'
                     }
                   ],
                   'extra' => {
@@ -7647,14 +8082,14 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypecv',
+                'command_argument' => 'deftypefn',
                 'spaces_before_argument' => ' ',
-                'text_arg' => 'deftypecv'
+                'text_arg' => 'deftypefn'
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 71,
+                'line_nr' => 64,
                 'macro' => ''
               }
             }
@@ -7666,7 +8101,7 @@ $result_trees{'definition_commands'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 69,
+            'line_nr' => 62,
             'macro' => ''
           }
         },
@@ -7677,448 +8112,2966 @@ $result_trees{'definition_commands'} = {
           'type' => 'empty_line'
         },
         {
-          'cmdname' => 'quotation',
+          'cmdname' => 'deftypefn',
           'contents' => [
             {
-              'extra' => {
-                'command' => {}
-              },
-              'parent' => {},
-              'text' => '
-',
-              'type' => 'empty_line_after_command'
-            },
-            {
-              'cmdname' => 'deftypefn',
-              'contents' => [
+              'args' => [
                 {
-                  'args' => [
+                  'contents' => [
                     {
                       'contents' => [
+                        {
+                          'parent' => {},
+                          'text' => 'Library Function'
+                        }
+                      ],
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 66,
+                        'macro' => ''
+                      },
+                      'type' => 'bracketed_def_content'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'type'
+                      },
+                      'parent' => {},
+                      'text' => 'int'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
+                      'parent' => {},
+                      'text' => 'foobar'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '  ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '(',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'typearg'
+                      },
+                      'parent' => {},
+                      'text' => 'int'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => 'f---oo'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'slanted',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'Library Function'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 66,
+                                'macro' => ''
+                              }
                             }
                           ],
-                          'extra' => {
-                            'def_role' => 'category'
-                          },
                           'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 74,
-                            'macro' => ''
-                          },
-                          'type' => 'bracketed_def_content'
-                        },
-                        {
-                          'extra' => {
-                            'def_role' => 'spaces'
-                          },
-                          'parent' => {},
-                          'text' => ' ',
-                          'type' => 'spaces'
-                        },
-                        {
-                          'extra' => {
-                            'def_role' => 'type'
-                          },
-                          'parent' => {},
-                          'text' => 'int'
-                        },
-                        {
-                          'extra' => {
-                            'def_role' => 'spaces'
-                          },
-                          'parent' => {},
-                          'text' => ' ',
-                          'type' => 'spaces'
-                        },
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 66,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ',',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'typearg'
+                      },
+                      'parent' => {},
+                      'text' => 'float'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
                         {
-                          'extra' => {
-                            'def_role' => 'name'
-                          },
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => 'b--ar'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'slanted',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 66,
+                                'macro' => ''
+                              }
+                            }
+                          ],
                           'parent' => {},
-                          'text' => 'foobar'
-                        },
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 66,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ')',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'block_line_arg'
+                }
+              ],
+              'extra' => {
+                'def_command' => 'deftypefn',
+                'def_parsed_hash' => {
+                  'category' => {},
+                  'name' => {},
+                  'type' => {}
+                },
+                'index_entry' => {
+                  'command' => {},
+                  'content' => [
+                    {}
+                  ],
+                  'content_normalized' => [
+                    {}
+                  ],
+                  'in_code' => 1,
+                  'index_at_command' => 'deftypefn',
+                  'index_ignore_chars' => {},
+                  'index_name' => 'fn',
+                  'index_type_command' => 'deftypefn',
+                  'node' => {},
+                  'number' => 32
+                },
+                'original_def_cmdname' => 'deftypefn'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 66,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'args' => [
                         {
-                          'extra' => {
-                            'def_role' => 'spaces'
-                          },
+                          'contents' => [],
                           'parent' => {},
-                          'text' => '  ',
-                          'type' => 'spaces'
-                        },
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'dots',
+                      'contents' => [],
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 67,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'parent' => {},
+                      'text' => ' with r slanted for '
+                    },
+                    {
+                      'args' => [
                         {
-                          'extra' => {
-                            'def_role' => 'delimiter'
-                          },
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'f---oo'
+                            }
+                          ],
                           'parent' => {},
-                          'text' => '(',
-                          'type' => 'delimiter'
-                        },
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 67,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'parent' => {},
+                      'text' => ' and '
+                    },
+                    {
+                      'args' => [
                         {
-                          'extra' => {
-                            'def_role' => 'typearg'
-                          },
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'b--ar'
+                            }
+                          ],
                           'parent' => {},
-                          'text' => 'int'
-                        },
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 67,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'parent' => {},
+                      'text' => '
+'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'paragraph'
+                }
+              ],
+              'parent' => {},
+              'type' => 'def_item'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'deftypefn'
+                    }
+                  ],
+                  'extra' => {
+                    'spaces_after_argument' => '
+'
+                  },
+                  'parent' => {},
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'end',
+              'extra' => {
+                'command_argument' => 'deftypefn',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'deftypefn'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 68,
+                'macro' => ''
+              }
+            }
+          ],
+          'extra' => {
+            'end_command' => {},
+            'spaces_before_argument' => ' '
+          },
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 66,
+            'macro' => ''
+          }
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'cmdname' => 'noindent',
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 70,
+            'macro' => ''
+          }
+        },
+        {
+          'extra' => {
+            'command' => {}
+          },
+          'parent' => {},
+          'text' => ' ',
+          'type' => 'empty_spaces_after_command'
+        },
+        {
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => 'produces:
+'
+            }
+          ],
+          'extra' => {
+            'noindent' => 1
+          },
+          'parent' => {},
+          'type' => 'paragraph'
+        },
+        {
+          'cmdname' => 'defcv',
+          'contents' => [
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'contents' => [
+                        {
+                          'parent' => {},
+                          'text' => 'Class Option'
+                        }
+                      ],
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 71,
+                        'macro' => ''
+                      },
+                      'type' => 'bracketed_def_content'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'class'
+                      },
+                      'parent' => {},
+                      'text' => 'Window'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
+                      'parent' => {},
+                      'text' => 'border-pattern'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'block_line_arg'
+                }
+              ],
+              'extra' => {
+                'def_command' => 'defcv',
+                'def_parsed_hash' => {
+                  'category' => {},
+                  'class' => {},
+                  'name' => {}
+                },
+                'index_entry' => {
+                  'command' => {},
+                  'content' => [
+                    {}
+                  ],
+                  'content_normalized' => [
+                    {}
+                  ],
+                  'in_code' => 1,
+                  'index_at_command' => 'defcv',
+                  'index_ignore_chars' => {},
+                  'index_name' => 'vr',
+                  'index_type_command' => 'defcv',
+                  'node' => {},
+                  'number' => 1
+                },
+                'original_def_cmdname' => 'defcv'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 71,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'args' => [
+                        {
+                          'contents' => [],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'dots',
+                      'contents' => [],
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 72,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'parent' => {},
+                      'text' => '
+'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'paragraph'
+                }
+              ],
+              'parent' => {},
+              'type' => 'def_item'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'defcv'
+                    }
+                  ],
+                  'extra' => {
+                    'spaces_after_argument' => '
+'
+                  },
+                  'parent' => {},
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'end',
+              'extra' => {
+                'command_argument' => 'defcv',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'defcv'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 73,
+                'macro' => ''
+              }
+            }
+          ],
+          'extra' => {
+            'end_command' => {},
+            'spaces_before_argument' => ' '
+          },
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 71,
+            'macro' => ''
+          }
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'cmdname' => 'deftypecv',
+          'contents' => [
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'contents' => [
+                        {
+                          'parent' => {},
+                          'text' => 'Class Option'
+                        }
+                      ],
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 75,
+                        'macro' => ''
+                      },
+                      'type' => 'bracketed_def_content'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'class'
+                      },
+                      'text' => 'Window'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'int'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'code',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'type'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 75,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
+                      'text' => 'border-pattern'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'block_line_arg'
+                }
+              ],
+              'extra' => {
+                'def_command' => 'deftypecv',
+                'def_parsed_hash' => {
+                  'category' => {},
+                  'class' => {},
+                  'name' => {},
+                  'type' => {}
+                },
+                'index_entry' => {
+                  'command' => {},
+                  'content' => [
+                    {},
+                    {
+                      'text' => ' of '
+                    },
+                    {}
+                  ],
+                  'content_normalized' => [
+                    {},
+                    {
+                      'text' => ' of '
+                    },
+                    {}
+                  ],
+                  'in_code' => 1,
+                  'index_at_command' => 'deftypecv',
+                  'index_ignore_chars' => {},
+                  'index_name' => 'vr',
+                  'index_type_command' => 'deftypecv',
+                  'node' => {},
+                  'number' => 2
+                },
+                'original_def_cmdname' => 'deftypecv'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 75,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'args' => [
+                        {
+                          'contents' => [],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'dots',
+                      'contents' => [],
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 76,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'parent' => {},
+                      'text' => '
+'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'paragraph'
+                }
+              ],
+              'parent' => {},
+              'type' => 'def_item'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'deftypecv'
+                    }
+                  ],
+                  'extra' => {
+                    'spaces_after_argument' => '
+'
+                  },
+                  'parent' => {},
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'end',
+              'extra' => {
+                'command_argument' => 'deftypecv',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'deftypecv'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 77,
+                'macro' => ''
+              }
+            }
+          ],
+          'extra' => {
+            'end_command' => {},
+            'spaces_before_argument' => ' '
+          },
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 75,
+            'macro' => ''
+          }
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'cmdname' => 'quotation',
+          'contents' => [
+            {
+              'extra' => {
+                'command' => {}
+              },
+              'parent' => {},
+              'text' => '
+',
+              'type' => 'empty_line_after_command'
+            },
+            {
+              'cmdname' => 'deftypefn',
+              'contents' => [
+                {
+                  'args' => [
+                    {
+                      'contents' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'Library Function'
+                            }
+                          ],
+                          'extra' => {
+                            'def_role' => 'category'
+                          },
+                          'parent' => {},
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 80,
+                            'macro' => ''
+                          },
+                          'type' => 'bracketed_def_content'
+                        },
+                        {
+                          'extra' => {
+                            'def_role' => 'spaces'
+                          },
+                          'parent' => {},
+                          'text' => ' ',
+                          'type' => 'spaces'
+                        },
+                        {
+                          'extra' => {
+                            'def_role' => 'type'
+                          },
+                          'parent' => {},
+                          'text' => 'int'
+                        },
+                        {
+                          'extra' => {
+                            'def_role' => 'spaces'
+                          },
+                          'parent' => {},
+                          'text' => ' ',
+                          'type' => 'spaces'
+                        },
+                        {
+                          'extra' => {
+                            'def_role' => 'name'
+                          },
+                          'parent' => {},
+                          'text' => 'foobar'
+                        },
+                        {
+                          'extra' => {
+                            'def_role' => 'spaces'
+                          },
+                          'parent' => {},
+                          'text' => '  ',
+                          'type' => 'spaces'
+                        },
+                        {
+                          'extra' => {
+                            'def_role' => 'delimiter'
+                          },
+                          'parent' => {},
+                          'text' => '(',
+                          'type' => 'delimiter'
+                        },
+                        {
+                          'extra' => {
+                            'def_role' => 'typearg'
+                          },
+                          'parent' => {},
+                          'text' => 'int'
+                        },
+                        {
+                          'extra' => {
+                            'def_role' => 'spaces'
+                          },
+                          'parent' => {},
+                          'text' => ' ',
+                          'type' => 'spaces'
+                        },
+                        {
+                          'args' => [
+                            {
+                              'contents' => [
+                                {
+                                  'parent' => {},
+                                  'text' => 'foo'
+                                }
+                              ],
+                              'parent' => {},
+                              'type' => 'brace_command_arg'
+                            }
+                          ],
+                          'cmdname' => 'var',
+                          'contents' => [],
+                          'extra' => {
+                            'def_role' => 'arg'
+                          },
+                          'parent' => {},
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 80,
+                            'macro' => ''
+                          }
+                        },
+                        {
+                          'extra' => {
+                            'def_role' => 'delimiter'
+                          },
+                          'parent' => {},
+                          'text' => ',',
+                          'type' => 'delimiter'
+                        },
+                        {
+                          'extra' => {
+                            'def_role' => 'spaces'
+                          },
+                          'parent' => {},
+                          'text' => ' ',
+                          'type' => 'spaces'
+                        },
+                        {
+                          'extra' => {
+                            'def_role' => 'typearg'
+                          },
+                          'parent' => {},
+                          'text' => 'float'
+                        },
+                        {
+                          'extra' => {
+                            'def_role' => 'spaces'
+                          },
+                          'parent' => {},
+                          'text' => ' ',
+                          'type' => 'spaces'
+                        },
+                        {
+                          'args' => [
+                            {
+                              'contents' => [
+                                {
+                                  'parent' => {},
+                                  'text' => 'bar'
+                                }
+                              ],
+                              'parent' => {},
+                              'type' => 'brace_command_arg'
+                            }
+                          ],
+                          'cmdname' => 'var',
+                          'contents' => [],
+                          'extra' => {
+                            'def_role' => 'arg'
+                          },
+                          'parent' => {},
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 80,
+                            'macro' => ''
+                          }
+                        },
+                        {
+                          'extra' => {
+                            'def_role' => 'delimiter'
+                          },
+                          'parent' => {},
+                          'text' => ')',
+                          'type' => 'delimiter'
+                        },
+                        {
+                          'extra' => {
+                            'def_role' => 'spaces'
+                          },
+                          'parent' => {},
+                          'text' => '
+',
+                          'type' => 'spaces_at_end'
+                        }
+                      ],
+                      'parent' => {},
+                      'type' => 'block_line_arg'
+                    }
+                  ],
+                  'extra' => {
+                    'def_command' => 'deftypefn',
+                    'def_parsed_hash' => {
+                      'category' => {},
+                      'name' => {},
+                      'type' => {}
+                    },
+                    'index_entry' => {
+                      'command' => {},
+                      'content' => [
+                        {}
+                      ],
+                      'content_normalized' => [
+                        {}
+                      ],
+                      'in_code' => 1,
+                      'index_at_command' => 'deftypefn',
+                      'index_ignore_chars' => {},
+                      'index_name' => 'fn',
+                      'index_type_command' => 'deftypefn',
+                      'node' => {},
+                      'number' => 33
+                    },
+                    'original_def_cmdname' => 'deftypefn'
+                  },
+                  'parent' => {},
+                  'source_info' => {
+                    'file_name' => '',
+                    'line_nr' => 80,
+                    'macro' => ''
+                  },
+                  'type' => 'def_line'
+                },
+                {
+                  'contents' => [
+                    {
+                      'contents' => [
+                        {
+                          'args' => [
+                            {
+                              'contents' => [],
+                              'parent' => {},
+                              'type' => 'brace_command_arg'
+                            }
+                          ],
+                          'cmdname' => 'dots',
+                          'contents' => [],
+                          'parent' => {},
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 81,
+                            'macro' => ''
+                          }
+                        },
+                        {
+                          'parent' => {},
+                          'text' => ' for '
+                        },
+                        {
+                          'args' => [
+                            {
+                              'contents' => [
+                                {
+                                  'parent' => {},
+                                  'text' => 'foo'
+                                }
+                              ],
+                              'parent' => {},
+                              'type' => 'brace_command_arg'
+                            }
+                          ],
+                          'cmdname' => 'var',
+                          'contents' => [],
+                          'parent' => {},
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 81,
+                            'macro' => ''
+                          }
+                        },
+                        {
+                          'parent' => {},
+                          'text' => ' and '
+                        },
+                        {
+                          'args' => [
+                            {
+                              'contents' => [
+                                {
+                                  'parent' => {},
+                                  'text' => 'bar'
+                                }
+                              ],
+                              'parent' => {},
+                              'type' => 'brace_command_arg'
+                            }
+                          ],
+                          'cmdname' => 'var',
+                          'contents' => [],
+                          'parent' => {},
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 81,
+                            'macro' => ''
+                          }
+                        },
+                        {
+                          'parent' => {},
+                          'text' => '
+'
+                        }
+                      ],
+                      'parent' => {},
+                      'type' => 'paragraph'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'def_item'
+                },
+                {
+                  'args' => [
+                    {
+                      'contents' => [
+                        {
+                          'parent' => {},
+                          'text' => 'deftypefn'
+                        }
+                      ],
+                      'extra' => {
+                        'spaces_after_argument' => '
+'
+                      },
+                      'parent' => {},
+                      'type' => 'line_arg'
+                    }
+                  ],
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'deftypefn',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'deftypefn'
+                  },
+                  'parent' => {},
+                  'source_info' => {
+                    'file_name' => '',
+                    'line_nr' => 82,
+                    'macro' => ''
+                  }
+                }
+              ],
+              'extra' => {
+                'end_command' => {},
+                'spaces_before_argument' => ' '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 80,
+                'macro' => ''
+              }
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'quotation'
+                    }
+                  ],
+                  'extra' => {
+                    'spaces_after_argument' => '
+'
+                  },
+                  'parent' => {},
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'end',
+              'extra' => {
+                'command_argument' => 'quotation',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'quotation'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 83,
+                'macro' => ''
+              }
+            }
+          ],
+          'extra' => {
+            'end_command' => {}
+          },
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 79,
+            'macro' => ''
+          }
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'cmdname' => 'defun',
+          'contents' => [
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'contents' => [
+                        {
+                          'parent' => {},
+                          'text' => 'Function'
+                        }
+                      ],
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
+                      'parent' => {},
+                      'type' => 'bracketed_inserted'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces_inserted'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
+                      'parent' => {},
+                      'text' => 'apply'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'text' => 'function'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'text' => '&rest'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'text' => 'arguments'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'block_line_arg'
+                }
+              ],
+              'extra' => {
+                'def_command' => 'defun',
+                'def_parsed_hash' => {
+                  'category' => {},
+                  'name' => {}
+                },
+                'index_entry' => {
+                  'command' => {},
+                  'content' => [
+                    {}
+                  ],
+                  'content_normalized' => [
+                    {}
+                  ],
+                  'in_code' => 1,
+                  'index_at_command' => 'defun',
+                  'index_ignore_chars' => {},
+                  'index_name' => 'fn',
+                  'index_type_command' => 'defun',
+                  'node' => {},
+                  'number' => 34
+                },
+                'original_def_cmdname' => 'defun'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 85,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'apply'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'code',
+                      'contents' => [],
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 86,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'parent' => {},
+                      'text' => ' calls no var '
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'function'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 86,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'parent' => {},
+                      'text' => ' with '
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'arguments'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 86,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'parent' => {},
+                      'text' => '
+'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'paragraph'
+                }
+              ],
+              'parent' => {},
+              'type' => 'def_item'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'defun'
+                    }
+                  ],
+                  'extra' => {
+                    'spaces_after_argument' => '
+'
+                  },
+                  'parent' => {},
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'end',
+              'extra' => {
+                'command_argument' => 'defun',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'defun'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 87,
+                'macro' => ''
+              }
+            }
+          ],
+          'extra' => {
+            'end_command' => {},
+            'spaces_before_argument' => ' '
+          },
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 85,
+            'macro' => ''
+          }
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'cmdname' => 'defun',
+          'contents' => [
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'contents' => [
+                        {
+                          'parent' => {},
+                          'text' => 'Function'
+                        }
+                      ],
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
+                      'parent' => {},
+                      'type' => 'bracketed_inserted'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces_inserted'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
+                      'parent' => {},
+                      'text' => 'apply'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'text' => 'function'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '&rest'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'b',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 89,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 89,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'text' => 'argument'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'block_line_arg'
+                }
+              ],
+              'extra' => {
+                'def_command' => 'defun',
+                'def_parsed_hash' => {
+                  'category' => {},
+                  'name' => {}
+                },
+                'index_entry' => {
+                  'command' => {},
+                  'content' => [
+                    {}
+                  ],
+                  'content_normalized' => [
+                    {}
+                  ],
+                  'in_code' => 1,
+                  'index_at_command' => 'defun',
+                  'index_ignore_chars' => {},
+                  'index_name' => 'fn',
+                  'index_type_command' => 'defun',
+                  'node' => {},
+                  'number' => 35
+                },
+                'original_def_cmdname' => 'defun'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 89,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'explicit keyword marking, no var '
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'function'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 90,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'parent' => {},
+                      'text' => ' with '
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'arguments'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 90,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'parent' => {},
+                      'text' => '
+'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'paragraph'
+                }
+              ],
+              'parent' => {},
+              'type' => 'def_item'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'defun'
+                    }
+                  ],
+                  'extra' => {
+                    'spaces_after_argument' => '
+'
+                  },
+                  'parent' => {},
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'end',
+              'extra' => {
+                'command_argument' => 'defun',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'defun'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 91,
+                'macro' => ''
+              }
+            }
+          ],
+          'extra' => {
+            'end_command' => {},
+            'spaces_before_argument' => ' '
+          },
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 89,
+            'macro' => ''
+          }
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'cmdname' => 'deffn',
+          'contents' => [
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
+                      'parent' => {},
+                      'text' => 'Category'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
+                      'parent' => {},
+                      'text' => 'name'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'text' => 'argument'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'int'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'code',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 93,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'a--b'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'code',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 93,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'v--ar1'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 93,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ',',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'text' => 'word'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => '--'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'code',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 93,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '(',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'type o--ther'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'code',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 93,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ',',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'v---ar2'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 93,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '  ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '[',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'float'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'code',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 94,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '[',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'var4'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 94,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ']',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ']',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ')',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'block_line_arg'
+                }
+              ],
+              'extra' => {
+                'def_command' => 'deffn',
+                'def_parsed_hash' => {
+                  'category' => {},
+                  'name' => {}
+                },
+                'index_entry' => {
+                  'command' => {},
+                  'content' => [
+                    {}
+                  ],
+                  'content_normalized' => [
+                    {}
+                  ],
+                  'in_code' => 1,
+                  'index_at_command' => 'deffn',
+                  'index_ignore_chars' => {},
+                  'index_name' => 'fn',
+                  'index_type_command' => 'deffn',
+                  'node' => {},
+                  'number' => 36
+                },
+                'original_def_cmdname' => 'deffn'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 93,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'In deffn with code and var used
+'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'paragraph'
+                }
+              ],
+              'parent' => {},
+              'type' => 'def_item'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'deffn'
+                    }
+                  ],
+                  'extra' => {
+                    'spaces_after_argument' => '
+'
+                  },
+                  'parent' => {},
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'end',
+              'extra' => {
+                'command_argument' => 'deffn',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'deffn'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 96,
+                'macro' => ''
+              }
+            }
+          ],
+          'extra' => {
+            'end_command' => {},
+            'spaces_before_argument' => ' '
+          },
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 93,
+            'macro' => ''
+          }
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'cmdname' => 'deftypefn',
+          'contents' => [
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'contents' => [
+                        {
+                          'parent' => {},
+                          'text' => 'Library Function'
+                        }
+                      ],
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 98,
+                        'macro' => ''
+                      },
+                      'type' => 'bracketed_def_content'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'type'
+                      },
+                      'parent' => {},
+                      'text' => 'int'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
+                      'parent' => {},
+                      'text' => 'foobar'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '  ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '(',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'typearg'
+                      },
+                      'parent' => {},
+                      'text' => 'int'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'f---oo'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 98,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '[',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ',',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'typearg'
+                      },
+                      'parent' => {},
+                      'text' => 'float'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'b--ar'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 98,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ']',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ')',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'typearg'
+                      },
+                      'parent' => {},
+                      'text' => 'default'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'block_line_arg'
+                }
+              ],
+              'extra' => {
+                'def_command' => 'deftypefn',
+                'def_parsed_hash' => {
+                  'category' => {},
+                  'name' => {},
+                  'type' => {}
+                },
+                'index_entry' => {
+                  'command' => {},
+                  'content' => [
+                    {}
+                  ],
+                  'content_normalized' => [
+                    {}
+                  ],
+                  'in_code' => 1,
+                  'index_at_command' => 'deftypefn',
+                  'index_ignore_chars' => {},
+                  'index_name' => 'fn',
+                  'index_type_command' => 'deftypefn',
+                  'node' => {},
+                  'number' => 37
+                },
+                'original_def_cmdname' => 'deftypefn'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 98,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'contents' => [
                         {
-                          'extra' => {
-                            'def_role' => 'spaces'
-                          },
                           'parent' => {},
-                          'text' => ' ',
-                          'type' => 'spaces'
-                        },
+                          'text' => 'Library Function'
+                        }
+                      ],
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 99,
+                        'macro' => ''
+                      },
+                      'type' => 'bracketed_def_content'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'type'
+                      },
+                      'parent' => {},
+                      'text' => 'int'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
+                      'parent' => {},
+                      'text' => 'foobar'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '  ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '(',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'typearg'
+                      },
+                      'parent' => {},
+                      'text' => 'int'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
                         {
-                          'args' => [
+                          'contents' => [
                             {
-                              'contents' => [
-                                {
-                                  'parent' => {},
-                                  'text' => 'foo'
-                                }
-                              ],
                               'parent' => {},
-                              'type' => 'brace_command_arg'
+                              'text' => 'f---oo'
                             }
                           ],
-                          'cmdname' => 'var',
-                          'contents' => [],
-                          'extra' => {
-                            'def_role' => 'arg'
-                          },
-                          'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 74,
-                            'macro' => ''
-                          }
-                        },
-                        {
-                          'extra' => {
-                            'def_role' => 'delimiter'
-                          },
-                          'parent' => {},
-                          'text' => ',',
-                          'type' => 'delimiter'
-                        },
-                        {
-                          'extra' => {
-                            'def_role' => 'spaces'
-                          },
-                          'parent' => {},
-                          'text' => ' ',
-                          'type' => 'spaces'
-                        },
-                        {
-                          'extra' => {
-                            'def_role' => 'typearg'
-                          },
-                          'parent' => {},
-                          'text' => 'float'
-                        },
-                        {
-                          'extra' => {
-                            'def_role' => 'spaces'
-                          },
                           'parent' => {},
-                          'text' => ' ',
-                          'type' => 'spaces'
-                        },
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 99,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'args' => [
                         {
-                          'args' => [
+                          'contents' => [
                             {
-                              'contents' => [
-                                {
-                                  'parent' => {},
-                                  'text' => 'bar'
-                                }
-                              ],
                               'parent' => {},
-                              'type' => 'brace_command_arg'
+                              'text' => '['
                             }
                           ],
-                          'cmdname' => 'var',
-                          'contents' => [],
-                          'extra' => {
-                            'def_role' => 'arg'
-                          },
-                          'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 74,
-                            'macro' => ''
-                          }
-                        },
-                        {
-                          'extra' => {
-                            'def_role' => 'delimiter'
-                          },
-                          'parent' => {},
-                          'text' => ')',
-                          'type' => 'delimiter'
-                        },
-                        {
-                          'extra' => {
-                            'def_role' => 'spaces'
-                          },
                           'parent' => {},
-                          'text' => '
-',
-                          'type' => 'spaces_at_end'
+                          'type' => 'brace_command_arg'
                         }
                       ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
-                      'type' => 'block_line_arg'
-                    }
-                  ],
-                  'extra' => {
-                    'def_command' => 'deftypefn',
-                    'def_parsed_hash' => {
-                      'category' => {},
-                      'name' => {},
-                      'type' => {}
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 99,
+                        'macro' => ''
+                      }
                     },
-                    'index_entry' => {
-                      'command' => {},
-                      'content' => [
-                        {}
-                      ],
-                      'content_normalized' => [
-                        {}
-                      ],
-                      'in_code' => 1,
-                      'index_at_command' => 'deftypefn',
-                      'index_ignore_chars' => {},
-                      'index_name' => 'fn',
-                      'index_type_command' => 'deftypefn',
-                      'node' => {},
-                      'number' => 27
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ',',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'typearg'
+                      },
+                      'parent' => {},
+                      'text' => 'float'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
                     },
-                    'original_def_cmdname' => 'deftypefn'
-                  },
-                  'parent' => {},
-                  'source_info' => {
-                    'file_name' => '',
-                    'line_nr' => 74,
-                    'macro' => ''
-                  },
-                  'type' => 'def_line'
-                },
-                {
-                  'contents' => [
                     {
-                      'contents' => [
-                        {
-                          'args' => [
-                            {
-                              'contents' => [],
-                              'parent' => {},
-                              'type' => 'brace_command_arg'
-                            }
-                          ],
-                          'cmdname' => 'dots',
-                          'contents' => [],
-                          'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 75,
-                            'macro' => ''
-                          }
-                        },
-                        {
-                          'parent' => {},
-                          'text' => ' for '
-                        },
+                      'args' => [
                         {
-                          'args' => [
+                          'contents' => [
                             {
-                              'contents' => [
-                                {
-                                  'parent' => {},
-                                  'text' => 'foo'
-                                }
-                              ],
                               'parent' => {},
-                              'type' => 'brace_command_arg'
+                              'text' => 'b--ar'
                             }
                           ],
-                          'cmdname' => 'var',
-                          'contents' => [],
                           'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 75,
-                            'macro' => ''
-                          }
-                        },
-                        {
-                          'parent' => {},
-                          'text' => ' and '
-                        },
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 99,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'args' => [
                         {
-                          'args' => [
+                          'contents' => [
                             {
-                              'contents' => [
-                                {
-                                  'parent' => {},
-                                  'text' => 'bar'
-                                }
-                              ],
                               'parent' => {},
-                              'type' => 'brace_command_arg'
+                              'text' => ']'
                             }
                           ],
-                          'cmdname' => 'var',
-                          'contents' => [],
-                          'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 75,
-                            'macro' => ''
-                          }
-                        },
-                        {
                           'parent' => {},
-                          'text' => '
-'
+                          'type' => 'brace_command_arg'
                         }
                       ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
-                      'type' => 'paragraph'
-                    }
-                  ],
-                  'parent' => {},
-                  'type' => 'def_item'
-                },
-                {
-                  'args' => [
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 99,
+                        'macro' => ''
+                      }
+                    },
                     {
-                      'contents' => [
-                        {
-                          'parent' => {},
-                          'text' => 'deftypefn'
-                        }
-                      ],
                       'extra' => {
-                        'spaces_after_argument' => '
-'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'type' => 'line_arg'
+                      'text' => ')',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'typearg'
+                      },
+                      'parent' => {},
+                      'text' => 'r'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
                     }
                   ],
-                  'cmdname' => 'end',
-                  'extra' => {
-                    'command_argument' => 'deftypefn',
-                    'spaces_before_argument' => ' ',
-                    'text_arg' => 'deftypefn'
-                  },
                   'parent' => {},
-                  'source_info' => {
-                    'file_name' => '',
-                    'line_nr' => 76,
-                    'macro' => ''
-                  }
+                  'type' => 'line_arg'
                 }
               ],
+              'cmdname' => 'deftypefnx',
               'extra' => {
-                'end_command' => {},
+                'def_command' => 'deftypefn',
+                'def_parsed_hash' => {
+                  'category' => {},
+                  'name' => {},
+                  'type' => {}
+                },
+                'index_entry' => {
+                  'command' => {},
+                  'content' => [
+                    {}
+                  ],
+                  'content_normalized' => [
+                    {}
+                  ],
+                  'in_code' => 1,
+                  'index_at_command' => 'deftypefnx',
+                  'index_ignore_chars' => {},
+                  'index_name' => 'fn',
+                  'index_type_command' => 'deftypefn',
+                  'node' => {},
+                  'number' => 38
+                },
+                'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 74,
+                'line_nr' => 99,
                 'macro' => ''
-              }
+              },
+              'type' => 'def_line'
             },
             {
               'args' => [
                 {
                   'contents' => [
                     {
+                      'contents' => [
+                        {
+                          'parent' => {},
+                          'text' => 'Library Function'
+                        }
+                      ],
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 100,
+                        'macro' => ''
+                      },
+                      'type' => 'bracketed_def_content'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'type'
+                      },
+                      'parent' => {},
+                      'text' => 'int'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
+                      'parent' => {},
+                      'text' => 'foobar'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '  ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '(',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'typearg'
+                      },
+                      'parent' => {},
+                      'text' => 'int'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       'parent' => {},
-                      'text' => 'quotation'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'end',
-              'extra' => {
-                'command_argument' => 'quotation',
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'quotation'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 77,
-                'macro' => ''
-              }
-            }
-          ],
-          'extra' => {
-            'end_command' => {}
-          },
-          'parent' => {},
-          'source_info' => {
-            'file_name' => '',
-            'line_nr' => 73,
-            'macro' => ''
-          }
-        },
-        {
-          'parent' => {},
-          'text' => '
-',
-          'type' => 'empty_line'
-        },
-        {
-          'cmdname' => 'defun',
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
                     {
-                      'contents' => [
+                      'args' => [
                         {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'f---oo'
+                            }
+                          ],
                           'parent' => {},
-                          'text' => 'Function'
+                          'type' => 'brace_command_arg'
                         }
                       ],
+                      'cmdname' => 'var',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'category'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'type' => 'bracketed_inserted'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 100,
+                        'macro' => ''
+                      }
                     },
                     {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => '['
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'slanted',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'spaces'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces_inserted'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 100,
+                        'macro' => ''
+                      }
                     },
                     {
                       'extra' => {
-                        'def_role' => 'name'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'text' => 'apply'
+                      'text' => ',',
+                      'type' => 'delimiter'
                     },
                     {
                       'extra' => {
@@ -8130,10 +11083,10 @@ $result_trees{'definition_commands'} = {
                     },
                     {
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'function'
+                      'text' => 'float'
                     },
                     {
                       'extra' => {
@@ -8144,11 +11097,62 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'b--ar'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => '&rest'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 100,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => ']'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'slanted',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 100,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ')',
+                      'type' => 'delimiter'
                     },
                     {
                       'extra' => {
@@ -8160,10 +11164,10 @@ $result_trees{'definition_commands'} = {
                     },
                     {
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'arguments'
+                      'text' => 'slanted'
                     },
                     {
                       'extra' => {
@@ -8176,14 +11180,16 @@ $result_trees{'definition_commands'} = {
                     }
                   ],
                   'parent' => {},
-                  'type' => 'block_line_arg'
+                  'type' => 'line_arg'
                 }
               ],
+              'cmdname' => 'deftypefnx',
               'extra' => {
-                'def_command' => 'defun',
+                'def_command' => 'deftypefn',
                 'def_parsed_hash' => {
                   'category' => {},
-                  'name' => {}
+                  'name' => {},
+                  'type' => {}
                 },
                 'index_entry' => {
                   'command' => {},
@@ -8194,52 +11200,106 @@ $result_trees{'definition_commands'} = {
                     {}
                   ],
                   'in_code' => 1,
-                  'index_at_command' => 'defun',
+                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defun',
+                  'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 28
+                  'number' => 39
                 },
-                'original_def_cmdname' => 'defun'
+                'original_def_cmdname' => 'deftypefnx',
+                'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 79,
+                'line_nr' => 100,
                 'macro' => ''
               },
               'type' => 'def_line'
             },
             {
-              'contents' => [
+              'args' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'contents' => [
                         {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => 'apply'
-                            }
-                          ],
                           'parent' => {},
-                          'type' => 'brace_command_arg'
+                          'text' => 'Library Function'
                         }
                       ],
-                      'cmdname' => 'code',
-                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 80,
+                        'line_nr' => 101,
                         'macro' => ''
-                      }
+                      },
+                      'type' => 'bracketed_def_content'
                     },
                     {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       'parent' => {},
-                      'text' => ' calls no var '
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'type'
+                      },
+                      'parent' => {},
+                      'text' => 'int'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
+                      'parent' => {},
+                      'text' => 'foobar'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '  ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '(',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'typearg'
+                      },
+                      'parent' => {},
+                      'text' => 'int'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
                     },
                     {
                       'args' => [
@@ -8247,7 +11307,7 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'function'
+                              'text' => 'f---oo'
                             }
                           ],
                           'parent' => {},
@@ -8256,119 +11316,48 @@ $result_trees{'definition_commands'} = {
                       ],
                       'cmdname' => 'var',
                       'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 80,
+                        'line_nr' => 101,
                         'macro' => ''
                       }
                     },
-                    {
-                      'parent' => {},
-                      'text' => ' with '
-                    },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'arguments'
+                              'text' => '['
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 'code',
                       'contents' => [],
+                      'extra' => {
+                        'def_role' => 'typearg'
+                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 80,
+                        'line_nr' => 101,
                         'macro' => ''
                       }
                     },
                     {
-                      'parent' => {},
-                      'text' => '
-'
-                    }
-                  ],
-                  'parent' => {},
-                  'type' => 'paragraph'
-                }
-              ],
-              'parent' => {},
-              'type' => 'def_item'
-            },
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'defun'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'end',
-              'extra' => {
-                'command_argument' => 'defun',
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'defun'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 81,
-                'macro' => ''
-              }
-            }
-          ],
-          'extra' => {
-            'end_command' => {},
-            'spaces_before_argument' => ' '
-          },
-          'parent' => {},
-          'source_info' => {
-            'file_name' => '',
-            'line_nr' => 79,
-            'macro' => ''
-          }
-        },
-        {
-          'parent' => {},
-          'text' => '
-',
-          'type' => 'empty_line'
-        },
-        {
-          'cmdname' => 'defun',
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'contents' => [
-                        {
-                          'parent' => {},
-                          'text' => 'Function'
-                        }
-                      ],
                       'extra' => {
-                        'def_role' => 'category'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'type' => 'bracketed_inserted'
+                      'text' => ',',
+                      'type' => 'delimiter'
                     },
                     {
                       'extra' => {
@@ -8376,14 +11365,14 @@ $result_trees{'definition_commands'} = {
                       },
                       'parent' => {},
                       'text' => ' ',
-                      'type' => 'spaces_inserted'
+                      'type' => 'spaces'
                     },
                     {
                       'extra' => {
-                        'def_role' => 'name'
+                        'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'apply'
+                      'text' => 'float'
                     },
                     {
                       'extra' => {
@@ -8394,63 +11383,63 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'b--ar'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'function'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 101,
+                        'macro' => ''
+                      }
                     },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => '&rest'
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'b',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 83,
-                                'macro' => ''
-                              }
+                              'text' => ']'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 'code',
                       'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'typearg'
                       },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 83,
+                        'line_nr' => 101,
                         'macro' => ''
                       }
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ')',
+                      'type' => 'delimiter'
+                    },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
@@ -8461,10 +11450,10 @@ $result_trees{'definition_commands'} = {
                     },
                     {
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'argument'
+                      'text' => 'code'
                     },
                     {
                       'extra' => {
@@ -8477,14 +11466,16 @@ $result_trees{'definition_commands'} = {
                     }
                   ],
                   'parent' => {},
-                  'type' => 'block_line_arg'
+                  'type' => 'line_arg'
                 }
               ],
+              'cmdname' => 'deftypefnx',
               'extra' => {
-                'def_command' => 'defun',
+                'def_command' => 'deftypefn',
                 'def_parsed_hash' => {
                   'category' => {},
-                  'name' => {}
+                  'name' => {},
+                  'type' => {}
                 },
                 'index_entry' => {
                   'command' => {},
@@ -8495,30 +11486,106 @@ $result_trees{'definition_commands'} = {
                     {}
                   ],
                   'in_code' => 1,
-                  'index_at_command' => 'defun',
+                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defun',
+                  'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 29
+                  'number' => 40
                 },
-                'original_def_cmdname' => 'defun'
+                'original_def_cmdname' => 'deftypefnx',
+                'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 83,
+                'line_nr' => 101,
                 'macro' => ''
               },
               'type' => 'def_line'
             },
             {
-              'contents' => [
+              'args' => [
                 {
                   'contents' => [
                     {
+                      'contents' => [
+                        {
+                          'parent' => {},
+                          'text' => 'Library Function'
+                        }
+                      ],
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 102,
+                        'macro' => ''
+                      },
+                      'type' => 'bracketed_def_content'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'type'
+                      },
+                      'parent' => {},
+                      'text' => 'int'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
+                      'parent' => {},
+                      'text' => 'foobar'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '  ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '(',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'typearg'
+                      },
+                      'parent' => {},
+                      'text' => 'int'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       'parent' => {},
-                      'text' => 'explicit keyword marking, no var '
+                      'text' => ' ',
+                      'type' => 'spaces'
                     },
                     {
                       'args' => [
@@ -8526,7 +11593,7 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'function'
+                              'text' => 'f---oo'
                             }
                           ],
                           'parent' => {},
@@ -8535,128 +11602,48 @@ $result_trees{'definition_commands'} = {
                       ],
                       'cmdname' => 'var',
                       'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 84,
+                        'line_nr' => 102,
                         'macro' => ''
                       }
                     },
-                    {
-                      'parent' => {},
-                      'text' => ' with '
-                    },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'arguments'
+                              'text' => '['
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 't',
                       'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 84,
+                        'line_nr' => 102,
                         'macro' => ''
                       }
                     },
-                    {
-                      'parent' => {},
-                      'text' => '
-'
-                    }
-                  ],
-                  'parent' => {},
-                  'type' => 'paragraph'
-                }
-              ],
-              'parent' => {},
-              'type' => 'def_item'
-            },
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'defun'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'end',
-              'extra' => {
-                'command_argument' => 'defun',
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'defun'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 85,
-                'macro' => ''
-              }
-            }
-          ],
-          'extra' => {
-            'end_command' => {},
-            'spaces_before_argument' => ' '
-          },
-          'parent' => {},
-          'source_info' => {
-            'file_name' => '',
-            'line_nr' => 83,
-            'macro' => ''
-          }
-        },
-        {
-          'parent' => {},
-          'text' => '
-',
-          'type' => 'empty_line'
-        },
-        {
-          'cmdname' => 'deffn',
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'extra' => {
-                        'def_role' => 'category'
-                      },
-                      'parent' => {},
-                      'text' => 'Category'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
                     {
                       'extra' => {
-                        'def_role' => 'name'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'text' => 'name'
+                      'text' => ',',
+                      'type' => 'delimiter'
                     },
                     {
                       'extra' => {
@@ -8668,10 +11655,10 @@ $result_trees{'definition_commands'} = {
                     },
                     {
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'argument'
+                      'text' => 'float'
                     },
                     {
                       'extra' => {
@@ -8687,14 +11674,14 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'int'
+                              'text' => 'b--ar'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'code',
+                      'cmdname' => 'var',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -8702,32 +11689,24 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 87,
+                        'line_nr' => 102,
                         'macro' => ''
                       }
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'a--b'
+                              'text' => ']'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'code',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -8735,10 +11714,18 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 87,
+                        'line_nr' => 102,
                         'macro' => ''
                       }
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ')',
+                      'type' => 'delimiter'
+                    },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
@@ -8748,52 +11735,135 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
-                      'args' => [
+                      'extra' => {
+                        'def_role' => 'typearg'
+                      },
+                      'parent' => {},
+                      'text' => 't'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'deftypefnx',
+              'extra' => {
+                'def_command' => 'deftypefn',
+                'def_parsed_hash' => {
+                  'category' => {},
+                  'name' => {},
+                  'type' => {}
+                },
+                'index_entry' => {
+                  'command' => {},
+                  'content' => [
+                    {}
+                  ],
+                  'content_normalized' => [
+                    {}
+                  ],
+                  'in_code' => 1,
+                  'index_at_command' => 'deftypefnx',
+                  'index_ignore_chars' => {},
+                  'index_name' => 'fn',
+                  'index_type_command' => 'deftypefn',
+                  'node' => {},
+                  'number' => 41
+                },
+                'original_def_cmdname' => 'deftypefnx',
+                'spaces_before_argument' => ' '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 102,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'contents' => [
                         {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => 'v--ar1'
-                            }
-                          ],
                           'parent' => {},
-                          'type' => 'brace_command_arg'
+                          'text' => 'Library Function'
                         }
                       ],
-                      'cmdname' => 'var',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'category'
                       },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 87,
+                        'line_nr' => 103,
                         'macro' => ''
-                      }
+                      },
+                      'type' => 'bracketed_def_content'
                     },
                     {
                       'extra' => {
-                        'def_role' => 'delimiter'
+                        'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => ',',
-                      'type' => 'delimiter'
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'type'
+                      },
+                      'parent' => {},
+                      'text' => 'int'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
+                      'parent' => {},
+                      'text' => 'foobar'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '  ',
+                      'type' => 'spaces'
                     },
                     {
                       'extra' => {
-                        'def_role' => 'spaces'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
+                      'text' => '(',
+                      'type' => 'delimiter'
                     },
                     {
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'word'
+                      'text' => 'int'
                     },
                     {
                       'extra' => {
@@ -8809,14 +11879,14 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => '--'
+                              'text' => 'f---oo'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'code',
+                      'cmdname' => 'var',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -8824,40 +11894,42 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 87,
+                        'line_nr' => 103,
                         'macro' => ''
                       }
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'delimiter'
-                      },
-                      'parent' => {},
-                      'text' => '(',
-                      'type' => 'delimiter'
-                    },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '['
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'b',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'type o--ther'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 103,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'code',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -8865,7 +11937,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 87,
+                        'line_nr' => 103,
                         'macro' => ''
                       }
                     },
@@ -8886,60 +11958,34 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => 'v---ar2'
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'var',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 87,
-                        'macro' => ''
-                      }
+                      'text' => 'float'
                     },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => '  ',
+                      'text' => ' ',
                       'type' => 'spaces'
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'delimiter'
-                      },
-                      'parent' => {},
-                      'text' => '[',
-                      'type' => 'delimiter'
-                    },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'float'
+                              'text' => 'b--ar'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'code',
+                      'cmdname' => 'var',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -8947,40 +11993,42 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 88,
+                        'line_nr' => 103,
                         'macro' => ''
                       }
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'delimiter'
-                      },
-                      'parent' => {},
-                      'text' => '[',
-                      'type' => 'delimiter'
-                    },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ']'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'b',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'var4'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 103,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -8988,7 +12036,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 88,
+                        'line_nr' => 103,
                         'macro' => ''
                       }
                     },
@@ -8997,24 +12045,23 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'text' => ']',
+                      'text' => ')',
                       'type' => 'delimiter'
                     },
                     {
                       'extra' => {
-                        'def_role' => 'delimiter'
+                        'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => ']',
-                      'type' => 'delimiter'
+                      'text' => ' ',
+                      'type' => 'spaces'
                     },
                     {
                       'extra' => {
-                        'def_role' => 'delimiter'
+                        'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => ')',
-                      'type' => 'delimiter'
+                      'text' => 't:b'
                     },
                     {
                       'extra' => {
@@ -9027,14 +12074,16 @@ $result_trees{'definition_commands'} = {
                     }
                   ],
                   'parent' => {},
-                  'type' => 'block_line_arg'
+                  'type' => 'line_arg'
                 }
               ],
+              'cmdname' => 'deftypefnx',
               'extra' => {
-                'def_command' => 'deffn',
+                'def_command' => 'deftypefn',
                 'def_parsed_hash' => {
                   'category' => {},
-                  'name' => {}
+                  'name' => {},
+                  'type' => {}
                 },
                 'index_entry' => {
                   'command' => {},
@@ -9045,91 +12094,24 @@ $result_trees{'definition_commands'} = {
                     {}
                   ],
                   'in_code' => 1,
-                  'index_at_command' => 'deffn',
+                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
+                  'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 30
+                  'number' => 42
                 },
-                'original_def_cmdname' => 'deffn'
+                'original_def_cmdname' => 'deftypefnx',
+                'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 87,
+                'line_nr' => 103,
                 'macro' => ''
               },
               'type' => 'def_line'
             },
-            {
-              'contents' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'In deffn with code and var used
-'
-                    }
-                  ],
-                  'parent' => {},
-                  'type' => 'paragraph'
-                }
-              ],
-              'parent' => {},
-              'type' => 'def_item'
-            },
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'deffn'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'end',
-              'extra' => {
-                'command_argument' => 'deffn',
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'deffn'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 90,
-                'macro' => ''
-              }
-            }
-          ],
-          'extra' => {
-            'end_command' => {},
-            'spaces_before_argument' => ' '
-          },
-          'parent' => {},
-          'source_info' => {
-            'file_name' => '',
-            'line_nr' => 87,
-            'macro' => ''
-          }
-        },
-        {
-          'parent' => {},
-          'text' => '
-',
-          'type' => 'empty_line'
-        },
-        {
-          'cmdname' => 'deftypefn',
-          'contents' => [
             {
               'args' => [
                 {
@@ -9147,7 +12129,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 92,
+                        'line_nr' => 104,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -9219,14 +12201,57 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'f---oo'
+                              'text' => 'f---oo'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 104,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '['
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'slanted',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 104,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 'r',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -9234,18 +12259,10 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 92,
+                        'line_nr' => 104,
                         'macro' => ''
                       }
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'delimiter'
-                      },
-                      'parent' => {},
-                      'text' => '[',
-                      'type' => 'delimiter'
-                    },
                     {
                       'extra' => {
                         'def_role' => 'delimiter'
@@ -9298,17 +12315,52 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 92,
+                        'line_nr' => 104,
                         'macro' => ''
                       }
                     },
                     {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ']'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'slanted',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 104,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'delimiter'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => ']',
-                      'type' => 'delimiter'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 104,
+                        'macro' => ''
+                      }
                     },
                     {
                       'extra' => {
@@ -9331,7 +12383,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'default'
+                      'text' => 'r:slanted'
                     },
                     {
                       'extra' => {
@@ -9344,9 +12396,10 @@ $result_trees{'definition_commands'} = {
                     }
                   ],
                   'parent' => {},
-                  'type' => 'block_line_arg'
+                  'type' => 'line_arg'
                 }
               ],
+              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_parsed_hash' => {
@@ -9363,19 +12416,20 @@ $result_trees{'definition_commands'} = {
                     {}
                   ],
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
+                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 31
+                  'number' => 43
                 },
-                'original_def_cmdname' => 'deftypefn'
+                'original_def_cmdname' => 'deftypefnx',
+                'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 92,
+                'line_nr' => 104,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -9397,7 +12451,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 93,
+                        'line_nr' => 105,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -9484,7 +12538,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 93,
+                        'line_nr' => 105,
                         'macro' => ''
                       }
                     },
@@ -9493,8 +12547,26 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '['
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'code',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => '['
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 105,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
@@ -9509,7 +12581,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 93,
+                        'line_nr' => 105,
                         'macro' => ''
                       }
                     },
@@ -9565,7 +12637,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 93,
+                        'line_nr' => 105,
                         'macro' => ''
                       }
                     },
@@ -9574,8 +12646,26 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ']'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'code',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => ']'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 105,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
@@ -9590,7 +12680,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 93,
+                        'line_nr' => 105,
                         'macro' => ''
                       }
                     },
@@ -9615,7 +12705,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'r'
+                      'text' => 'r:code'
                     },
                     {
                       'extra' => {
@@ -9653,7 +12743,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 32
+                  'number' => 44
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -9661,7 +12751,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 93,
+                'line_nr' => 105,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -9683,7 +12773,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 94,
+                        'line_nr' => 106,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -9770,7 +12860,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 94,
+                        'line_nr' => 106,
                         'macro' => ''
                       }
                     },
@@ -9779,15 +12869,33 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '['
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 't',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => '['
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 106,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'slanted',
+                      'cmdname' => 'r',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -9795,7 +12903,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 94,
+                        'line_nr' => 106,
                         'macro' => ''
                       }
                     },
@@ -9851,7 +12959,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 94,
+                        'line_nr' => 106,
                         'macro' => ''
                       }
                     },
@@ -9860,15 +12968,33 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ']'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 't',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => ']'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 106,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'slanted',
+                      'cmdname' => 'r',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -9876,7 +13002,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 94,
+                        'line_nr' => 106,
                         'macro' => ''
                       }
                     },
@@ -9901,7 +13027,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'slanted'
+                      'text' => 'r:t'
                     },
                     {
                       'extra' => {
@@ -9917,41 +13043,109 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
+              'cmdname' => 'deftypefnx',
+              'extra' => {
+                'def_command' => 'deftypefn',
+                'def_parsed_hash' => {
+                  'category' => {},
+                  'name' => {},
+                  'type' => {}
+                },
+                'index_entry' => {
+                  'command' => {},
+                  'content' => [
+                    {}
+                  ],
+                  'content_normalized' => [
+                    {}
+                  ],
+                  'in_code' => 1,
+                  'index_at_command' => 'deftypefnx',
+                  'index_ignore_chars' => {},
+                  'index_name' => 'fn',
+                  'index_type_command' => 'deftypefn',
+                  'node' => {},
+                  'number' => 45
+                },
+                'original_def_cmdname' => 'deftypefnx',
+                'spaces_before_argument' => ' '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 106,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'separators
+'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'paragraph'
+                }
+              ],
+              'parent' => {},
+              'type' => 'def_item'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'deftypefn'
+                    }
+                  ],
+                  'extra' => {
+                    'spaces_after_argument' => '
+'
+                  },
+                  'parent' => {},
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'end',
               'extra' => {
-                'def_command' => 'deftypefn',
-                'def_parsed_hash' => {
-                  'category' => {},
-                  'name' => {},
-                  'type' => {}
-                },
-                'index_entry' => {
-                  'command' => {},
-                  'content' => [
-                    {}
-                  ],
-                  'content_normalized' => [
-                    {}
-                  ],
-                  'in_code' => 1,
-                  'index_at_command' => 'deftypefnx',
-                  'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 33
-                },
-                'original_def_cmdname' => 'deftypefnx',
-                'spaces_before_argument' => ' '
+                'command_argument' => 'deftypefn',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'deftypefn'
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 94,
+                'line_nr' => 108,
                 'macro' => ''
-              },
-              'type' => 'def_line'
-            },
+              }
+            }
+          ],
+          'extra' => {
+            'end_command' => {},
+            'spaces_before_argument' => ' '
+          },
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 98,
+            'macro' => ''
+          }
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'cmdname' => 'deftypefn',
+          'contents' => [
             {
               'args' => [
                 {
@@ -9969,7 +13163,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 95,
+                        'line_nr' => 110,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -10025,7 +13219,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'int'
+                      'text' => 'i--nt'
                     },
                     {
                       'extra' => {
@@ -10056,34 +13250,17 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 95,
+                        'line_nr' => 110,
                         'macro' => ''
                       }
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => '['
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'code',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'typearg'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 95,
-                        'macro' => ''
-                      }
+                      'text' => '[',
+                      'type' => 'delimiter'
                     },
                     {
                       'extra' => {
@@ -10137,34 +13314,17 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 95,
+                        'line_nr' => 110,
                         'macro' => ''
                       }
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => ']'
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'code',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'typearg'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 95,
-                        'macro' => ''
-                      }
+                      'text' => ']',
+                      'type' => 'delimiter'
                     },
                     {
                       'extra' => {
@@ -10187,7 +13347,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'code'
+                      'text' => 'default'
                     },
                     {
                       'extra' => {
@@ -10200,10 +13360,9 @@ $result_trees{'definition_commands'} = {
                     }
                   ],
                   'parent' => {},
-                  'type' => 'line_arg'
+                  'type' => 'block_line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_parsed_hash' => {
@@ -10220,20 +13379,19 @@ $result_trees{'definition_commands'} = {
                     {}
                   ],
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefnx',
+                  'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 34
+                  'number' => 46
                 },
-                'original_def_cmdname' => 'deftypefnx',
-                'spaces_before_argument' => ' '
+                'original_def_cmdname' => 'deftypefn'
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 95,
+                'line_nr' => 110,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -10255,7 +13413,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 96,
+                        'line_nr' => 111,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -10306,35 +13464,20 @@ $result_trees{'definition_commands'} = {
                       'text' => '(',
                       'type' => 'delimiter'
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'typearg'
-                      },
-                      'parent' => {},
-                      'text' => 'int'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'f---oo'
+                              'text' => 'i--nt'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 'r',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -10342,42 +13485,32 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 96,
+                        'line_nr' => 111,
                         'macro' => ''
                       }
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => '['
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'slanted',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 96,
-                                'macro' => ''
-                              }
+                              'text' => 'f---oo'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 'var',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -10385,10 +13518,18 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 96,
+                        'line_nr' => 111,
                         'macro' => ''
                       }
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '[',
+                      'type' => 'delimiter'
+                    },
                     {
                       'extra' => {
                         'def_role' => 'delimiter'
@@ -10441,52 +13582,17 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 96,
+                        'line_nr' => 111,
                         'macro' => ''
                       }
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => ']'
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'slanted',
-                              'contents' => [],
-                              'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 96,
-                                'macro' => ''
-                              }
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'r',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 96,
-                        'macro' => ''
-                      }
+                      'text' => ']',
+                      'type' => 'delimiter'
                     },
                     {
                       'extra' => {
@@ -10509,7 +13615,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'r:slanted'
+                      'text' => 'r'
                     },
                     {
                       'extra' => {
@@ -10547,7 +13653,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 35
+                  'number' => 47
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -10555,7 +13661,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 96,
+                'line_nr' => 111,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -10577,7 +13683,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 97,
+                        'line_nr' => 112,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -10628,35 +13734,20 @@ $result_trees{'definition_commands'} = {
                       'text' => '(',
                       'type' => 'delimiter'
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'typearg'
-                      },
-                      'parent' => {},
-                      'text' => 'int'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'f---oo'
+                              'text' => 'i--nt'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 'slanted',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -10664,42 +13755,32 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 97,
+                        'line_nr' => 112,
                         'macro' => ''
                       }
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => '['
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'code',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 97,
-                                'macro' => ''
-                              }
+                              'text' => 'f---oo'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 'var',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -10707,10 +13788,18 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 97,
+                        'line_nr' => 112,
                         'macro' => ''
                       }
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '[',
+                      'type' => 'delimiter'
+                    },
                     {
                       'extra' => {
                         'def_role' => 'delimiter'
@@ -10763,52 +13852,17 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 97,
+                        'line_nr' => 112,
                         'macro' => ''
                       }
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => ']'
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'code',
-                              'contents' => [],
-                              'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 97,
-                                'macro' => ''
-                              }
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'r',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 97,
-                        'macro' => ''
-                      }
+                      'text' => ']',
+                      'type' => 'delimiter'
                     },
                     {
                       'extra' => {
@@ -10831,7 +13885,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'r:code'
+                      'text' => 'slanted'
                     },
                     {
                       'extra' => {
@@ -10869,7 +13923,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 36
+                  'number' => 48
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -10877,79 +13931,11 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 97,
+                'line_nr' => 112,
                 'macro' => ''
               },
               'type' => 'def_line'
             },
-            {
-              'contents' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'separators
-'
-                    }
-                  ],
-                  'parent' => {},
-                  'type' => 'paragraph'
-                }
-              ],
-              'parent' => {},
-              'type' => 'def_item'
-            },
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'deftypefn'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'end',
-              'extra' => {
-                'command_argument' => 'deftypefn',
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'deftypefn'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 99,
-                'macro' => ''
-              }
-            }
-          ],
-          'extra' => {
-            'end_command' => {},
-            'spaces_before_argument' => ' '
-          },
-          'parent' => {},
-          'source_info' => {
-            'file_name' => '',
-            'line_nr' => 92,
-            'macro' => ''
-          }
-        },
-        {
-          'parent' => {},
-          'text' => '
-',
-          'type' => 'empty_line'
-        },
-        {
-          'cmdname' => 'deftypefn',
-          'contents' => [
             {
               'args' => [
                 {
@@ -10967,7 +13953,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 101,
+                        'line_nr' => 113,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -11019,11 +14005,29 @@ $result_trees{'definition_commands'} = {
                       'type' => 'delimiter'
                     },
                     {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'i--nt'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'code',
+                      'contents' => [],
                       'extra' => {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'i--nt'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 113,
+                        'macro' => ''
+                      }
                     },
                     {
                       'extra' => {
@@ -11054,7 +14058,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 101,
+                        'line_nr' => 113,
                         'macro' => ''
                       }
                     },
@@ -11118,7 +14122,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 101,
+                        'line_nr' => 113,
                         'macro' => ''
                       }
                     },
@@ -11151,7 +14155,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'default'
+                      'text' => 'code'
                     },
                     {
                       'extra' => {
@@ -11164,9 +14168,10 @@ $result_trees{'definition_commands'} = {
                     }
                   ],
                   'parent' => {},
-                  'type' => 'block_line_arg'
+                  'type' => 'line_arg'
                 }
               ],
+              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_parsed_hash' => {
@@ -11183,19 +14188,20 @@ $result_trees{'definition_commands'} = {
                     {}
                   ],
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
+                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 37
+                  'number' => 49
                 },
-                'original_def_cmdname' => 'deftypefn'
+                'original_def_cmdname' => 'deftypefnx',
+                'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 101,
+                'line_nr' => 113,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -11217,7 +14223,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 102,
+                        'line_nr' => 114,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -11281,7 +14287,7 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -11289,7 +14295,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 102,
+                        'line_nr' => 114,
                         'macro' => ''
                       }
                     },
@@ -11322,7 +14328,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 102,
+                        'line_nr' => 114,
                         'macro' => ''
                       }
                     },
@@ -11386,7 +14392,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 102,
+                        'line_nr' => 114,
                         'macro' => ''
                       }
                     },
@@ -11419,7 +14425,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'r'
+                      'text' => 't'
                     },
                     {
                       'extra' => {
@@ -11457,7 +14463,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 38
+                  'number' => 50
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -11465,7 +14471,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 102,
+                'line_nr' => 114,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -11487,7 +14493,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 103,
+                        'line_nr' => 115,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -11543,15 +14549,33 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => 'i--nt'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'b',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'i--nt'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 115,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'slanted',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -11559,7 +14583,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 103,
+                        'line_nr' => 115,
                         'macro' => ''
                       }
                     },
@@ -11592,7 +14616,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 103,
+                        'line_nr' => 115,
                         'macro' => ''
                       }
                     },
@@ -11656,7 +14680,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 103,
+                        'line_nr' => 115,
                         'macro' => ''
                       }
                     },
@@ -11689,7 +14713,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'slanted'
+                      'text' => 't:b'
                     },
                     {
                       'extra' => {
@@ -11727,7 +14751,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 39
+                  'number' => 51
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -11735,7 +14759,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
+                'line_nr' => 115,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -11757,7 +14781,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 104,
+                        'line_nr' => 116,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -11813,23 +14837,41 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => 'i--nt'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'slanted',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'i--nt'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 116,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'code',
+                      'cmdname' => 'r',
                       'contents' => [],
                       'extra' => {
-                        'def_role' => 'typearg'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 104,
+                        'line_nr' => 116,
                         'macro' => ''
                       }
                     },
@@ -11862,7 +14904,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 104,
+                        'line_nr' => 116,
                         'macro' => ''
                       }
                     },
@@ -11926,7 +14968,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 104,
+                        'line_nr' => 116,
                         'macro' => ''
                       }
                     },
@@ -11959,7 +15001,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'code'
+                      'text' => 'r:slanted'
                     },
                     {
                       'extra' => {
@@ -11997,7 +15039,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 40
+                  'number' => 52
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -12005,7 +15047,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
+                'line_nr' => 116,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -12027,7 +15069,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 105,
+                        'line_nr' => 117,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -12095,12 +15137,12 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 'slanted',
+                              'cmdname' => 'code',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 105,
+                                'line_nr' => 117,
                                 'macro' => ''
                               }
                             }
@@ -12117,7 +15159,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 105,
+                        'line_nr' => 117,
                         'macro' => ''
                       }
                     },
@@ -12150,7 +15192,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 105,
+                        'line_nr' => 117,
                         'macro' => ''
                       }
                     },
@@ -12214,7 +15256,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 105,
+                        'line_nr' => 117,
                         'macro' => ''
                       }
                     },
@@ -12247,7 +15289,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'r:slanted'
+                      'text' => 'r:code'
                     },
                     {
                       'extra' => {
@@ -12285,7 +15327,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 41
+                  'number' => 53
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -12293,7 +15335,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 105,
+                'line_nr' => 117,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -12315,7 +15357,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 106,
+                        'line_nr' => 118,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -12383,12 +15425,12 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 'code',
+                              'cmdname' => 't',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 106,
+                                'line_nr' => 118,
                                 'macro' => ''
                               }
                             }
@@ -12405,7 +15447,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 106,
+                        'line_nr' => 118,
                         'macro' => ''
                       }
                     },
@@ -12438,7 +15480,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 106,
+                        'line_nr' => 118,
                         'macro' => ''
                       }
                     },
@@ -12502,7 +15544,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 106,
+                        'line_nr' => 118,
                         'macro' => ''
                       }
                     },
@@ -12535,7 +15577,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'r:code'
+                      'text' => 'r:t'
                     },
                     {
                       'extra' => {
@@ -12573,7 +15615,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 42
+                  'number' => 54
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -12581,7 +15623,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 106,
+                'line_nr' => 118,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -12629,7 +15671,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 108,
+                'line_nr' => 120,
                 'macro' => ''
               }
             }
@@ -12641,7 +15683,7 @@ $result_trees{'definition_commands'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 101,
+            'line_nr' => 110,
             'macro' => ''
           }
         },
@@ -12938,8 +15980,6 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[7]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[7];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0];
@@ -12947,14 +15987,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[12]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[12];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[12]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[13]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[14]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[14];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[14]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0];
@@ -13010,13 +16046,133 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'contents'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[13]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[14];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[14]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[15]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[16]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[17]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[18]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[12]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[12];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[12]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[13]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[14];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[14]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[15]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[16]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[17]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[18]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[12]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[12];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[12]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[13]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[14];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[14]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[15]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[16]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[17]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[18]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'parent'} = 
$result_trees{'definition_commands'}{'contents'}[4];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[8]{'parent'} = 
$result_trees{'definition_commands'}{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -13117,8 +16273,6 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'args'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'args'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'args'}[0];
@@ -13175,13 +16329,76 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[7
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[7]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[7]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'contents'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'extra'}{'end_command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'extra'}{'end_command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'parent'} = 
$result_trees{'definition_commands'}{'contents'}[4];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'args'}[0];
@@ -14083,8 +17300,6 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[9]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[9];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[10]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[10];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0];
@@ -14095,8 +17310,6 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[15]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[15]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[15];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[15]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[16]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[16]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[16];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[16]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0];
@@ -14156,13 +17369,142 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'contents'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[10]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[10];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[12]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[13]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[14]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[15]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[15]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[15];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[15]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[16]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[16]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[16];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[16]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[17]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[18]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[19]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[20]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[10]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[10];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[12]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[13]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[14]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[15]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[15]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[15];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[15]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[16]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[16]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[16];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[16]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[17]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[18]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[19]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[20]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'extra'}{'end_command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[10]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[10];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[12]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[13]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[14]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[15]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[15]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[15];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[15]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[16]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[16]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[16];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[16]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[17]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[18]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[19]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[20]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'extra'}{'end_command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[35]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -14319,8 +17661,6 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'args'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'args'}[0]{'contents'}[7]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'args'}[0]{'contents'}[7];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'args'}[0];
@@ -14389,13 +17729,130 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'contents'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[12]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[13]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[14]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[15]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[15]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[15];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[15]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[16]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[17]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[18]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[19]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[20]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[12]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[13]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[14]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[15]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[15]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[15];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[15]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[16]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[17]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[18]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[19]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[20]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'extra'}{'end_command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[12]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[13]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[14]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[15]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[15]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[15];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[15]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[16]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[17]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[18]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[19]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[20]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'extra'}{'end_command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[37]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 $result_trees{'definition_commands'}{'contents'}[4]{'parent'} = 
$result_trees{'definition_commands'};
@@ -14424,8 +17881,11 @@ deffn r slanted for @var{a---rg1} and @var{a--rg2}
 @defspecx foobar (var @r{[}from to @r{[}inc@r{]]}) r
 @defspecx foobar (var @slanted{[}from to @slanted{[}inc@slanted{]]}) slanted
 @defspecx foobar (var @code{[}from to @code{[}inc@code{]]}) code
+@defspecx foobar (var @t{[}from to @t{[}inc@t{]]}) t
+@defspecx foobar (var @t{@b{[}}from to @t{@b{[}}inc@t{@b{]]}}) t:b
 @defspecx foobar (var @r{@slanted{[}}from to 
@r{@slanted{[}}inc@r{@slanted{]]}}) r:slanted
 @defspecx foobar (var @r{@code{[}}from to @r{@code{[}}inc@r{@code{]]}}) r:code
+@defspecx foobar (var @r{@t{[}}from to @r{@t{[}}inc@r{@t{]]}}) r:t
 separators
 @end defspec
 
@@ -14434,9 +17894,12 @@ separators
 @defspecx foobar @r{va---riable} r
 @defspecx foobar @slanted{va---riable} slanted
 @defspecx foobar @code{va---riable} code
+@defspecx foobar @t{va---riable} t
+@defspecx foobar @t{@b{va---riable}} t:b
 @defspecx foobar @r{@var{va---riable}} r:var
 @defspecx foobar @r{@slanted{va---riable}} r:slanted
 @defspecx foobar @r{@code{va---riable}} r:code
+@defspecx foobar @r{@t{va---riable}} r:t
 name
 @end defspec
 
@@ -14494,8 +17957,11 @@ In deffn with code and var used
 @deftypefnx {Library Function} int foobar  (int @var{f---oo}@r{[}, float 
@var{b--ar}@r{]}) r
 @deftypefnx {Library Function} int foobar  (int @var{f---oo}@slanted{[}, float 
@var{b--ar}@slanted{]}) slanted
 @deftypefnx {Library Function} int foobar  (int @var{f---oo}@code{[}, float 
@var{b--ar}@code{]}) code
+@deftypefnx {Library Function} int foobar  (int @var{f---oo}@t{[}, float 
@var{b--ar}@t{]}) t
+@deftypefnx {Library Function} int foobar  (int @var{f---oo}@t{@b{[}}, float 
@var{b--ar}@t{@b{]}}) t:b
 @deftypefnx {Library Function} int foobar  (int @var{f---oo}@r{@slanted{[}}, 
float @var{b--ar}@r{@slanted{]}}) r:slanted
 @deftypefnx {Library Function} int foobar  (int @var{f---oo}@r{@code{[}}, 
float @var{b--ar}@r{@code{]}}) r:code
+@deftypefnx {Library Function} int foobar  (int @var{f---oo}@r{@t{[}}, float 
@var{b--ar}@r{@t{]}}) r:t
 separators
 @end deftypefn
 
@@ -14503,8 +17969,11 @@ separators
 @deftypefnx {Library Function} int foobar  (@r{i--nt} @var{f---oo}[, float 
@var{b--ar}]) r
 @deftypefnx {Library Function} int foobar  (@slanted{i--nt} @var{f---oo}[, 
float @var{b--ar}]) slanted
 @deftypefnx {Library Function} int foobar  (@code{i--nt} @var{f---oo}[, float 
@var{b--ar}]) code
+@deftypefnx {Library Function} int foobar  (@t{i--nt} @var{f---oo}[, float 
@var{b--ar}]) t
+@deftypefnx {Library Function} int foobar  (@t{@b{i--nt}} @var{f---oo}[, float 
@var{b--ar}]) t:b
 @deftypefnx {Library Function} int foobar  (@r{@slanted{i--nt}} @var{f---oo}[, 
float @var{b--ar}]) r:slanted
 @deftypefnx {Library Function} int foobar  (@r{@code{i--nt}} @var{f---oo}[, 
float @var{b--ar}]) r:code
+@deftypefnx {Library Function} int foobar  (@r{@t{i--nt}} @var{f---oo}[, float 
@var{b--ar}]) r:t
 name
 @end deftypefn
 
@@ -14531,8 +18000,11 @@ Special Form: foobar (var [from to [inc]]) default
 Special Form: foobar (var [from to [inc]]) r
 Special Form: foobar (var [from to [inc]]) slanted
 Special Form: foobar (var [from to [inc]]) code
+Special Form: foobar (var [from to [inc]]) t
+Special Form: foobar (var [from to [inc]]) t:b
 Special Form: foobar (var [from to [inc]]) r:slanted
 Special Form: foobar (var [from to [inc]]) r:code
+Special Form: foobar (var [from to [inc]]) r:t
 separators
 
 Special Form: foobar va---riable default
@@ -14540,9 +18012,12 @@ Special Form: foobar va---riable var
 Special Form: foobar va---riable r
 Special Form: foobar va---riable slanted
 Special Form: foobar va---riable code
+Special Form: foobar va---riable t
+Special Form: foobar va---riable t:b
 Special Form: foobar va---riable r:var
 Special Form: foobar va---riable r:slanted
 Special Form: foobar va---riable r:code
+Special Form: foobar va---riable r:t
 name
 
 Request: .ft [font]
@@ -14587,16 +18062,22 @@ Library Function: int foobar (int f---oo[, float 
b--ar]) default
 Library Function: int foobar (int f---oo[, float b--ar]) r
 Library Function: int foobar (int f---oo[, float b--ar]) slanted
 Library Function: int foobar (int f---oo[, float b--ar]) code
+Library Function: int foobar (int f---oo[, float b--ar]) t
+Library Function: int foobar (int f---oo[, float b--ar]) t:b
 Library Function: int foobar (int f---oo[, float b--ar]) r:slanted
 Library Function: int foobar (int f---oo[, float b--ar]) r:code
+Library Function: int foobar (int f---oo[, float b--ar]) r:t
 separators
 
 Library Function: int foobar (i--nt f---oo[, float b--ar]) default
 Library Function: int foobar (i--nt f---oo[, float b--ar]) r
 Library Function: int foobar (i--nt f---oo[, float b--ar]) slanted
 Library Function: int foobar (i--nt f---oo[, float b--ar]) code
+Library Function: int foobar (i--nt f---oo[, float b--ar]) t
+Library Function: int foobar (i--nt f---oo[, float b--ar]) t:b
 Library Function: int foobar (i--nt f---oo[, float b--ar]) r:slanted
 Library Function: int foobar (i--nt f---oo[, float b--ar]) r:code
+Library Function: int foobar (i--nt f---oo[, float b--ar]) r:t
 name
 
 ';
@@ -14740,6 +18221,18 @@ $result_indices_sort_strings{'definition_commands'} = {
     'foobar',
     'foobar',
     'foobar',
+    'foobar',
+    'foobar',
+    'foobar',
+    'foobar',
+    'foobar',
+    'foobar',
+    'foobar',
+    'foobar',
+    'foobar',
+    'foobar',
+    'foobar',
+    'foobar',
     'name'
   ],
   'vr' => [
@@ -14769,8 +18262,11 @@ 
$result_converted{'plaintext'}->{'definition_commands'} = 'top section
  -- Special Form: foobar (var [from to [inc]]) r
  -- Special Form: foobar (var [from to [inc]]) slanted
  -- Special Form: foobar (var [from to [inc]]) code
+ -- Special Form: foobar (var [from to [inc]]) t
+ -- Special Form: foobar (var [from to [inc]]) t:b
  -- Special Form: foobar (var [from to [inc]]) r:slanted
  -- Special Form: foobar (var [from to [inc]]) r:code
+ -- Special Form: foobar (var [from to [inc]]) r:t
      separators
 
  -- Special Form: foobar va---riable default
@@ -14778,9 +18274,12 @@ 
$result_converted{'plaintext'}->{'definition_commands'} = 'top section
  -- Special Form: foobar va—riable r
  -- Special Form: foobar va—riable slanted
  -- Special Form: foobar va---riable code
+ -- Special Form: foobar va---riable t
+ -- Special Form: foobar va—riable t:b
  -- Special Form: foobar VA—RIABLE r:var
  -- Special Form: foobar va—riable r:slanted
  -- Special Form: foobar va---riable r:code
+ -- Special Form: foobar va---riable r:t
      name
 
  -- Request: .ft [font]
@@ -14826,16 +18325,22 @@ produces:
  -- Library Function: int foobar (int F---OO[, float B--AR]) r
  -- Library Function: int foobar (int F---OO[, float B--AR]) slanted
  -- Library Function: int foobar (int F---OO[, float B--AR]) code
+ -- Library Function: int foobar (int F---OO[, float B--AR]) t
+ -- Library Function: int foobar (int F---OO[, float B--AR]) t:b
  -- Library Function: int foobar (int F---OO[, float B--AR]) r:slanted
  -- Library Function: int foobar (int F---OO[, float B--AR]) r:code
+ -- Library Function: int foobar (int F---OO[, float B--AR]) r:t
      separators
 
  -- Library Function: int foobar (i--nt F---OO[, float B--AR]) default
  -- Library Function: int foobar (i–nt F---OO[, float B--AR]) r
  -- Library Function: int foobar (i–nt F---OO[, float B--AR]) slanted
  -- Library Function: int foobar (i--nt F---OO[, float B--AR]) code
+ -- Library Function: int foobar (i--nt F---OO[, float B--AR]) t
+ -- Library Function: int foobar (i–nt F---OO[, float B--AR]) t:b
  -- Library Function: int foobar (i–nt F---OO[, float B--AR]) r:slanted
  -- Library Function: int foobar (i--nt F---OO[, float B--AR]) r:code
+ -- Library Function: int foobar (i--nt F---OO[, float B--AR]) r:t
      name
 
 ';
@@ -14880,20 +18385,26 @@ 
$result_converted{'html_text'}->{'definition_commands'} = '
 <dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-1"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph">(var <span 
class="r">[</span>from to <span class="r">[</span>inc<span class="r">]]</span>) 
r</em><a class="copiable-link" href=\'#index-foobar-1\'> &para;</a></span></dt>
 <dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-2"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph">(var <i 
class="slanted">[</i>from to <i class="slanted">[</i>inc<i 
class="slanted">]]</i>) slanted</em><a class="copiable-link" 
href=\'#index-foobar-2\'> &para;</a></span></dt>
 <dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-3"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph">(var <code 
class="code">[</code>from to <code class="code">[</code>inc<code 
class="code">]]</code>) code</em><a class="copiable-link" 
href=\'#index-foobar-3\'> &para;</a></span></dt>
-<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-4"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph">(var <span 
class="r"><i class="slanted">[</i></span>from to <span class="r"><i 
class="slanted">[</i></span>inc<span class="r"><i 
class="slanted">]]</i></span>) r:slanted</em><a class="copiable-link" 
href=\'#index-foobar-4\'> &para;</a></span></dt>
-<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-5"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph">(var <span 
class="r"><code class="code">[</code></span>from to <span class="r"><code 
class="code">[</code></span>inc<span class="r"><code 
class="code">]]</code></span>) r:code</em><a class="copiable-link" 
href=\'#index-foobar-5\'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-4"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph">(var <code 
class="t">[</code>from to <code class="t">[</code>inc<code class="t">]]</code>) 
t</em><a class="copiable-link" href=\'#index-foobar-4\'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-5"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph">(var <code 
class="t"><b class="b">[</b></code>from to <code class="t"><b 
class="b">[</b></code>inc<code class="t"><b class="b">]]</b></code>) t:b</em><a 
class="copiable-link" href=\'#index-foobar-5\'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-6"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph">(var <span 
class="r"><i class="slanted">[</i></span>from to <span class="r"><i 
class="slanted">[</i></span>inc<span class="r"><i 
class="slanted">]]</i></span>) r:slanted</em><a class="copiable-link" 
href=\'#index-foobar-6\'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-7"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph">(var <span 
class="r"><code class="code">[</code></span>from to <span class="r"><code 
class="code">[</code></span>inc<span class="r"><code 
class="code">]]</code></span>) r:code</em><a class="copiable-link" 
href=\'#index-foobar-7\'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-8"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph">(var <span 
class="r"><code class="t">[</code></span>from to <span class="r"><code 
class="t">[</code></span>inc<span class="r"><code class="t">]]</code></span>) 
r:t</em><a class="copiable-link" href=\'#index-foobar-8\'> 
&para;</a></span></dt>
 <dd><p>separators
 </p></dd></dl>
 
 <dl class="first-deffn first-defspec-alias-first-deffn">
-<dt class="deffn defspec-alias-deffn" id="index-foobar-6"><span 
class="category-def">Special Form: </span><span><strong 
class="strong">foobar</strong> <em class="emph">va---riable default</em><a 
class="copiable-link" href=\'#index-foobar-6\'> &para;</a></span></dt>
-<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-7"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><var 
class="var">va---riable</var> var</em><a class="copiable-link" 
href=\'#index-foobar-7\'> &para;</a></span></dt>
-<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-8"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><span 
class="r">va&mdash;riable</span> r</em><a class="copiable-link" 
href=\'#index-foobar-8\'> &para;</a></span></dt>
-<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-9"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><i 
class="slanted">va&mdash;riable</i> slanted</em><a class="copiable-link" 
href=\'#index-foobar-9\'> &para;</a></span></dt>
-<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-10"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><code 
class="code">va---riable</code> code</em><a class="copiable-link" 
href=\'#index-foobar-10\'> &para;</a></span></dt>
-<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-11"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><span 
class="r"><var class="var">va&mdash;riable</var></span> r:var</em><a 
class="copiable-link" href=\'#index-foobar-11\'> &para;</a></span></dt>
-<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-12"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><span 
class="r"><i class="slanted">va&mdash;riable</i></span> r:slanted</em><a 
class="copiable-link" href=\'#index-foobar-12\'> &para;</a></span></dt>
-<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-13"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><span 
class="r"><code class="code">va---riable</code></span> r:code</em><a 
class="copiable-link" href=\'#index-foobar-13\'> &para;</a></span></dt>
+<dt class="deffn defspec-alias-deffn" id="index-foobar-9"><span 
class="category-def">Special Form: </span><span><strong 
class="strong">foobar</strong> <em class="emph">va---riable default</em><a 
class="copiable-link" href=\'#index-foobar-9\'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-10"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><var 
class="var">va---riable</var> var</em><a class="copiable-link" 
href=\'#index-foobar-10\'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-11"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><span 
class="r">va&mdash;riable</span> r</em><a class="copiable-link" 
href=\'#index-foobar-11\'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-12"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><i 
class="slanted">va&mdash;riable</i> slanted</em><a class="copiable-link" 
href=\'#index-foobar-12\'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-13"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><code 
class="code">va---riable</code> code</em><a class="copiable-link" 
href=\'#index-foobar-13\'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-14"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><code 
class="t">va---riable</code> t</em><a class="copiable-link" 
href=\'#index-foobar-14\'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-15"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><code 
class="t"><b class="b">va&mdash;riable</b></code> t:b</em><a 
class="copiable-link" href=\'#index-foobar-15\'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-16"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><span 
class="r"><var class="var">va&mdash;riable</var></span> r:var</em><a 
class="copiable-link" href=\'#index-foobar-16\'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-17"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><span 
class="r"><i class="slanted">va&mdash;riable</i></span> r:slanted</em><a 
class="copiable-link" href=\'#index-foobar-17\'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-18"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><span 
class="r"><code class="code">va---riable</code></span> r:code</em><a 
class="copiable-link" href=\'#index-foobar-18\'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-19"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><span 
class="r"><code class="t">va---riable</code></span> r:t</em><a 
class="copiable-link" href=\'#index-foobar-19\'> &para;</a></span></dt>
 <dd><p>name
 </p></dd></dl>
 
@@ -14909,18 +18420,18 @@ to <var class="var">font</var> (one-character 
name&nbsp;<var class="var">f</var>
 </p></dd></dl>
 
 <dl class="first-deffn first-defspec-alias-first-deffn">
-<dt class="deffn defspec-alias-deffn" id="index-foobar-14"><span 
class="category-def">Special Form: </span><span><strong 
class="strong">foobar</strong> <em class="emph">[ <span class="r">[</span> <i 
class="slanted">[</i> <code class="code">[</code> <code class="t">[</code> 
<span class="r"><i class="slanted">[</i></span> <span class="r"><code 
class="code">[</code></span> <span class="r"><code class="code"><i 
class="slanted">[</i></code></span> <span class="r"><code 
class="t">[</code></spa [...]
-<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-15"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph">[] <span 
class="r">[]</span> <i class="slanted">[]</i> <code class="code">[]</code> 
<code class="t">[]</code> <span class="r"><i class="slanted">[]</i></span> 
<span class="r"><code class="code">[]</code></span> <span class="r"><code 
class="code"><i class="slanted">[]</i></code></span></em><a class="copiab [...]
+<dt class="deffn defspec-alias-deffn" id="index-foobar-20"><span 
class="category-def">Special Form: </span><span><strong 
class="strong">foobar</strong> <em class="emph">[ <span class="r">[</span> <i 
class="slanted">[</i> <code class="code">[</code> <code class="t">[</code> 
<span class="r"><i class="slanted">[</i></span> <span class="r"><code 
class="code">[</code></span> <span class="r"><code class="code"><i 
class="slanted">[</i></code></span> <span class="r"><code 
class="t">[</code></spa [...]
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-21"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph">[] <span 
class="r">[]</span> <i class="slanted">[]</i> <code class="code">[]</code> 
<code class="t">[]</code> <span class="r"><i class="slanted">[]</i></span> 
<span class="r"><code class="code">[]</code></span> <span class="r"><code 
class="code"><i class="slanted">[]</i></code></span></em><a class="copiab [...]
 <dd><p>test formatting of separators
 </p></dd></dl>
 
 <dl class="first-deftypefn">
-<dt class="deftypefn" id="index-foobar-16"><span class="category-def">Library 
Function: </span><span><em class="emph">int</em> <strong 
class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var>, float <var class="var">b--ar</var>)</em><a 
class="copiable-link" href=\'#index-foobar-16\'> &para;</a></span></dt>
+<dt class="deftypefn" id="index-foobar-22"><span class="category-def">Library 
Function: </span><span><em class="emph">int</em> <strong 
class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var>, float <var class="var">b--ar</var>)</em><a 
class="copiable-link" href=\'#index-foobar-22\'> &para;</a></span></dt>
 <dd><p>&hellip; with var for <var class="var">f&mdash;oo</var> and <var 
class="var">b&ndash;ar</var>
 </p></dd></dl>
 
 <dl class="first-deftypefn">
-<dt class="deftypefn" id="index-foobar-17"><span class="category-def">Library 
Function: </span><span><em class="emph">int</em> <strong 
class="strong">foobar</strong> <em class="emph">(int <span class="r"><i 
class="slanted">f&mdash;oo</i></span>, float <span class="r"><i 
class="slanted">b&ndash;ar</i></span>)</em><a class="copiable-link" 
href=\'#index-foobar-17\'> &para;</a></span></dt>
+<dt class="deftypefn" id="index-foobar-23"><span class="category-def">Library 
Function: </span><span><em class="emph">int</em> <strong 
class="strong">foobar</strong> <em class="emph">(int <span class="r"><i 
class="slanted">f&mdash;oo</i></span>, float <span class="r"><i 
class="slanted">b&ndash;ar</i></span>)</em><a class="copiable-link" 
href=\'#index-foobar-23\'> &para;</a></span></dt>
 <dd><p>&hellip; with r slanted for <var class="var">f&mdash;oo</var> and <var 
class="var">b&ndash;ar</var>
 </p></dd></dl>
 
@@ -14937,7 +18448,7 @@ to <var class="var">font</var> (one-character 
name&nbsp;<var class="var">f</var>
 
 <blockquote class="quotation">
 <dl class="first-deftypefn">
-<dt class="deftypefn" id="index-foobar-18"><span class="category-def">Library 
Function: </span><span><em class="emph">int</em> <strong 
class="strong">foobar</strong> <em class="emph">(int <var 
class="var">foo</var>, float <var class="var">bar</var>)</em><a 
class="copiable-link" href=\'#index-foobar-18\'> &para;</a></span></dt>
+<dt class="deftypefn" id="index-foobar-24"><span class="category-def">Library 
Function: </span><span><em class="emph">int</em> <strong 
class="strong">foobar</strong> <em class="emph">(int <var 
class="var">foo</var>, float <var class="var">bar</var>)</em><a 
class="copiable-link" href=\'#index-foobar-24\'> &para;</a></span></dt>
 <dd><p>&hellip; for <var class="var">foo</var> and <var class="var">bar</var>
 </p></dd></dl>
 </blockquote>
@@ -14958,22 +18469,28 @@ to <var class="var">font</var> (one-character 
name&nbsp;<var class="var">f</var>
 </p></dd></dl>
 
 <dl class="first-deftypefn">
-<dt class="deftypefn" id="index-foobar-19"><span class="category-def">Library 
Function: </span><span><em class="emph">int</em> <strong 
class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) default</em><a 
class="copiable-link" href=\'#index-foobar-19\'> &para;</a></span></dt>
-<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-20"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var><span class="r">[</span>, float <var 
class="var">b--ar</var><span class="r">]</span>) r</em><a class="copiable-link" 
href=\'#index-foobar-20\'> &para;</a></span></dt>
-<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-21"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var><i class="slanted">[</i>, float <var 
class="var">b--ar</var><i class="slanted">]</i>) slanted</em><a 
class="copiable-link" href=\'#index-foobar-21\'> &para;</a></span></dt>
-<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-22"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var><code class="code">[</code>, float <var 
class="var">b--ar</var><code class="code">]</code>) code</em><a 
class="copiable-link" href=\'#index-foobar-22\'> &para;</a></span></dt>
-<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-23"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var><span class="r"><i class="slanted">[</i></span>, float 
<var class="var">b--ar</var><span class="r"><i class="slanted">]</i></span>) 
r:slanted</em><a class="copiable-link" href=\'#index-foobar-23\'> 
&para;</a></span></dt>
-<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-24"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var><span class="r"><code class="code">[</code></span>, 
float <var class="var">b--ar</var><span class="r"><code 
class="code">]</code></span>) r:code</em><a class="copiable-link" 
href=\'#index-foobar-24\'> &para;</a></span></dt>
+<dt class="deftypefn" id="index-foobar-25"><span class="category-def">Library 
Function: </span><span><em class="emph">int</em> <strong 
class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) default</em><a 
class="copiable-link" href=\'#index-foobar-25\'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-26"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var><span class="r">[</span>, float <var 
class="var">b--ar</var><span class="r">]</span>) r</em><a class="copiable-link" 
href=\'#index-foobar-26\'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-27"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var><i class="slanted">[</i>, float <var 
class="var">b--ar</var><i class="slanted">]</i>) slanted</em><a 
class="copiable-link" href=\'#index-foobar-27\'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-28"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var><code class="code">[</code>, float <var 
class="var">b--ar</var><code class="code">]</code>) code</em><a 
class="copiable-link" href=\'#index-foobar-28\'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-29"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var><code class="t">[</code>, float <var 
class="var">b--ar</var><code class="t">]</code>) t</em><a class="copiable-link" 
href=\'#index-foobar-29\'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-30"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var><code class="t"><b class="b">[</b></code>, float <var 
class="var">b--ar</var><code class="t"><b class="b">]</b></code>) t:b</em><a 
class="copiable-link" href=\'#index-foobar-30\'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-31"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var><span class="r"><i class="slanted">[</i></span>, float 
<var class="var">b--ar</var><span class="r"><i class="slanted">]</i></span>) 
r:slanted</em><a class="copiable-link" href=\'#index-foobar-31\'> 
&para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-32"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var><span class="r"><code class="code">[</code></span>, 
float <var class="var">b--ar</var><span class="r"><code 
class="code">]</code></span>) r:code</em><a class="copiable-link" 
href=\'#index-foobar-32\'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-33"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var><span class="r"><code class="t">[</code></span>, float 
<var class="var">b--ar</var><span class="r"><code class="t">]</code></span>) 
r:t</em><a class="copiable-link" href=\'#index-foobar-33\'> 
&para;</a></span></dt>
 <dd><p>separators
 </p></dd></dl>
 
 <dl class="first-deftypefn">
-<dt class="deftypefn" id="index-foobar-25"><span class="category-def">Library 
Function: </span><span><em class="emph">int</em> <strong 
class="strong">foobar</strong> <em class="emph">(i--nt <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) default</em><a 
class="copiable-link" href=\'#index-foobar-25\'> &para;</a></span></dt>
-<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-26"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(<span 
class="r">i&ndash;nt</span> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) r</em><a class="copiable-link" 
href=\'#index-foobar-26\'> &para;</a></span></dt>
-<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-27"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(<i 
class="slanted">i&ndash;nt</i> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) slanted</em><a class="copiable-link" 
href=\'#index-foobar-27\'> &para;</a></span></dt>
-<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-28"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(<code 
class="code">i--nt</code> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) code</em><a class="copiable-link" 
href=\'#index-foobar-28\'> &para;</a></span></dt>
-<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-29"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(<span class="r"><i 
class="slanted">i&ndash;nt</i></span> <var class="var">f---oo</var>[, float 
<var class="var">b--ar</var>]) r:slanted</em><a class="copiable-link" 
href=\'#index-foobar-29\'> &para;</a></span></dt>
-<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-30"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(<span class="r"><code 
class="code">i--nt</code></span> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) r:code</em><a class="copiable-link" 
href=\'#index-foobar-30\'> &para;</a></span></dt>
+<dt class="deftypefn" id="index-foobar-34"><span class="category-def">Library 
Function: </span><span><em class="emph">int</em> <strong 
class="strong">foobar</strong> <em class="emph">(i--nt <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) default</em><a 
class="copiable-link" href=\'#index-foobar-34\'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-35"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(<span 
class="r">i&ndash;nt</span> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) r</em><a class="copiable-link" 
href=\'#index-foobar-35\'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-36"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(<i 
class="slanted">i&ndash;nt</i> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) slanted</em><a class="copiable-link" 
href=\'#index-foobar-36\'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-37"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(<code 
class="code">i--nt</code> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) code</em><a class="copiable-link" 
href=\'#index-foobar-37\'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-38"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(<code 
class="t">i--nt</code> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) t</em><a class="copiable-link" 
href=\'#index-foobar-38\'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-39"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(<code class="t"><b 
class="b">i&ndash;nt</b></code> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) t:b</em><a class="copiable-link" 
href=\'#index-foobar-39\'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-40"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(<span class="r"><i 
class="slanted">i&ndash;nt</i></span> <var class="var">f---oo</var>[, float 
<var class="var">b--ar</var>]) r:slanted</em><a class="copiable-link" 
href=\'#index-foobar-40\'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-41"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(<span class="r"><code 
class="code">i--nt</code></span> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) r:code</em><a class="copiable-link" 
href=\'#index-foobar-41\'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-42"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(<span class="r"><code 
class="t">i--nt</code></span> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) r:t</em><a class="copiable-link" 
href=\'#index-foobar-42\'> &para;</a></span></dt>
 <dd><p>name
 </p></dd></dl>
 
@@ -15007,42 +18524,48 @@ $result_converted{'xml'}->{'definition_commands'} = 
'<setfilename file="definiti
 <defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="5">foobar</indexterm><defcategory automatic="on" bracketed="on">Special 
Form</defcategory> <deffunction>foobar</deffunction> 
<defdelimiter>(</defdelimiter><defparam>var</defparam> 
<defparam><r>[</r></defparam><defparam>from</defparam> <defparam>to</defparam> 
<defparam><r>[</r></defparam><defparam>inc</defparam><defparam><r>]]</r></defparam><defdelimiter>)</defdelimiter>
 <defparam>r</defparam></definitionterm></defspecx>
 <defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="6">foobar</indexterm><defcategory automatic="on" bracketed="on">Special 
Form</defcategory> <deffunction>foobar</deffunction> 
<defdelimiter>(</defdelimiter><defparam>var</defparam> 
<defparam><slanted>[</slanted></defparam><defparam>from</defparam> 
<defparam>to</defparam> 
<defparam><slanted>[</slanted></defparam><defparam>inc</defparam><defparam><slanted>]]</slanted></defparam><defdelimiter>)</defdelimiter>
 <defparam>slante [...]
 <defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="7">foobar</indexterm><defcategory automatic="on" bracketed="on">Special 
Form</defcategory> <deffunction>foobar</deffunction> 
<defdelimiter>(</defdelimiter><defparam>var</defparam> 
<defparam><code>[</code></defparam><defparam>from</defparam> 
<defparam>to</defparam> 
<defparam><code>[</code></defparam><defparam>inc</defparam><defparam><code>]]</code></defparam><defdelimiter>)</defdelimiter>
 <defparam>code</defparam></definit [...]
-<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="8">foobar</indexterm><defcategory automatic="on" bracketed="on">Special 
Form</defcategory> <deffunction>foobar</deffunction> 
<defdelimiter>(</defdelimiter><defparam>var</defparam> 
<defparam><r><slanted>[</slanted></r></defparam><defparam>from</defparam> 
<defparam>to</defparam> 
<defparam><r><slanted>[</slanted></r></defparam><defparam>inc</defparam><defparam><r><slanted>]]</slanted></r></defparam><defdelimiter>)</defdelimi
 [...]
-<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="9">foobar</indexterm><defcategory automatic="on" bracketed="on">Special 
Form</defcategory> <deffunction>foobar</deffunction> 
<defdelimiter>(</defdelimiter><defparam>var</defparam> 
<defparam><r><code>[</code></r></defparam><defparam>from</defparam> 
<defparam>to</defparam> 
<defparam><r><code>[</code></r></defparam><defparam>inc</defparam><defparam><r><code>]]</code></r></defparam><defdelimiter>)</defdelimiter>
 <defparam>r:c [...]
+<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="8">foobar</indexterm><defcategory automatic="on" bracketed="on">Special 
Form</defcategory> <deffunction>foobar</deffunction> 
<defdelimiter>(</defdelimiter><defparam>var</defparam> 
<defparam><t>[</t></defparam><defparam>from</defparam> <defparam>to</defparam> 
<defparam><t>[</t></defparam><defparam>inc</defparam><defparam><t>]]</t></defparam><defdelimiter>)</defdelimiter>
 <defparam>t</defparam></definitionterm></defspecx>
+<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="9">foobar</indexterm><defcategory automatic="on" bracketed="on">Special 
Form</defcategory> <deffunction>foobar</deffunction> 
<defdelimiter>(</defdelimiter><defparam>var</defparam> 
<defparam><t><b>[</b></t></defparam><defparam>from</defparam> 
<defparam>to</defparam> 
<defparam><t><b>[</b></t></defparam><defparam>inc</defparam><defparam><t><b>]]</b></t></defparam><defdelimiter>)</defdelimiter>
 <defparam>t:b</defparam></defin [...]
+<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="10">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defdelimiter>(</defdelimiter><defparam>var</defparam> 
<defparam><r><slanted>[</slanted></r></defparam><defparam>from</defparam> 
<defparam>to</defparam> 
<defparam><r><slanted>[</slanted></r></defparam><defparam>inc</defparam><defparam><r><slanted>]]</slanted></r></defparam><defdelimiter>)</defdelim
 [...]
+<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="11">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defdelimiter>(</defdelimiter><defparam>var</defparam> 
<defparam><r><code>[</code></r></defparam><defparam>from</defparam> 
<defparam>to</defparam> 
<defparam><r><code>[</code></r></defparam><defparam>inc</defparam><defparam><r><code>]]</code></r></defparam><defdelimiter>)</defdelimiter>
 <defparam>r: [...]
+<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="12">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defdelimiter>(</defdelimiter><defparam>var</defparam> 
<defparam><r><t>[</t></r></defparam><defparam>from</defparam> 
<defparam>to</defparam> 
<defparam><r><t>[</t></r></defparam><defparam>inc</defparam><defparam><r><t>]]</t></r></defparam><defdelimiter>)</defdelimiter>
 <defparam>r:t</defparam></defi [...]
 <definitionitem><para>separators
 </para></definitionitem></defspec>
 
-<defspec spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="10">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam>va---riable</defparam> <defparam>default</defparam></definitionterm>
-<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="11">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><var>va---riable</var></defparam> 
<defparam>var</defparam></definitionterm></defspecx>
-<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="12">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><r>va&textmdash;riable</r></defparam> 
<defparam>r</defparam></definitionterm></defspecx>
-<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="13">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><slanted>va&textmdash;riable</slanted></defparam> 
<defparam>slanted</defparam></definitionterm></defspecx>
-<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="14">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><code>va---riable</code></defparam> 
<defparam>code</defparam></definitionterm></defspecx>
-<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="15">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><r><var>va&textmdash;riable</var></r></defparam> 
<defparam>r:var</defparam></definitionterm></defspecx>
-<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="16">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><r><slanted>va&textmdash;riable</slanted></r></defparam> 
<defparam>r:slanted</defparam></definitionterm></defspecx>
-<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="17">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><r><code>va---riable</code></r></defparam> 
<defparam>r:code</defparam></definitionterm></defspecx>
+<defspec spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="13">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam>va---riable</defparam> <defparam>default</defparam></definitionterm>
+<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="14">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><var>va---riable</var></defparam> 
<defparam>var</defparam></definitionterm></defspecx>
+<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="15">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><r>va&textmdash;riable</r></defparam> 
<defparam>r</defparam></definitionterm></defspecx>
+<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="16">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><slanted>va&textmdash;riable</slanted></defparam> 
<defparam>slanted</defparam></definitionterm></defspecx>
+<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="17">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><code>va---riable</code></defparam> 
<defparam>code</defparam></definitionterm></defspecx>
+<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="18">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><t>va---riable</t></defparam> 
<defparam>t</defparam></definitionterm></defspecx>
+<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="19">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><t><b>va&textmdash;riable</b></t></defparam> 
<defparam>t:b</defparam></definitionterm></defspecx>
+<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="20">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><r><var>va&textmdash;riable</var></r></defparam> 
<defparam>r:var</defparam></definitionterm></defspecx>
+<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="21">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><r><slanted>va&textmdash;riable</slanted></r></defparam> 
<defparam>r:slanted</defparam></definitionterm></defspecx>
+<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="22">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><r><code>va---riable</code></r></defparam> 
<defparam>r:code</defparam></definitionterm></defspecx>
+<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="23">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><r><t>va---riable</t></r></defparam> 
<defparam>r:t</defparam></definitionterm></defspecx>
 <definitionitem><para>name
 </para></definitionitem></defspec>
 
-<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="18"><t>.ft</t></indexterm><defcategory>Request</defcategory> 
<deffunction><t>.ft</t></deffunction> 
<defdelimiter>[</defdelimiter><defparam><r><slanted>font</slanted></r></defparam><defdelimiter>]</defdelimiter></definitionterm>
-<deffnx spaces=" "><definitionterm><indexterm index="fn" 
number="19"><t>\\f</t><r><slanted>f</slanted></r><t></t></indexterm><defcategory>Escape&nbsp;sequence</defcategory>
 
<deffunction><t>\\f</t><r><slanted>f</slanted></r><t></t></deffunction></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn" 
number="20"><t>\\f(</t><r><slanted>fn</slanted></r><t></t></indexterm><defcategory>Escape&nbsp;sequence</defcategory>
 
<deffunction><t>\\f(</t><r><slanted>fn</slanted></r><t></t></deffunction></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn" 
number="21"><t>\\f[</t><r><slanted>font</slanted></r><t>]</t></indexterm><defcategory>Escape&nbsp;sequence</defcategory>
 <deffunction><t>\\f[</t><r><slanted>font</slanted></r><t>]</t></deffunction> 
<defparam><t>\\f[</t></defparam><defparam><r><slanted>font</slanted></r></defparam><defparam><t>]</t></defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn" 
number="22"><t>\\n[.sty]</t></indexterm><defcategory>Register</defcategory> 
<deffunction><t>\\n[.sty]</t></deffunction></definitionterm></deffnx>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="24"><t>.ft</t></indexterm><defcategory>Request</defcategory> 
<deffunction><t>.ft</t></deffunction> 
<defdelimiter>[</defdelimiter><defparam><r><slanted>font</slanted></r></defparam><defdelimiter>]</defdelimiter></definitionterm>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" 
number="25"><t>\\f</t><r><slanted>f</slanted></r><t></t></indexterm><defcategory>Escape&nbsp;sequence</defcategory>
 
<deffunction><t>\\f</t><r><slanted>f</slanted></r><t></t></deffunction></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" 
number="26"><t>\\f(</t><r><slanted>fn</slanted></r><t></t></indexterm><defcategory>Escape&nbsp;sequence</defcategory>
 
<deffunction><t>\\f(</t><r><slanted>fn</slanted></r><t></t></deffunction></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" 
number="27"><t>\\f[</t><r><slanted>font</slanted></r><t>]</t></indexterm><defcategory>Escape&nbsp;sequence</defcategory>
 <deffunction><t>\\f[</t><r><slanted>font</slanted></r><t>]</t></deffunction> 
<defparam><t>\\f[</t></defparam><defparam><r><slanted>font</slanted></r></defparam><defparam><t>]</t></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" 
number="28"><t>\\n[.sty]</t></indexterm><defcategory>Register</defcategory> 
<deffunction><t>\\n[.sty]</t></deffunction></definitionterm></deffnx>
 <definitionitem><para>The <code>ft</code> request and the <code>\\f</code> 
escape change the current font
 to <var>font</var> (one-character name&nbsp;<var>f</var>, two-character name
 <var>fn</var>).
 </para></definitionitem></deffn>
 
-<defspec spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="23">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defdelimiter>[</defdelimiter> <defparam><r>[</r></defparam> 
<defparam><slanted>[</slanted></defparam> <defparam><code>[</code></defparam> 
<defparam><t>[</t></defparam> <defparam><r><slanted>[</slanted></r></defparam> 
<defparam><r><code>[</code></r></defparam> <defparam><r><code><slant [...]
-<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="24">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defdelimiter>[</defdelimiter><defdelimiter>]</defdelimiter> 
<defparam><r>[]</r></defparam> <defparam><slanted>[]</slanted></defparam> 
<defparam><code>[]</code></defparam> <defparam><t>[]</t></defparam> 
<defparam><r><slanted>[]</slanted></r></defparam> 
<defparam><r><code>[]</code></r></defparam> <d [...]
+<defspec spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="29">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defdelimiter>[</defdelimiter> <defparam><r>[</r></defparam> 
<defparam><slanted>[</slanted></defparam> <defparam><code>[</code></defparam> 
<defparam><t>[</t></defparam> <defparam><r><slanted>[</slanted></r></defparam> 
<defparam><r><code>[</code></r></defparam> <defparam><r><code><slant [...]
+<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="30">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defdelimiter>[</defdelimiter><defdelimiter>]</defdelimiter> 
<defparam><r>[]</r></defparam> <defparam><slanted>[]</slanted></defparam> 
<defparam><code>[]</code></defparam> <defparam><t>[]</t></defparam> 
<defparam><r><slanted>[]</slanted></r></defparam> 
<defparam><r><code>[]</code></r></defparam> <d [...]
 <definitionitem><para>test formatting of separators
 </para></definitionitem></defspec>
 
-<deftypefn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="25">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparamtype>int</defparamtype> 
<defparam><var>f---oo</var></defparam><defdelimiter>,</defdelimiter> 
<defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>)</defdelimiter></definitionterm>
+<deftypefn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="31">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparamtype>int</defparamtype> 
<defparam><var>f---oo</var></defparam><defdelimiter>,</defdelimiter> 
<defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>)</defdelimiter></definitionterm>
 <definitionitem><para>&dots; with var for <var>f&textmdash;oo</var> and 
<var>b&textndash;ar</var>
 </para></definitionitem></deftypefn>
 
-<deftypefn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="26">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparamtype>int</defparamtype> 
<defparam><r><slanted>f&textmdash;oo</slanted></r></defparam><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><r><slanted>b&textndash;ar</slanted></r></defparam><defdelimiter>)</def
 [...]
+<deftypefn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="32">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparamtype>int</defparamtype> 
<defparam><r><slanted>f&textmdash;oo</slanted></r></defparam><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><r><slanted>b&textndash;ar</slanted></r></defparam><defdelimiter>)</def
 [...]
 <definitionitem><para>&dots; with r slanted for <var>f&textmdash;oo</var> and 
<var>b&textndash;ar</var>
 </para></definitionitem></deftypefn>
 
@@ -15056,38 +18579,44 @@ to <var>font</var> (one-character 
name&nbsp;<var>f</var>, two-character name
 </para></definitionitem></deftypecv>
 
 <quotation endspaces=" ">
-<deftypefn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="27">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparamtype>int</defparamtype> 
<defparam><var>foo</var></defparam><defdelimiter>,</defdelimiter> 
<defparamtype>float</defparamtype> 
<defparam><var>bar</var></defparam><defdelimiter>)</defdelimiter></definitionterm>
+<deftypefn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="33">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparamtype>int</defparamtype> 
<defparam><var>foo</var></defparam><defdelimiter>,</defdelimiter> 
<defparamtype>float</defparamtype> 
<defparam><var>bar</var></defparam><defdelimiter>)</defdelimiter></definitionterm>
 <definitionitem><para>&dots; for <var>foo</var> and <var>bar</var>
 </para></definitionitem></deftypefn>
 </quotation>
 
-<defun spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="28">apply</indexterm><defcategory automatic="on" 
bracketed="on">Function</defcategory> <deffunction>apply</deffunction> 
<defparam>function</defparam> <defparam>&amp;rest</defparam> 
<defparam>arguments</defparam></definitionterm>
+<defun spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="34">apply</indexterm><defcategory automatic="on" 
bracketed="on">Function</defcategory> <deffunction>apply</deffunction> 
<defparam>function</defparam> <defparam>&amp;rest</defparam> 
<defparam>arguments</defparam></definitionterm>
 <definitionitem><para><code>apply</code> calls no var <var>function</var> with 
<var>arguments</var>
 </para></definitionitem></defun>
 
-<defun spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="29">apply</indexterm><defcategory automatic="on" 
bracketed="on">Function</defcategory> <deffunction>apply</deffunction> 
<defparam>function</defparam> <defparam><r><b>&amp;rest</b></r></defparam> 
<defparam>argument</defparam></definitionterm>
+<defun spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="35">apply</indexterm><defcategory automatic="on" 
bracketed="on">Function</defcategory> <deffunction>apply</deffunction> 
<defparam>function</defparam> <defparam><r><b>&amp;rest</b></r></defparam> 
<defparam>argument</defparam></definitionterm>
 <definitionitem><para>explicit keyword marking, no var <var>function</var> 
with <var>arguments</var>
 </para></definitionitem></defun>
 
-<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="30">name</indexterm><defcategory>Category</defcategory> 
<deffunction>name</deffunction> <defparam>argument</defparam> 
<defparam><code>int</code></defparam> <defparam><code>a--b</code></defparam> 
<defparam><var>v--ar1</var></defparam><defdelimiter>,</defdelimiter> 
<defparam>word</defparam> <defparam><code>--</code></defparam> 
<defdelimiter>(</defdelimiter><defparam><code>type 
o--ther</code></defparam><defdelimit [...]
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="36">name</indexterm><defcategory>Category</defcategory> 
<deffunction>name</deffunction> <defparam>argument</defparam> 
<defparam><code>int</code></defparam> <defparam><code>a--b</code></defparam> 
<defparam><var>v--ar1</var></defparam><defdelimiter>,</defdelimiter> 
<defparam>word</defparam> <defparam><code>--</code></defparam> 
<defdelimiter>(</defdelimiter><defparam><code>type 
o--ther</code></defparam><defdelimit [...]
 <definitionitem><para>In deffn with code and var used
 </para></definitionitem></deffn>
 
-<deftypefn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="31">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparamtype>int</defparamtype> 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimiter><defdel [...]
-<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="32">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparamtype>int</defparamtype> 
<defparam><var>f---oo</var></defparam><defparam><r>[</r></defparam><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defparam><r>]</r></defparam><defdelimiter>)</defde
 [...]
-<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="33">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparamtype>int</defparamtype> 
<defparam><var>f---oo</var></defparam><defparam><slanted>[</slanted></defparam><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defparam><slanted>]</slanted></defpara 
[...]
-<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="34">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparamtype>int</defparamtype> 
<defparam><var>f---oo</var></defparam><defparamtype><code>[</code></defparamtype><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defparamtype><code>]</code></defpara [...]
-<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="35">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparamtype>int</defparamtype> 
<defparam><var>f---oo</var></defparam><defparam><r><slanted>[</slanted></r></defparam><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defparam><r><slanted>]</slanted [...]
-<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="36">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparamtype>int</defparamtype> 
<defparam><var>f---oo</var></defparam><defparam><r><code>[</code></r></defparam><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defparam><r><code>]</code></r></defpa 
[...]
+<deftypefn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="37">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparamtype>int</defparamtype> 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimiter><defdel [...]
+<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="38">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparamtype>int</defparamtype> 
<defparam><var>f---oo</var></defparam><defparam><r>[</r></defparam><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defparam><r>]</r></defparam><defdelimiter>)</defde
 [...]
+<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="39">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparamtype>int</defparamtype> 
<defparam><var>f---oo</var></defparam><defparam><slanted>[</slanted></defparam><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defparam><slanted>]</slanted></defpara 
[...]
+<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="40">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparamtype>int</defparamtype> 
<defparam><var>f---oo</var></defparam><defparamtype><code>[</code></defparamtype><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defparamtype><code>]</code></defpara [...]
+<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="41">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparamtype>int</defparamtype> 
<defparam><var>f---oo</var></defparam><defparam><t>[</t></defparam><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defparam><t>]</t></defparam><defdelimiter>)</defde
 [...]
+<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="42">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparamtype>int</defparamtype> 
<defparam><var>f---oo</var></defparam><defparam><t><b>[</b></t></defparam><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defparam><t><b>]</b></t></defparam><defdeli
 [...]
+<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="43">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparamtype>int</defparamtype> 
<defparam><var>f---oo</var></defparam><defparam><r><slanted>[</slanted></r></defparam><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defparam><r><slanted>]</slanted [...]
+<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="44">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparamtype>int</defparamtype> 
<defparam><var>f---oo</var></defparam><defparam><r><code>[</code></r></defparam><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defparam><r><code>]</code></r></defpa 
[...]
+<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="45">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparamtype>int</defparamtype> 
<defparam><var>f---oo</var></defparam><defparam><r><t>[</t></r></defparam><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defparam><r><t>]</t></r></defparam><defdeli
 [...]
 <definitionitem><para>separators
 </para></definitionitem></deftypefn>
 
-<deftypefn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="37">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparamtype>i--nt</defparamtype> 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimiter><defd [...]
-<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="38">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparam><r>i&textndash;nt</r></defparam> 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimiter><defdelimi 
[...]
-<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="39">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 
<defdelimiter>(</defdelimiter><defparam><slanted>i&textndash;nt</slanted></defparam>
 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimite [...]
-<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="40">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparamtype><code>i--nt</code></defparamtype> 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimiter><defd [...]
-<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="41">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 
<defdelimiter>(</defdelimiter><defparam><r><slanted>i&textndash;nt</slanted></r></defparam>
 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defd [...]
-<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="42">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparam><r><code>i--nt</code></r></defparam> 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimiter><defde [...]
+<deftypefn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="46">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparamtype>i--nt</defparamtype> 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimiter><defd [...]
+<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="47">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparam><r>i&textndash;nt</r></defparam> 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimiter><defdelimi 
[...]
+<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="48">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 
<defdelimiter>(</defdelimiter><defparam><slanted>i&textndash;nt</slanted></defparam>
 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimite [...]
+<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="49">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparamtype><code>i--nt</code></defparamtype> 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimiter><defd [...]
+<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="50">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparam><t>i--nt</t></defparam> 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimiter><defdelimiter>)</de
 [...]
+<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="51">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 
<defdelimiter>(</defdelimiter><defparam><t><b>i&textndash;nt</b></t></defparam> 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimiter><de [...]
+<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="52">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 
<defdelimiter>(</defdelimiter><defparam><r><slanted>i&textndash;nt</slanted></r></defparam>
 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defd [...]
+<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="53">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparam><r><code>i--nt</code></r></defparam> 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimiter><defde [...]
+<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="54">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparam><r><t>i--nt</t></r></defparam> 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimiter><defdelimite 
[...]
 <definitionitem><para>name
 </para></definitionitem></deftypefn>
 
@@ -15111,8 +18640,11 @@ $result_converted{'docbook'}->{'definition_commands'} 
= '<chapter label="1" id="
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> (<emphasis role="arg">var</emphasis> <emphasis 
role="arg">[</emphasis><emphasis role="arg">from</emphasis> <emphasis 
role="arg">to</emphasis> <emphasis role="arg">[</emphasis><emphasis 
role="arg">inc</emphasis><emphasis role="arg">]]</emphasis>) <emphasis 
role="arg">r</emphasis></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> (<emphasis role="arg">var</emphasis> <emphasis 
role="arg">[</emphasis><emphasis role="arg">from</emphasis> <emphasis 
role="arg">to</emphasis> <emphasis role="arg">[</emphasis><emphasis 
role="arg">inc</emphasis><emphasis role="arg">]]</emphasis>) <emphasis 
role="arg">slanted</emphasis></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> (<emphasis role="arg">var</emphasis> <emphasis 
role="arg">[</emphasis><emphasis role="arg">from</emphasis> <emphasis 
role="arg">to</emphasis> <emphasis role="arg">[</emphasis><emphasis 
role="arg">inc</emphasis><emphasis role="arg">]]</emphasis>) <emphasis 
role="arg">code</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> (<emphasis role="arg">var</emphasis> <emphasis 
role="arg">[</emphasis><emphasis role="arg">from</emphasis> <emphasis 
role="arg">to</emphasis> <emphasis role="arg">[</emphasis><emphasis 
role="arg">inc</emphasis><emphasis role="arg">]]</emphasis>) <emphasis 
role="arg">t</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> (<emphasis role="arg">var</emphasis> <emphasis 
role="arg"><emphasis role="bold">[</emphasis></emphasis><emphasis 
role="arg">from</emphasis> <emphasis role="arg">to</emphasis> <emphasis 
role="arg"><emphasis role="bold">[</emphasis></emphasis><emphasis 
role="arg">inc</emphasis><emphasis role="arg"><emphasis role="bol [...]
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> (<emphasis role="arg">var</emphasis> <emphasis 
role="arg">[</emphasis><emphasis role="arg">from</emphasis> <emphasis 
role="arg">to</emphasis> <emphasis role="arg">[</emphasis><emphasis 
role="arg">inc</emphasis><emphasis role="arg">]]</emphasis>) <emphasis 
role="arg">r:slanted</emphasis></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> (<emphasis role="arg">var</emphasis> <emphasis 
role="arg">[</emphasis><emphasis role="arg">from</emphasis> <emphasis 
role="arg">to</emphasis> <emphasis role="arg">[</emphasis><emphasis 
role="arg">inc</emphasis><emphasis role="arg">]]</emphasis>) <emphasis 
role="arg">r:code</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> (<emphasis role="arg">var</emphasis> <emphasis 
role="arg">[</emphasis><emphasis role="arg">from</emphasis> <emphasis 
role="arg">to</emphasis> <emphasis role="arg">[</emphasis><emphasis 
role="arg">inc</emphasis><emphasis role="arg">]]</emphasis>) <emphasis 
role="arg">r:t</emphasis></synopsis>
 <blockquote><para>separators
 </para></blockquote>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis role="arg">va---riable</emphasis> 
<emphasis role="arg">default</emphasis></synopsis>
@@ -15120,9 +18652,12 @@ $result_converted{'docbook'}->{'definition_commands'} 
= '<chapter label="1" id="
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis role="arg">va&#8212;riable</emphasis> 
<emphasis role="arg">r</emphasis></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis role="arg">va&#8212;riable</emphasis> 
<emphasis role="arg">slanted</emphasis></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis role="arg">va---riable</emphasis> 
<emphasis role="arg">code</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis role="arg">va---riable</emphasis> 
<emphasis role="arg">t</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis role="arg"><emphasis 
role="bold">va&#8212;riable</emphasis></emphasis> <emphasis 
role="arg">t:b</emphasis></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis 
role="arg"><replaceable>va&#8212;riable</replaceable></emphasis> <emphasis 
role="arg">r:var</emphasis></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis role="arg">va&#8212;riable</emphasis> 
<emphasis role="arg">r:slanted</emphasis></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis role="arg">va---riable</emphasis> 
<emphasis role="arg">r:code</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis role="arg">va---riable</emphasis> 
<emphasis role="arg">r:t</emphasis></synopsis>
 <blockquote><para>name
 </para></blockquote>
 <synopsis><indexterm 
role="fn"><primary><literal>.ft</literal></primary></indexterm><phrase 
role="category"><emphasis role="bold">Request</emphasis>:</phrase> 
<function>.ft</function> [<emphasis role="arg">font</emphasis>]</synopsis>
@@ -15167,16 +18702,22 @@ to <replaceable>font</replaceable> (one-character 
name&#160;<replaceable>f</repl
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<type>int</type> 
<emphasis role="arg"><replaceable>f---oo</replaceable></emphasis><emphasis 
role="arg">[</emphasis>, <type>float</type> <emphasis 
role="arg"><replaceable>b--ar</replaceable></emphasis><emphasis 
role="arg">]</emphasis>) <type>r</type></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<type>int</type> 
<emphasis role="arg"><replaceable>f---oo</replaceable></emphasis><emphasis 
role="arg">[</emphasis>, <type>float</type> <emphasis 
role="arg"><replaceable>b--ar</replaceable></emphasis><emphasis 
role="arg">]</emphasis>) <type>slanted</type></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<type>int</type> 
<emphasis 
role="arg"><replaceable>f---oo</replaceable></emphasis><type>[</type>, 
<type>float</type> <emphasis 
role="arg"><replaceable>b--ar</replaceable></emphasis><type>]</type>) 
<type>code</type></synopsis>
+<synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<type>int</type> 
<emphasis role="arg"><replaceable>f---oo</replaceable></emphasis><emphasis 
role="arg">[</emphasis>, <type>float</type> <emphasis 
role="arg"><replaceable>b--ar</replaceable></emphasis><emphasis 
role="arg">]</emphasis>) <type>t</type></synopsis>
+<synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<type>int</type> 
<emphasis role="arg"><replaceable>f---oo</replaceable></emphasis><emphasis 
role="arg"><emphasis role="bold">[</emphasis></emphasis>, <type>float</type> 
<emphasis role="arg"><replaceable>b--ar</replaceable></emphasis><emphasis 
role="arg"><emphasis role="bold">]</ [...]
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<type>int</type> 
<emphasis role="arg"><replaceable>f---oo</replaceable></emphasis><emphasis 
role="arg">[</emphasis>, <type>float</type> <emphasis 
role="arg"><replaceable>b--ar</replaceable></emphasis><emphasis 
role="arg">]</emphasis>) <type>r:slanted</type></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<type>int</type> 
<emphasis role="arg"><replaceable>f---oo</replaceable></emphasis><emphasis 
role="arg">[</emphasis>, <type>float</type> <emphasis 
role="arg"><replaceable>b--ar</replaceable></emphasis><emphasis 
role="arg">]</emphasis>) <type>r:code</type></synopsis>
+<synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<type>int</type> 
<emphasis role="arg"><replaceable>f---oo</replaceable></emphasis><emphasis 
role="arg">[</emphasis>, <type>float</type> <emphasis 
role="arg"><replaceable>b--ar</replaceable></emphasis><emphasis 
role="arg">]</emphasis>) <type>r:t</type></synopsis>
 <blockquote><para>separators
 </para></blockquote>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<type>i--nt</type> 
<emphasis role="arg"><replaceable>f---oo</replaceable></emphasis>[, 
<type>float</type> <emphasis 
role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>default</type></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<emphasis 
role="arg">i&#8211;nt</emphasis> <emphasis 
role="arg"><replaceable>f---oo</replaceable></emphasis>[, <type>float</type> 
<emphasis role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>r</type></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<emphasis 
role="arg">i&#8211;nt</emphasis> <emphasis 
role="arg"><replaceable>f---oo</replaceable></emphasis>[, <type>float</type> 
<emphasis role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>slanted</type></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<type>i--nt</type> 
<emphasis role="arg"><replaceable>f---oo</replaceable></emphasis>[, 
<type>float</type> <emphasis 
role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>code</type></synopsis>
+<synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<emphasis 
role="arg">i--nt</emphasis> <emphasis 
role="arg"><replaceable>f---oo</replaceable></emphasis>[, <type>float</type> 
<emphasis role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>t</type></synopsis>
+<synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<emphasis 
role="arg"><emphasis role="bold">i&#8211;nt</emphasis></emphasis> <emphasis 
role="arg"><replaceable>f---oo</replaceable></emphasis>[, <type>float</type> 
<emphasis role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>t:b</type></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<emphasis 
role="arg">i&#8211;nt</emphasis> <emphasis 
role="arg"><replaceable>f---oo</replaceable></emphasis>[, <type>float</type> 
<emphasis role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>r:slanted</type></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<emphasis 
role="arg">i--nt</emphasis> <emphasis 
role="arg"><replaceable>f---oo</replaceable></emphasis>[, <type>float</type> 
<emphasis role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>r:code</type></synopsis>
+<synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<emphasis 
role="arg">i--nt</emphasis> <emphasis 
role="arg"><replaceable>f---oo</replaceable></emphasis>[, <type>float</type> 
<emphasis role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>r:t</type></synopsis>
 <blockquote><para>name
 </para></blockquote>
 </chapter>
diff --git 
a/tp/t/results/converters_tests/definition_commands/res_html/chapter.html 
b/tp/t/results/converters_tests/definition_commands/res_html/chapter.html
index 1ef53c5242..ec53c43027 100644
--- a/tp/t/results/converters_tests/definition_commands/res_html/chapter.html
+++ b/tp/t/results/converters_tests/definition_commands/res_html/chapter.html
@@ -54,20 +54,26 @@ Previous: <a href="index.html" accesskey="p" rel="prev">top 
section</a>, Up: <a
 <dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-1"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph">(var <span 
class="r">[</span>from to <span class="r">[</span>inc<span class="r">]]</span>) 
r</em><a class="copiable-link" href='#index-foobar-1'> &para;</a></span></dt>
 <dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-2"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph">(var <i 
class="slanted">[</i>from to <i class="slanted">[</i>inc<i 
class="slanted">]]</i>) slanted</em><a class="copiable-link" 
href='#index-foobar-2'> &para;</a></span></dt>
 <dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-3"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph">(var <code 
class="code">[</code>from to <code class="code">[</code>inc<code 
class="code">]]</code>) code</em><a class="copiable-link" 
href='#index-foobar-3'> &para;</a></span></dt>
-<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-4"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph">(var <span 
class="r"><i class="slanted">[</i></span>from to <span class="r"><i 
class="slanted">[</i></span>inc<span class="r"><i 
class="slanted">]]</i></span>) r:slanted</em><a class="copiable-link" 
href='#index-foobar-4'> &para;</a></span></dt>
-<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-5"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph">(var <span 
class="r"><code class="code">[</code></span>from to <span class="r"><code 
class="code">[</code></span>inc<span class="r"><code 
class="code">]]</code></span>) r:code</em><a class="copiable-link" 
href='#index-foobar-5'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-4"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph">(var <code 
class="t">[</code>from to <code class="t">[</code>inc<code class="t">]]</code>) 
t</em><a class="copiable-link" href='#index-foobar-4'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-5"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph">(var <code 
class="t"><b class="b">[</b></code>from to <code class="t"><b 
class="b">[</b></code>inc<code class="t"><b class="b">]]</b></code>) t:b</em><a 
class="copiable-link" href='#index-foobar-5'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-6"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph">(var <span 
class="r"><i class="slanted">[</i></span>from to <span class="r"><i 
class="slanted">[</i></span>inc<span class="r"><i 
class="slanted">]]</i></span>) r:slanted</em><a class="copiable-link" 
href='#index-foobar-6'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-7"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph">(var <span 
class="r"><code class="code">[</code></span>from to <span class="r"><code 
class="code">[</code></span>inc<span class="r"><code 
class="code">]]</code></span>) r:code</em><a class="copiable-link" 
href='#index-foobar-7'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-8"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph">(var <span 
class="r"><code class="t">[</code></span>from to <span class="r"><code 
class="t">[</code></span>inc<span class="r"><code class="t">]]</code></span>) 
r:t</em><a class="copiable-link" href='#index-foobar-8'> &para;</a></span></dt>
 <dd><p>separators
 </p></dd></dl>
 
 <dl class="first-deffn first-defspec-alias-first-deffn">
-<dt class="deffn defspec-alias-deffn" id="index-foobar-6"><span 
class="category-def">Special Form: </span><span><strong 
class="strong">foobar</strong> <em class="emph">va---riable default</em><a 
class="copiable-link" href='#index-foobar-6'> &para;</a></span></dt>
-<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-7"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><var 
class="var">va---riable</var> var</em><a class="copiable-link" 
href='#index-foobar-7'> &para;</a></span></dt>
-<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-8"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><span 
class="r">va&mdash;riable</span> r</em><a class="copiable-link" 
href='#index-foobar-8'> &para;</a></span></dt>
-<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-9"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><i 
class="slanted">va&mdash;riable</i> slanted</em><a class="copiable-link" 
href='#index-foobar-9'> &para;</a></span></dt>
-<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-10"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><code 
class="code">va---riable</code> code</em><a class="copiable-link" 
href='#index-foobar-10'> &para;</a></span></dt>
-<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-11"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><span 
class="r"><var class="var">va&mdash;riable</var></span> r:var</em><a 
class="copiable-link" href='#index-foobar-11'> &para;</a></span></dt>
-<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-12"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><span 
class="r"><i class="slanted">va&mdash;riable</i></span> r:slanted</em><a 
class="copiable-link" href='#index-foobar-12'> &para;</a></span></dt>
-<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-13"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><span 
class="r"><code class="code">va---riable</code></span> r:code</em><a 
class="copiable-link" href='#index-foobar-13'> &para;</a></span></dt>
+<dt class="deffn defspec-alias-deffn" id="index-foobar-9"><span 
class="category-def">Special Form: </span><span><strong 
class="strong">foobar</strong> <em class="emph">va---riable default</em><a 
class="copiable-link" href='#index-foobar-9'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-10"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><var 
class="var">va---riable</var> var</em><a class="copiable-link" 
href='#index-foobar-10'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-11"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><span 
class="r">va&mdash;riable</span> r</em><a class="copiable-link" 
href='#index-foobar-11'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-12"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><i 
class="slanted">va&mdash;riable</i> slanted</em><a class="copiable-link" 
href='#index-foobar-12'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-13"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><code 
class="code">va---riable</code> code</em><a class="copiable-link" 
href='#index-foobar-13'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-14"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><code 
class="t">va---riable</code> t</em><a class="copiable-link" 
href='#index-foobar-14'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-15"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><code 
class="t"><b class="b">va&mdash;riable</b></code> t:b</em><a 
class="copiable-link" href='#index-foobar-15'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-16"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><span 
class="r"><var class="var">va&mdash;riable</var></span> r:var</em><a 
class="copiable-link" href='#index-foobar-16'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-17"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><span 
class="r"><i class="slanted">va&mdash;riable</i></span> r:slanted</em><a 
class="copiable-link" href='#index-foobar-17'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-18"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><span 
class="r"><code class="code">va---riable</code></span> r:code</em><a 
class="copiable-link" href='#index-foobar-18'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-19"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph"><span 
class="r"><code class="t">va---riable</code></span> r:t</em><a 
class="copiable-link" href='#index-foobar-19'> &para;</a></span></dt>
 <dd><p>name
 </p></dd></dl>
 
@@ -83,18 +89,18 @@ to <var class="var">font</var> (one-character 
name&nbsp;<var class="var">f</var>
 </p></dd></dl>
 
 <dl class="first-deffn first-defspec-alias-first-deffn">
-<dt class="deffn defspec-alias-deffn" id="index-foobar-14"><span 
class="category-def">Special Form: </span><span><strong 
class="strong">foobar</strong> <em class="emph">[ <span class="r">[</span> <i 
class="slanted">[</i> <code class="code">[</code> <code class="t">[</code> 
<span class="r"><i class="slanted">[</i></span> <span class="r"><code 
class="code">[</code></span> <span class="r"><code class="code"><i 
class="slanted">[</i></code></span> <span class="r"><code 
class="t">[</code></spa [...]
-<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-15"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph">[] <span 
class="r">[]</span> <i class="slanted">[]</i> <code class="code">[]</code> 
<code class="t">[]</code> <span class="r"><i class="slanted">[]</i></span> 
<span class="r"><code class="code">[]</code></span> <span class="r"><code 
class="code"><i class="slanted">[]</i></code></span></em><a class="copiab [...]
+<dt class="deffn defspec-alias-deffn" id="index-foobar-20"><span 
class="category-def">Special Form: </span><span><strong 
class="strong">foobar</strong> <em class="emph">[ <span class="r">[</span> <i 
class="slanted">[</i> <code class="code">[</code> <code class="t">[</code> 
<span class="r"><i class="slanted">[</i></span> <span class="r"><code 
class="code">[</code></span> <span class="r"><code class="code"><i 
class="slanted">[</i></code></span> <span class="r"><code 
class="t">[</code></spa [...]
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-21"><span class="category-def">Special Form: 
</span><span><strong class="strong">foobar</strong> <em class="emph">[] <span 
class="r">[]</span> <i class="slanted">[]</i> <code class="code">[]</code> 
<code class="t">[]</code> <span class="r"><i class="slanted">[]</i></span> 
<span class="r"><code class="code">[]</code></span> <span class="r"><code 
class="code"><i class="slanted">[]</i></code></span></em><a class="copiab [...]
 <dd><p>test formatting of separators
 </p></dd></dl>
 
 <dl class="first-deftypefn">
-<dt class="deftypefn" id="index-foobar-16"><span class="category-def">Library 
Function: </span><span><em class="emph">int</em> <strong 
class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var>, float <var class="var">b--ar</var>)</em><a 
class="copiable-link" href='#index-foobar-16'> &para;</a></span></dt>
+<dt class="deftypefn" id="index-foobar-22"><span class="category-def">Library 
Function: </span><span><em class="emph">int</em> <strong 
class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var>, float <var class="var">b--ar</var>)</em><a 
class="copiable-link" href='#index-foobar-22'> &para;</a></span></dt>
 <dd><p>&hellip; with var for <var class="var">f&mdash;oo</var> and <var 
class="var">b&ndash;ar</var>
 </p></dd></dl>
 
 <dl class="first-deftypefn">
-<dt class="deftypefn" id="index-foobar-17"><span class="category-def">Library 
Function: </span><span><em class="emph">int</em> <strong 
class="strong">foobar</strong> <em class="emph">(int <span class="r"><i 
class="slanted">f&mdash;oo</i></span>, float <span class="r"><i 
class="slanted">b&ndash;ar</i></span>)</em><a class="copiable-link" 
href='#index-foobar-17'> &para;</a></span></dt>
+<dt class="deftypefn" id="index-foobar-23"><span class="category-def">Library 
Function: </span><span><em class="emph">int</em> <strong 
class="strong">foobar</strong> <em class="emph">(int <span class="r"><i 
class="slanted">f&mdash;oo</i></span>, float <span class="r"><i 
class="slanted">b&ndash;ar</i></span>)</em><a class="copiable-link" 
href='#index-foobar-23'> &para;</a></span></dt>
 <dd><p>&hellip; with r slanted for <var class="var">f&mdash;oo</var> and <var 
class="var">b&ndash;ar</var>
 </p></dd></dl>
 
@@ -111,7 +117,7 @@ to <var class="var">font</var> (one-character 
name&nbsp;<var class="var">f</var>
 
 <blockquote class="quotation">
 <dl class="first-deftypefn">
-<dt class="deftypefn" id="index-foobar-18"><span class="category-def">Library 
Function: </span><span><em class="emph">int</em> <strong 
class="strong">foobar</strong> <em class="emph">(int <var 
class="var">foo</var>, float <var class="var">bar</var>)</em><a 
class="copiable-link" href='#index-foobar-18'> &para;</a></span></dt>
+<dt class="deftypefn" id="index-foobar-24"><span class="category-def">Library 
Function: </span><span><em class="emph">int</em> <strong 
class="strong">foobar</strong> <em class="emph">(int <var 
class="var">foo</var>, float <var class="var">bar</var>)</em><a 
class="copiable-link" href='#index-foobar-24'> &para;</a></span></dt>
 <dd><p>&hellip; for <var class="var">foo</var> and <var class="var">bar</var>
 </p></dd></dl>
 </blockquote>
@@ -132,22 +138,28 @@ to <var class="var">font</var> (one-character 
name&nbsp;<var class="var">f</var>
 </p></dd></dl>
 
 <dl class="first-deftypefn">
-<dt class="deftypefn" id="index-foobar-19"><span class="category-def">Library 
Function: </span><span><em class="emph">int</em> <strong 
class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) default</em><a 
class="copiable-link" href='#index-foobar-19'> &para;</a></span></dt>
-<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-20"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var><span class="r">[</span>, float <var 
class="var">b--ar</var><span class="r">]</span>) r</em><a class="copiable-link" 
href='#index-foobar-20'> &para;</a></span></dt>
-<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-21"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var><i class="slanted">[</i>, float <var 
class="var">b--ar</var><i class="slanted">]</i>) slanted</em><a 
class="copiable-link" href='#index-foobar-21'> &para;</a></span></dt>
-<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-22"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var><code class="code">[</code>, float <var 
class="var">b--ar</var><code class="code">]</code>) code</em><a 
class="copiable-link" href='#index-foobar-22'> &para;</a></span></dt>
-<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-23"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var><span class="r"><i class="slanted">[</i></span>, float 
<var class="var">b--ar</var><span class="r"><i class="slanted">]</i></span>) 
r:slanted</em><a class="copiable-link" href='#index-foobar-23'> 
&para;</a></span></dt>
-<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-24"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var><span class="r"><code class="code">[</code></span>, 
float <var class="var">b--ar</var><span class="r"><code 
class="code">]</code></span>) r:code</em><a class="copiable-link" 
href='#index-foobar-24'> &para;</a></span></dt>
+<dt class="deftypefn" id="index-foobar-25"><span class="category-def">Library 
Function: </span><span><em class="emph">int</em> <strong 
class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) default</em><a 
class="copiable-link" href='#index-foobar-25'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-26"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var><span class="r">[</span>, float <var 
class="var">b--ar</var><span class="r">]</span>) r</em><a class="copiable-link" 
href='#index-foobar-26'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-27"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var><i class="slanted">[</i>, float <var 
class="var">b--ar</var><i class="slanted">]</i>) slanted</em><a 
class="copiable-link" href='#index-foobar-27'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-28"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var><code class="code">[</code>, float <var 
class="var">b--ar</var><code class="code">]</code>) code</em><a 
class="copiable-link" href='#index-foobar-28'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-29"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var><code class="t">[</code>, float <var 
class="var">b--ar</var><code class="t">]</code>) t</em><a class="copiable-link" 
href='#index-foobar-29'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-30"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var><code class="t"><b class="b">[</b></code>, float <var 
class="var">b--ar</var><code class="t"><b class="b">]</b></code>) t:b</em><a 
class="copiable-link" href='#index-foobar-30'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-31"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var><span class="r"><i class="slanted">[</i></span>, float 
<var class="var">b--ar</var><span class="r"><i class="slanted">]</i></span>) 
r:slanted</em><a class="copiable-link" href='#index-foobar-31'> 
&para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-32"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var><span class="r"><code class="code">[</code></span>, 
float <var class="var">b--ar</var><span class="r"><code 
class="code">]</code></span>) r:code</em><a class="copiable-link" 
href='#index-foobar-32'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-33"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(int <var 
class="var">f---oo</var><span class="r"><code class="t">[</code></span>, float 
<var class="var">b--ar</var><span class="r"><code class="t">]</code></span>) 
r:t</em><a class="copiable-link" href='#index-foobar-33'> &para;</a></span></dt>
 <dd><p>separators
 </p></dd></dl>
 
 <dl class="first-deftypefn">
-<dt class="deftypefn" id="index-foobar-25"><span class="category-def">Library 
Function: </span><span><em class="emph">int</em> <strong 
class="strong">foobar</strong> <em class="emph">(i--nt <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) default</em><a 
class="copiable-link" href='#index-foobar-25'> &para;</a></span></dt>
-<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-26"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(<span 
class="r">i&ndash;nt</span> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) r</em><a class="copiable-link" 
href='#index-foobar-26'> &para;</a></span></dt>
-<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-27"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(<i 
class="slanted">i&ndash;nt</i> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) slanted</em><a class="copiable-link" 
href='#index-foobar-27'> &para;</a></span></dt>
-<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-28"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(<code 
class="code">i--nt</code> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) code</em><a class="copiable-link" 
href='#index-foobar-28'> &para;</a></span></dt>
-<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-29"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(<span class="r"><i 
class="slanted">i&ndash;nt</i></span> <var class="var">f---oo</var>[, float 
<var class="var">b--ar</var>]) r:slanted</em><a class="copiable-link" 
href='#index-foobar-29'> &para;</a></span></dt>
-<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-30"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(<span class="r"><code 
class="code">i--nt</code></span> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) r:code</em><a class="copiable-link" 
href='#index-foobar-30'> &para;</a></span></dt>
+<dt class="deftypefn" id="index-foobar-34"><span class="category-def">Library 
Function: </span><span><em class="emph">int</em> <strong 
class="strong">foobar</strong> <em class="emph">(i--nt <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) default</em><a 
class="copiable-link" href='#index-foobar-34'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-35"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(<span 
class="r">i&ndash;nt</span> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) r</em><a class="copiable-link" 
href='#index-foobar-35'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-36"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(<i 
class="slanted">i&ndash;nt</i> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) slanted</em><a class="copiable-link" 
href='#index-foobar-36'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-37"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(<code 
class="code">i--nt</code> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) code</em><a class="copiable-link" 
href='#index-foobar-37'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-38"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(<code 
class="t">i--nt</code> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) t</em><a class="copiable-link" 
href='#index-foobar-38'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-39"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(<code class="t"><b 
class="b">i&ndash;nt</b></code> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) t:b</em><a class="copiable-link" 
href='#index-foobar-39'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-40"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(<span class="r"><i 
class="slanted">i&ndash;nt</i></span> <var class="var">f---oo</var>[, float 
<var class="var">b--ar</var>]) r:slanted</em><a class="copiable-link" 
href='#index-foobar-40'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-41"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(<span class="r"><code 
class="code">i--nt</code></span> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) r:code</em><a class="copiable-link" 
href='#index-foobar-41'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-42"><span 
class="category-def">Library Function: </span><span><em class="emph">int</em> 
<strong class="strong">foobar</strong> <em class="emph">(<span class="r"><code 
class="t">i--nt</code></span> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) r:t</em><a class="copiable-link" 
href='#index-foobar-42'> &para;</a></span></dt>
 <dd><p>name
 </p></dd></dl>
 
diff --git 
a/tp/t/results/converters_tests/definition_commands/res_latex/definition_commands.tex
 
b/tp/t/results/converters_tests/definition_commands/res_latex/definition_commands.tex
index 4ed2121c64..a7f3c9b521 100644
--- 
a/tp/t/results/converters_tests/definition_commands/res_latex/definition_commands.tex
+++ 
b/tp/t/results/converters_tests/definition_commands/res_latex/definition_commands.tex
@@ -8,6 +8,7 @@
 \usepackage{graphicx}
 \usepackage{etoolbox}
 \usepackage{embrac}
+\usepackage{expl3}
 \usepackage{titleps}
 \usepackage{float}
 % use hidelinks to remove boxes around links to be similar with Texinfo TeX
@@ -70,102 +71,146 @@
 \chapter{chapter}
 \label{anchor:chapter}%
 
-\noindent\texttt{fname \EmbracOn{}\textsl{a{-}{-}{-}rg1 
a{-}{-}rg2}}\hfill[Func]
+\noindent\texttt{fname \EmbracOn{}\textsl{a{-}{-}{-}rg1 
a{-}{-}rg2}\EmbracOff{}}\hfill[Func]
 
 
 
 \index[fn]{fname@\texttt{fname}}%
 deffn no var for \textsl{a---rg1} and \textsl{a--rg2}
 
-\noindent\texttt{fname 
\EmbracOn{}\textsl{\EmbracOff{}\textsl{a{-}{-}{-}rg1}\EmbracOn{} 
\EmbracOff{}\textsl{a{-}{-}rg2}\EmbracOn{}}}\hfill[Func]
+\noindent\texttt{fname \EmbracOn{}\textsl{\textsl{a{-}{-}{-}rg1} 
\textsl{a{-}{-}rg2}}\EmbracOff{}}\hfill[Func]
 
 
 
 \index[fn]{fname@\texttt{fname}}%
 deffn explict var for \textsl{a---rg1} and \textsl{a--rg2}
 
-\noindent\texttt{fname 
\EmbracOn{}\textsl{\EmbracOff{}\textnormal{\textsl{a{-}{-}{-}rg1}}\EmbracOn{} 
\EmbracOff{}\textnormal{\textsl{a{-}{-}rg2}}\EmbracOn{}}}\hfill[Func]
+\noindent\texttt{fname 
\EmbracOn{}\textsl{\EmbracOff{}\textnormal{\textsl{a{-}{-}{-}rg1}}\EmbracOn{} 
\EmbracOff{}\textnormal{\textsl{a{-}{-}rg2}}\EmbracOn{}}\EmbracOff{}}\hfill[Func]
 
 
 
 \index[fn]{fname@\texttt{fname}}%
 deffn r slanted for \textsl{a---rg1} and \textsl{a--rg2}
 
-\noindent\texttt{foobar \EmbracOn{}\textsl{(var [from to [inc]]) 
default}}\hfill[Special Form]
+\noindent\texttt{foobar \EmbracOn{}\textsl{(var [from to [inc]]) 
default}\EmbracOff{}}\hfill[Special Form]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar \EmbracOn{}\textsl{(var 
\EmbracOff{}\textnormal{[}\EmbracOn{}from to 
\EmbracOff{}\textnormal{[}\EmbracOn{}inc\EmbracOff{}\textnormal{]]}\EmbracOn{}) 
r}}\hfill[Special Form]
+\noindent\texttt{foobar \EmbracOn{}\textsl{(var 
\EmbracOff{}\textnormal{[}\EmbracOn{}from to 
\EmbracOff{}\textnormal{[}\EmbracOn{}inc\EmbracOff{}\textnormal{]]}\EmbracOn{}) 
r}\EmbracOff{}}\hfill[Special Form]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar \EmbracOn{}\textsl{(var 
\EmbracOff{}\textsl{[}\EmbracOn{}from to 
\EmbracOff{}\textsl{[}\EmbracOn{}inc\EmbracOff{}\textsl{]]}\EmbracOn{}) 
slanted}}\hfill[Special Form]
+\noindent\texttt{foobar \EmbracOn{}\textsl{(var \textsl{[}from to 
\textsl{[}inc\textsl{]]}) slanted}\EmbracOff{}}\hfill[Special Form]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar \EmbracOn{}\textsl{(var 
\EmbracOff{}\texttt{[}\EmbracOn{}from to 
\EmbracOff{}\texttt{[}\EmbracOn{}inc\EmbracOff{}\texttt{]]}\EmbracOn{}) 
code}}\hfill[Special Form]
+\noindent\texttt{foobar \EmbracOn{}\textsl{(var 
\EmbracMakeKnown{texttt}\texttt{[}from to \texttt{[}inc\texttt{]]}) 
code}\EmbracOff{}}\hfill[Special Form]
+
+
+\ExplSyntaxOn%
+\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
+\ExplSyntaxOff%
+\index[fn]{foobar@\texttt{foobar}}%
+\noindent\texttt{foobar \EmbracOn{}\textsl{(var 
\EmbracMakeKnown{texttt}\texttt{[}from to \texttt{[}inc\texttt{]]}) 
t}\EmbracOff{}}\hfill[Special Form]
+
+
+\ExplSyntaxOn%
+\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
+\ExplSyntaxOff%
+\index[fn]{foobar@\texttt{foobar}}%
+\noindent\texttt{foobar \EmbracOn{}\textsl{(var 
\EmbracMakeKnown{texttt}\texttt{\EmbracMakeKnown{textbf}\textbf{[}}from to 
\texttt{\textbf{[}}inc\texttt{\textbf{]]}}) t:b}\EmbracOff{}}\hfill[Special 
Form]
+
+
+\ExplSyntaxOn%
+\cs_undefine:N{\embrac_textbf:nn}\cs_undefine:N{\embrac_orig_textbf:n}\cs_undefine:N{\__embrac_textbf:n}%
+\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
+\ExplSyntaxOff%
+\index[fn]{foobar@\texttt{foobar}}%
+\noindent\texttt{foobar \EmbracOn{}\textsl{(var 
\EmbracOff{}\textnormal{\textsl{[}}\EmbracOn{}from to 
\EmbracOff{}\textnormal{\textsl{[}}\EmbracOn{}inc\EmbracOff{}\textnormal{\textsl{]]}}\EmbracOn{})
 r:slanted}\EmbracOff{}}\hfill[Special Form]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar \EmbracOn{}\textsl{(var 
\EmbracOff{}\textnormal{\textsl{[}}\EmbracOn{}from to 
\EmbracOff{}\textnormal{\textsl{[}}\EmbracOn{}inc\EmbracOff{}\textnormal{\textsl{]]}}\EmbracOn{})
 r:slanted}}\hfill[Special Form]
+\noindent\texttt{foobar \EmbracOn{}\textsl{(var 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{}from to 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{}inc\EmbracOff{}\textnormal{\texttt{]]}}\EmbracOn{})
 r:code}\EmbracOff{}}\hfill[Special Form]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar \EmbracOn{}\textsl{(var 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{}from to 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{}inc\EmbracOff{}\textnormal{\texttt{]]}}\EmbracOn{})
 r:code}}\hfill[Special Form]
+\noindent\texttt{foobar \EmbracOn{}\textsl{(var 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{}from to 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{}inc\EmbracOff{}\textnormal{\texttt{]]}}\EmbracOn{})
 r:t}\EmbracOff{}}\hfill[Special Form]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
 separators
 
-\noindent\texttt{foobar \EmbracOn{}\textsl{va{-}{-}{-}riable 
default}}\hfill[Special Form]
+\noindent\texttt{foobar \EmbracOn{}\textsl{va{-}{-}{-}riable 
default}\EmbracOff{}}\hfill[Special Form]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar 
\EmbracOn{}\textsl{\EmbracOff{}\textsl{va{-}{-}{-}riable}\EmbracOn{} 
var}}\hfill[Special Form]
+\noindent\texttt{foobar \EmbracOn{}\textsl{\textsl{va{-}{-}{-}riable} 
var}\EmbracOff{}}\hfill[Special Form]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar 
\EmbracOn{}\textsl{\EmbracOff{}\textnormal{va{-}{-}{-}riable}\EmbracOn{} 
r}}\hfill[Special Form]
+\noindent\texttt{foobar 
\EmbracOn{}\textsl{\EmbracOff{}\textnormal{va{-}{-}{-}riable}\EmbracOn{} 
r}\EmbracOff{}}\hfill[Special Form]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar 
\EmbracOn{}\textsl{\EmbracOff{}\textsl{va{-}{-}{-}riable}\EmbracOn{} 
slanted}}\hfill[Special Form]
+\noindent\texttt{foobar \EmbracOn{}\textsl{\textsl{va{-}{-}{-}riable} 
slanted}\EmbracOff{}}\hfill[Special Form]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar 
\EmbracOn{}\textsl{\EmbracOff{}\texttt{va{-}{-}{-}riable}\EmbracOn{} 
code}}\hfill[Special Form]
+\noindent\texttt{foobar 
\EmbracOn{}\textsl{\EmbracMakeKnown{texttt}\texttt{va{-}{-}{-}riable} 
code}\EmbracOff{}}\hfill[Special Form]
 
 
+\ExplSyntaxOn%
+\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
+\ExplSyntaxOff%
+\index[fn]{foobar@\texttt{foobar}}%
+\noindent\texttt{foobar 
\EmbracOn{}\textsl{\EmbracMakeKnown{texttt}\texttt{va{-}{-}{-}riable} 
t}\EmbracOff{}}\hfill[Special Form]
+
 
+\ExplSyntaxOn%
+\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
+\ExplSyntaxOff%
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar 
\EmbracOn{}\textsl{\EmbracOff{}\textnormal{\textsl{va{-}{-}{-}riable}}\EmbracOn{}
 r:var}}\hfill[Special Form]
+\noindent\texttt{foobar 
\EmbracOn{}\textsl{\EmbracMakeKnown{texttt}\texttt{\EmbracMakeKnown{textbf}\textbf{va{-}{-}{-}riable}}
 t:b}\EmbracOff{}}\hfill[Special Form]
+
+
+\ExplSyntaxOn%
+\cs_undefine:N{\embrac_textbf:nn}\cs_undefine:N{\embrac_orig_textbf:n}\cs_undefine:N{\__embrac_textbf:n}%
+\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
+\ExplSyntaxOff%
+\index[fn]{foobar@\texttt{foobar}}%
+\noindent\texttt{foobar 
\EmbracOn{}\textsl{\EmbracOff{}\textnormal{\textsl{va{-}{-}{-}riable}}\EmbracOn{}
 r:var}\EmbracOff{}}\hfill[Special Form]
+
+
+
+\index[fn]{foobar@\texttt{foobar}}%
+\noindent\texttt{foobar 
\EmbracOn{}\textsl{\EmbracOff{}\textnormal{\textsl{va{-}{-}{-}riable}}\EmbracOn{}
 r:slanted}\EmbracOff{}}\hfill[Special Form]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar 
\EmbracOn{}\textsl{\EmbracOff{}\textnormal{\textsl{va{-}{-}{-}riable}}\EmbracOn{}
 r:slanted}}\hfill[Special Form]
+\noindent\texttt{foobar 
\EmbracOn{}\textsl{\EmbracOff{}\textnormal{\texttt{va{-}{-}{-}riable}}\EmbracOn{}
 r:code}\EmbracOff{}}\hfill[Special Form]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar 
\EmbracOn{}\textsl{\EmbracOff{}\textnormal{\texttt{va{-}{-}{-}riable}}\EmbracOn{}
 r:code}}\hfill[Special Form]
+\noindent\texttt{foobar 
\EmbracOn{}\textsl{\EmbracOff{}\textnormal{\texttt{va{-}{-}{-}riable}}\EmbracOn{}
 r:t}\EmbracOff{}}\hfill[Special Form]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
 name
 
-\noindent\texttt{\texttt{.ft} 
\EmbracOn{}\textsl{[\EmbracOff{}\textnormal{\textsl{font}}\EmbracOn{}]}}\hfill[Request]
+\noindent\texttt{\texttt{.ft} 
\EmbracOn{}\textsl{[\EmbracOff{}\textnormal{\textsl{font}}\EmbracOn{}]}\EmbracOff{}}\hfill[Request]
 
 
 
@@ -180,10 +225,12 @@ name
 
 
 
\index[fn]{\textbackslash{}f(fn@\texttt{\texttt{\textbackslash{}f(}\textnormal{\textsl{fn}}\texttt{}}}%
-\noindent\texttt{\texttt{\textbackslash{}f[}\textnormal{\textsl{font}}\texttt{]}
 
\EmbracOn{}\textsl{\EmbracOff{}\texttt{\textbackslash{}f[}\EmbracOn{}\EmbracOff{}\textnormal{\textsl{font}}\EmbracOn{}\EmbracOff{}\texttt{]}\EmbracOn{}}}\hfill[Escape\hbox{}sequence]
-
+\noindent\texttt{\texttt{\textbackslash{}f[}\textnormal{\textsl{font}}\texttt{]}
 
\EmbracOn{}\textsl{\EmbracMakeKnown{texttt}\texttt{\textbackslash{}f[}\EmbracOff{}\textnormal{\textsl{font}}\EmbracOn{}\texttt{]}}\EmbracOff{}}\hfill[Escape\hbox{}sequence]
 
 
+\ExplSyntaxOn%
+\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
+\ExplSyntaxOff%
 
\index[fn]{\textbackslash{}f[font]@\texttt{\texttt{\textbackslash{}f[}\textnormal{\textsl{font}}\texttt{]}}}%
 \noindent\texttt{\texttt{\textbackslash{}n[.sty]}}\hfill[Register]
 
@@ -194,15 +241,19 @@ The \texttt{ft} request and the 
\texttt{\textbackslash{}f} escape change the cur
 to \textsl{font} (one-character name\hbox{}\textsl{f}, two-character name
 \textsl{fn}).
 
-\noindent\texttt{foobar \EmbracOn{}\textsl{[ 
\EmbracOff{}\textnormal{[}\EmbracOn{} \EmbracOff{}\textsl{[}\EmbracOn{} 
\EmbracOff{}\texttt{[}\EmbracOn{} \EmbracOff{}\texttt{[}\EmbracOn{} 
\EmbracOff{}\textnormal{\textsl{[}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{\textsl{[}}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{} , 
\EmbracOff{}\textnormal{,}\EmbracOn{} \EmbracOff{}\textsl{,}\EmbracOn{} 
\EmbracOff{}\texttt{,}\EmbracOn{} \E [...]
-
+\noindent\texttt{foobar \EmbracOn{}\textsl{[ 
\EmbracOff{}\textnormal{[}\EmbracOn{} \textsl{[} 
\EmbracMakeKnown{texttt}\texttt{[} \texttt{[} 
\EmbracOff{}\textnormal{\textsl{[}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{\textsl{[}}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{} , 
\EmbracOff{}\textnormal{,}\EmbracOn{} \textsl{,} \texttt{,} \texttt{,} 
\EmbracOff{}\textnormal{\textsl{,}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{,}} [...]
 
 
+\ExplSyntaxOn%
+\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
+\ExplSyntaxOff%
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar \EmbracOn{}\textsl{[] 
\EmbracOff{}\textnormal{[]}\EmbracOn{} \EmbracOff{}\textsl{[]}\EmbracOn{} 
\EmbracOff{}\texttt{[]}\EmbracOn{} \EmbracOff{}\texttt{[]}\EmbracOn{} 
\EmbracOff{}\textnormal{\textsl{[]}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{[]}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{\textsl{[]}}}\EmbracOn{}}}\hfill[Special Form]
-
+\noindent\texttt{foobar \EmbracOn{}\textsl{[] 
\EmbracOff{}\textnormal{[]}\EmbracOn{} \textsl{[]} 
\EmbracMakeKnown{texttt}\texttt{[]} \texttt{[]} 
\EmbracOff{}\textnormal{\textsl{[]}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{[]}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{\textsl{[]}}}\EmbracOn{}}\EmbracOff{}}\hfill[Special
 Form]
 
 
+\ExplSyntaxOn%
+\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
+\ExplSyntaxOff%
 \index[fn]{foobar@\texttt{foobar}}%
 test formatting of separators
 
@@ -244,24 +295,26 @@ test formatting of separators
 \dots{}\@ for \textsl{foo} and \textsl{bar}
 \end{quote}
 
-\noindent\texttt{apply \EmbracOn{}\textsl{function \&rest 
arguments}}\hfill[Function]
+\noindent\texttt{apply \EmbracOn{}\textsl{function \&rest 
arguments}\EmbracOff{}}\hfill[Function]
 
 
 
 \index[fn]{apply@\texttt{apply}}%
 \texttt{apply} calls no var \textsl{function} with \textsl{arguments}
 
-\noindent\texttt{apply \EmbracOn{}\textsl{function 
\EmbracOff{}\textnormal{\textbf{\&rest}}\EmbracOn{} argument}}\hfill[Function]
+\noindent\texttt{apply \EmbracOn{}\textsl{function 
\EmbracOff{}\textnormal{\textbf{\&rest}}\EmbracOn{} 
argument}\EmbracOff{}}\hfill[Function]
 
 
 
 \index[fn]{apply@\texttt{apply}}%
 explicit keyword marking, no var \textsl{function} with \textsl{arguments}
 
-\noindent\texttt{name \EmbracOn{}\textsl{argument 
\EmbracOff{}\texttt{int}\EmbracOn{} \EmbracOff{}\texttt{a{-}{-}b}\EmbracOn{} 
\EmbracOff{}\textsl{v{-}{-}ar1}\EmbracOn{}, word 
\EmbracOff{}\texttt{{-}{-}}\EmbracOn{} (\EmbracOff{}\texttt{type 
o{-}{-}ther}\EmbracOn{}, \EmbracOff{}\textsl{v{-}{-}{-}ar2}\EmbracOn{}  
[\EmbracOff{}\texttt{float}\EmbracOn{} 
[\EmbracOff{}\textsl{var4}\EmbracOn{}]])}}\hfill[Category]
-
+\noindent\texttt{name \EmbracOn{}\textsl{argument 
\EmbracMakeKnown{texttt}\texttt{int} \texttt{a{-}{-}b} \textsl{v{-}{-}ar1}, 
word \texttt{{-}{-}} (\texttt{type o{-}{-}ther}, \textsl{v{-}{-}{-}ar2}  
[\texttt{float} [\textsl{var4}]])}\EmbracOff{}}\hfill[Category]
 
 
+\ExplSyntaxOn%
+\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
+\ExplSyntaxOff%
 \index[fn]{name@\texttt{name}}%
 In deffn with code and var used
 
@@ -284,6 +337,16 @@ In deffn with code and var used
 
 
 
+\index[fn]{foobar@\texttt{foobar}}%
+\noindent\texttt{int foobar (int \textsl{f{-}{-}{-}oo}\texttt{[}, float 
\textsl{b{-}{-}ar}\texttt{]}) t}\hfill[Library Function]
+
+
+
+\index[fn]{foobar@\texttt{foobar}}%
+\noindent\texttt{int foobar (int \textsl{f{-}{-}{-}oo}\texttt{\textbf{[}}, 
float \textsl{b{-}{-}ar}\texttt{\textbf{]}}) t:b}\hfill[Library Function]
+
+
+
 \index[fn]{foobar@\texttt{foobar}}%
 \noindent\texttt{int foobar (int \textsl{f{-}{-}{-}oo}\textnormal{\textsl{[}}, 
float \textsl{b{-}{-}ar}\textnormal{\textsl{]}}) r:slanted}\hfill[Library 
Function]
 
@@ -294,6 +357,11 @@ In deffn with code and var used
 
 
 
+\index[fn]{foobar@\texttt{foobar}}%
+\noindent\texttt{int foobar (int \textsl{f{-}{-}{-}oo}\textnormal{\texttt{[}}, 
float \textsl{b{-}{-}ar}\textnormal{\texttt{]}}) r:t}\hfill[Library Function]
+
+
+
 \index[fn]{foobar@\texttt{foobar}}%
 separators
 
@@ -316,6 +384,16 @@ separators
 
 
 
+\index[fn]{foobar@\texttt{foobar}}%
+\noindent\texttt{int foobar (\texttt{i{-}{-}nt} \textsl{f{-}{-}{-}oo}[, float 
\textsl{b{-}{-}ar}]) t}\hfill[Library Function]
+
+
+
+\index[fn]{foobar@\texttt{foobar}}%
+\noindent\texttt{int foobar (\texttt{\textbf{i{-}{-}nt}} 
\textsl{f{-}{-}{-}oo}[, float \textsl{b{-}{-}ar}]) t:b}\hfill[Library Function]
+
+
+
 \index[fn]{foobar@\texttt{foobar}}%
 \noindent\texttt{int foobar (\textnormal{\textsl{i{-}{-}nt}} 
\textsl{f{-}{-}{-}oo}[, float \textsl{b{-}{-}ar}]) r:slanted}\hfill[Library 
Function]
 
@@ -326,6 +404,11 @@ separators
 
 
 
+\index[fn]{foobar@\texttt{foobar}}%
+\noindent\texttt{int foobar (\textnormal{\texttt{i{-}{-}nt}} 
\textsl{f{-}{-}{-}oo}[, float \textsl{b{-}{-}ar}]) r:t}\hfill[Library Function]
+
+
+
 \index[fn]{foobar@\texttt{foobar}}%
 name
 
diff --git a/tp/t/results/def/omit_def_space.pl 
b/tp/t/results/def/omit_def_space.pl
index 7fb3683d6a..26ecebaa1a 100644
--- a/tp/t/results/def/omit_def_space.pl
+++ b/tp/t/results/def/omit_def_space.pl
@@ -363,7 +363,7 @@ $result_converted_errors{'html'}->{'omit_def_space'} = [
 
 
 $result_converted{'latex'}->{'omit_def_space'} = '
-\\noindent\\texttt{function\\EmbracOn{}\\textsl{(arg1, arg2)}}\\hfill[Function]
+\\noindent\\texttt{function\\EmbracOn{}\\textsl{(arg1, 
arg2)}\\EmbracOff{}}\\hfill[Function]
 
 
 
diff --git 
a/tp/t/results/languages/multiple_lang_chapters_latex/res_latex/multiple_lang_chapters.tex
 
b/tp/t/results/languages/multiple_lang_chapters_latex/res_latex/multiple_lang_chapters.tex
index 222b510eb3..9f7f304fef 100644
--- 
a/tp/t/results/languages/multiple_lang_chapters_latex/res_latex/multiple_lang_chapters.tex
+++ 
b/tp/t/results/languages/multiple_lang_chapters_latex/res_latex/multiple_lang_chapters.tex
@@ -8,6 +8,7 @@
 \usepackage{graphicx}
 \usepackage{etoolbox}
 \usepackage{embrac}
+\usepackage{expl3}
 \usepackage{titleps}
 \usepackage{float}
 \usepackage{babel}
@@ -81,7 +82,7 @@
 \label{anchor:chapter-ja}%
 
 In japanese. See 
\hyperref[anchor:chapter-ja]{\chaptername~\ref*{anchor:chapter-ja} [chapter 
ja], page~\pageref*{anchor:chapter-ja}}.
-\noindent\texttt{BBB \EmbracOn{}\textsl{CCC}}\hfill[Instance Variable of 
\texttt{AAA}]
+\noindent\texttt{BBB \EmbracOn{}\textsl{CCC}\EmbracOff{}}\hfill[Instance 
Variable of \texttt{AAA}]
 
 
 
@@ -92,7 +93,7 @@ In japanese. See 
\hyperref[anchor:chapter-ja]{\chaptername~\ref*{anchor:chapter-
 \label{anchor:chapter-en}%
 
 In english. See 
\hyperref[anchor:chapter-ja]{\chaptername~\ref*{anchor:chapter-ja} [chapter 
ja], page~\pageref*{anchor:chapter-ja}}.
-\noindent\texttt{BBB \EmbracOn{}\textsl{CCC}}\hfill[Instance Variable of 
\texttt{AAA}]
+\noindent\texttt{BBB \EmbracOn{}\textsl{CCC}\EmbracOff{}}\hfill[Instance 
Variable of \texttt{AAA}]
 
 
 
@@ -102,7 +103,7 @@ In english. See 
\hyperref[anchor:chapter-ja]{\chaptername~\ref*{anchor:chapter-j
 \chapter{fr\_FR}
 \label{anchor:chapter-fr_005fFR}%
 
-\noindent\texttt{BBB \EmbracOn{}\textsl{CCC}}\hfill[Variable d'instance of 
\texttt{AAA}]
+\noindent\texttt{BBB \EmbracOn{}\textsl{CCC}\EmbracOff{}}\hfill[Variable 
d'instance of \texttt{AAA}]
 
 
 
diff --git a/tp/tests/layout/res_parser/formatting_latex/formatting.tex 
b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
index 3e1f9de4e9..5c150698a1 100644
--- a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
+++ b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
@@ -10,6 +10,7 @@
 \usepackage{etoolbox}
 \usepackage{array}
 \usepackage{embrac}
+\usepackage{expl3}
 \usepackage[framemethod=tikz]{mdframed}
 \usepackage{enumitem}
 \usepackage{titleps}
@@ -705,52 +706,52 @@ f--ormat
 s--mallformat
 \endgroup{}%
 
-\noindent\texttt{d{-}{-}effn\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[c--ategory]
+\noindent\texttt{d{-}{-}effn\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[c--ategory]
 
 
 
 \index[fn]{d--effn\_name@\texttt{d{-}{-}effn\_name}}%
 d--effn
 
-\noindent\texttt{de{-}{-}ffn\_name \EmbracOn{}\textsl{ar{-}{-}guments    more 
args \leavevmode{}\\ even more so}}\hfill[cate--gory]
+\noindent\texttt{de{-}{-}ffn\_name \EmbracOn{}\textsl{ar{-}{-}guments    more 
args \leavevmode{}\\ even more so}\EmbracOff{}}\hfill[cate--gory]
 
 
 
 \index[fn]{de--ffn\_name@\texttt{de{-}{-}ffn\_name}}%
 def--fn
 
-\noindent\texttt{\textsl{i} \EmbracOn{}\textsl{a g}}\hfill[fset]
+\noindent\texttt{\textsl{i} \EmbracOn{}\textsl{a g}\EmbracOff{}}\hfill[fset]
 
 
 
 \index[fn]{i@\texttt{\textsl{i}}}%
 \index[cp]{index entry within deffn}%
-\noindent\texttt{truc \EmbracOn{}\textsl{}}\hfill[cmde]
+\noindent\texttt{truc \EmbracOn{}\textsl{}\EmbracOff{}}\hfill[cmde]
 
 
 
 \index[fn]{truc@\texttt{truc}}%
-\noindent\texttt{log trap \EmbracOn{}\textsl{}}\hfill[Command]
+\noindent\texttt{log trap \EmbracOn{}\textsl{}\EmbracOff{}}\hfill[Command]
 
 
 
 \index[fn]{log trap@\texttt{log trap}}%
-\noindent\texttt{log trap1 \EmbracOn{}\textsl{}}\hfill[Command]
+\noindent\texttt{log trap1 \EmbracOn{}\textsl{}\EmbracOff{}}\hfill[Command]
 
 
 
 \index[fn]{log trap1@\texttt{log trap1}}%
-\noindent\texttt{log trap2 \EmbracOn{}\textsl{}}\hfill[Command]
+\noindent\texttt{log trap2 \EmbracOn{}\textsl{}\EmbracOff{}}\hfill[Command]
 
 
 
 \index[fn]{log trap2@\texttt{log trap2}}%
-\noindent\texttt{\textbf{id ule} \EmbracOn{}\textsl{truc}}\hfill[cmde]
+\noindent\texttt{\textbf{id ule} 
\EmbracOn{}\textsl{truc}\EmbracOff{}}\hfill[cmde]
 
 
 
 \index[fn]{id ule@\texttt{\textbf{id ule}}}%
-\noindent\texttt{\textbf{id `\texttt{i}' ule} 
\EmbracOn{}\textsl{truc}}\hfill[cmde2]
+\noindent\texttt{\textbf{id `\texttt{i}' ule} 
\EmbracOn{}\textsl{truc}\EmbracOff{}}\hfill[cmde2]
 
 
 
@@ -778,7 +779,7 @@ def--fn
 
 
 
-\noindent\texttt{followed \EmbracOn{}\textsl{by a comment}}\hfill[truc]
+\noindent\texttt{followed \EmbracOn{}\textsl{by a 
comment}\EmbracOff{}}\hfill[truc]
 
 
 
@@ -787,12 +788,14 @@ def--fn
 
 
 
-\noindent\texttt{a \EmbracOn{}\textsl{b c d e \EmbracOff{}\textbf{f 
g}\EmbracOn{} h i}}\hfill[truc]
-
+\noindent\texttt{a \EmbracOn{}\textsl{b c d e 
\EmbracMakeKnown{textbf}\textbf{f g} h i}\EmbracOff{}}\hfill[truc]
 
 
+\ExplSyntaxOn%
+\cs_undefine:N{\embrac_textbf:nn}\cs_undefine:N{\embrac_orig_textbf:n}\cs_undefine:N{\__embrac_textbf:n}%
+\ExplSyntaxOff%
 \index[fn]{a@\texttt{a}}%
-\noindent\texttt{deffnx \EmbracOn{}\textsl{before end deffn}}\hfill[truc]
+\noindent\texttt{deffnx \EmbracOn{}\textsl{before end 
deffn}\EmbracOff{}}\hfill[truc]
 
 
 
@@ -805,7 +808,7 @@ def--fn
 
 \index[fn]{deffn@\texttt{deffn}}%
 
-\noindent\texttt{deffn \EmbracOn{}\textsl{with deffnx}}\hfill[empty]
+\noindent\texttt{deffn \EmbracOn{}\textsl{with 
deffnx}\EmbracOff{}}\hfill[empty]
 
 
 
@@ -816,12 +819,12 @@ def--fn
 
 \index[fn]{deffnx@\texttt{deffnx}}%
 
-\noindent\texttt{\textsl{i} \EmbracOn{}\textsl{a g}}\hfill[fset]
+\noindent\texttt{\textsl{i} \EmbracOn{}\textsl{a g}\EmbracOff{}}\hfill[fset]
 
 
 
 \index[fn]{i@\texttt{\textsl{i}}}%
-\noindent\texttt{truc \EmbracOn{}\textsl{}}\hfill[cmde]
+\noindent\texttt{truc \EmbracOn{}\textsl{}\EmbracOff{}}\hfill[cmde]
 
 
 
@@ -836,7 +839,7 @@ text in def item for second def item
 \index[cp]{d--efvr\_name@\texttt{d{-}{-}efvr\_name}}%
 d--efvr
 
-\noindent\texttt{n{-}{-}ame 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[c--ategory]
+\noindent\texttt{n{-}{-}ame 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[c--ategory]
 
 
 
@@ -892,7 +895,7 @@ d--eftypevr
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
 d--efcv
 
-\noindent\texttt{d{-}{-}efcv\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efcv\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
 
 
 
@@ -913,7 +916,7 @@ d--eftypecv
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name of 
c{-}{-}lass}}%
 d--eftypecv with arguments
 
-\noindent\texttt{d{-}{-}efop\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efop\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
 
 
 
@@ -927,28 +930,28 @@ d--efop
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name on c{-}{-}lass}}%
 d--efop no arg
 
-\noindent\texttt{d{-}{-}eftp\_name 
\EmbracOn{}\textsl{a{-}{-}ttributes...}}\hfill[c--ategory]
+\noindent\texttt{d{-}{-}eftp\_name 
\EmbracOn{}\textsl{a{-}{-}ttributes...}\EmbracOff{}}\hfill[c--ategory]
 
 
 
 \index[tp]{d--eftp\_name@\texttt{d{-}{-}eftp\_name}}%
 d--eftp
 
-\noindent\texttt{d{-}{-}efun\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[Function]
+\noindent\texttt{d{-}{-}efun\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[Function]
 
 
 
 \index[fn]{d--efun\_name@\texttt{d{-}{-}efun\_name}}%
 d--efun
 
-\noindent\texttt{d{-}{-}efmac\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[Macro]
+\noindent\texttt{d{-}{-}efmac\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[Macro]
 
 
 
 \index[fn]{d--efmac\_name@\texttt{d{-}{-}efmac\_name}}%
 d--efmac
 
-\noindent\texttt{d{-}{-}efspec\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[Special Form]
+\noindent\texttt{d{-}{-}efspec\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[Special Form]
 
 
 
@@ -962,7 +965,7 @@ d--efspec
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
 d--efvar
 
-\noindent\texttt{d{-}{-}efvar\_name \EmbracOn{}\textsl{arg{-}{-}var 
arg{-}{-}var1}}\hfill[Variable]
+\noindent\texttt{d{-}{-}efvar\_name \EmbracOn{}\textsl{arg{-}{-}var 
arg{-}{-}var1}\EmbracOff{}}\hfill[Variable]
 
 
 
@@ -1004,7 +1007,7 @@ d--efivar
 \index[cp]{d--eftypeivar\_name of c--lass@\texttt{d{-}{-}eftypeivar\_name of 
c{-}{-}lass}}%
 d--eftypeivar
 
-\noindent\texttt{d{-}{-}efmethod\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[Method on \texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efmethod\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[Method on 
\texttt{c{-}{-}lass}]
 
 
 
@@ -1346,39 +1349,39 @@ l--ine
 
 
 
-\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and}}\hfill[truc]
+\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose 
and}\EmbracOff{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and  
after}}\hfill[truc]
+\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and  
after}\EmbracOff{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and }}\hfill[truc]
+\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and 
}\EmbracOff{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and and 
after}}\hfill[truc]
+\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and and 
after}\EmbracOff{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{followed \EmbracOn{}\textsl{by a comment}}\hfill[truc]
+\noindent\texttt{followed \EmbracOn{}\textsl{by a 
comment}\EmbracOff{}}\hfill[truc]
 
 
 
 \index[fn]{followed@\texttt{followed}}%
 Various deff lines
-\noindent\texttt{after \EmbracOn{}\textsl{a deff item}}\hfill[truc]
+\noindent\texttt{after \EmbracOn{}\textsl{a deff item}\EmbracOff{}}\hfill[truc]
 
 
 
 \index[fn]{after@\texttt{after}}%
 
-\noindent\texttt{\textsl{invalid} \EmbracOn{}\textsl{a g}}\hfill[fsetinv]
+\noindent\texttt{\textsl{invalid} \EmbracOn{}\textsl{a 
g}\EmbracOff{}}\hfill[fsetinv]
 
 
 
@@ -2031,52 +2034,52 @@ f--ormat
 s--mallformat
 \endgroup{}%
 
-\noindent\texttt{d{-}{-}effn\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[c--ategory]
+\noindent\texttt{d{-}{-}effn\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[c--ategory]
 
 
 
 \index[fn]{d--effn\_name@\texttt{d{-}{-}effn\_name}}%
 d--effn
 
-\noindent\texttt{de{-}{-}ffn\_name \EmbracOn{}\textsl{ar{-}{-}guments    more 
args \leavevmode{}\\ even more so}}\hfill[cate--gory]
+\noindent\texttt{de{-}{-}ffn\_name \EmbracOn{}\textsl{ar{-}{-}guments    more 
args \leavevmode{}\\ even more so}\EmbracOff{}}\hfill[cate--gory]
 
 
 
 \index[fn]{de--ffn\_name@\texttt{de{-}{-}ffn\_name}}%
 def--fn
 
-\noindent\texttt{\textsl{i} \EmbracOn{}\textsl{a g}}\hfill[fset]
+\noindent\texttt{\textsl{i} \EmbracOn{}\textsl{a g}\EmbracOff{}}\hfill[fset]
 
 
 
 \index[fn]{i@\texttt{\textsl{i}}}%
 \index[cp]{index entry within deffn}%
-\noindent\texttt{truc \EmbracOn{}\textsl{}}\hfill[cmde]
+\noindent\texttt{truc \EmbracOn{}\textsl{}\EmbracOff{}}\hfill[cmde]
 
 
 
 \index[fn]{truc@\texttt{truc}}%
-\noindent\texttt{log trap \EmbracOn{}\textsl{}}\hfill[Command]
+\noindent\texttt{log trap \EmbracOn{}\textsl{}\EmbracOff{}}\hfill[Command]
 
 
 
 \index[fn]{log trap@\texttt{log trap}}%
-\noindent\texttt{log trap1 \EmbracOn{}\textsl{}}\hfill[Command]
+\noindent\texttt{log trap1 \EmbracOn{}\textsl{}\EmbracOff{}}\hfill[Command]
 
 
 
 \index[fn]{log trap1@\texttt{log trap1}}%
-\noindent\texttt{log trap2 \EmbracOn{}\textsl{}}\hfill[Command]
+\noindent\texttt{log trap2 \EmbracOn{}\textsl{}\EmbracOff{}}\hfill[Command]
 
 
 
 \index[fn]{log trap2@\texttt{log trap2}}%
-\noindent\texttt{\textbf{id ule} \EmbracOn{}\textsl{truc}}\hfill[cmde]
+\noindent\texttt{\textbf{id ule} 
\EmbracOn{}\textsl{truc}\EmbracOff{}}\hfill[cmde]
 
 
 
 \index[fn]{id ule@\texttt{\textbf{id ule}}}%
-\noindent\texttt{\textbf{id `\texttt{i}' ule} 
\EmbracOn{}\textsl{truc}}\hfill[cmde2]
+\noindent\texttt{\textbf{id `\texttt{i}' ule} 
\EmbracOn{}\textsl{truc}\EmbracOff{}}\hfill[cmde2]
 
 
 
@@ -2104,7 +2107,7 @@ def--fn
 
 
 
-\noindent\texttt{followed \EmbracOn{}\textsl{by a comment}}\hfill[truc]
+\noindent\texttt{followed \EmbracOn{}\textsl{by a 
comment}\EmbracOff{}}\hfill[truc]
 
 
 
@@ -2113,12 +2116,14 @@ def--fn
 
 
 
-\noindent\texttt{a \EmbracOn{}\textsl{b c d e \EmbracOff{}\textbf{f 
g}\EmbracOn{} h i}}\hfill[truc]
-
+\noindent\texttt{a \EmbracOn{}\textsl{b c d e 
\EmbracMakeKnown{textbf}\textbf{f g} h i}\EmbracOff{}}\hfill[truc]
 
 
+\ExplSyntaxOn%
+\cs_undefine:N{\embrac_textbf:nn}\cs_undefine:N{\embrac_orig_textbf:n}\cs_undefine:N{\__embrac_textbf:n}%
+\ExplSyntaxOff%
 \index[fn]{a@\texttt{a}}%
-\noindent\texttt{deffnx \EmbracOn{}\textsl{before end deffn}}\hfill[truc]
+\noindent\texttt{deffnx \EmbracOn{}\textsl{before end 
deffn}\EmbracOff{}}\hfill[truc]
 
 
 
@@ -2131,7 +2136,7 @@ def--fn
 
 \index[fn]{deffn@\texttt{deffn}}%
 
-\noindent\texttt{deffn \EmbracOn{}\textsl{with deffnx}}\hfill[empty]
+\noindent\texttt{deffn \EmbracOn{}\textsl{with 
deffnx}\EmbracOff{}}\hfill[empty]
 
 
 
@@ -2142,12 +2147,12 @@ def--fn
 
 \index[fn]{deffnx@\texttt{deffnx}}%
 
-\noindent\texttt{\textsl{i} \EmbracOn{}\textsl{a g}}\hfill[fset]
+\noindent\texttt{\textsl{i} \EmbracOn{}\textsl{a g}\EmbracOff{}}\hfill[fset]
 
 
 
 \index[fn]{i@\texttt{\textsl{i}}}%
-\noindent\texttt{truc \EmbracOn{}\textsl{}}\hfill[cmde]
+\noindent\texttt{truc \EmbracOn{}\textsl{}\EmbracOff{}}\hfill[cmde]
 
 
 
@@ -2162,7 +2167,7 @@ text in def item for second def item
 \index[cp]{d--efvr\_name@\texttt{d{-}{-}efvr\_name}}%
 d--efvr
 
-\noindent\texttt{n{-}{-}ame 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[c--ategory]
+\noindent\texttt{n{-}{-}ame 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[c--ategory]
 
 
 
@@ -2218,7 +2223,7 @@ d--eftypevr
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
 d--efcv
 
-\noindent\texttt{d{-}{-}efcv\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efcv\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
 
 
 
@@ -2239,7 +2244,7 @@ d--eftypecv
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name of 
c{-}{-}lass}}%
 d--eftypecv with arguments
 
-\noindent\texttt{d{-}{-}efop\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efop\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
 
 
 
@@ -2253,28 +2258,28 @@ d--efop
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name on c{-}{-}lass}}%
 d--efop no arg
 
-\noindent\texttt{d{-}{-}eftp\_name 
\EmbracOn{}\textsl{a{-}{-}ttributes...}}\hfill[c--ategory]
+\noindent\texttt{d{-}{-}eftp\_name 
\EmbracOn{}\textsl{a{-}{-}ttributes...}\EmbracOff{}}\hfill[c--ategory]
 
 
 
 \index[tp]{d--eftp\_name@\texttt{d{-}{-}eftp\_name}}%
 d--eftp
 
-\noindent\texttt{d{-}{-}efun\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[Function]
+\noindent\texttt{d{-}{-}efun\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[Function]
 
 
 
 \index[fn]{d--efun\_name@\texttt{d{-}{-}efun\_name}}%
 d--efun
 
-\noindent\texttt{d{-}{-}efmac\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[Macro]
+\noindent\texttt{d{-}{-}efmac\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[Macro]
 
 
 
 \index[fn]{d--efmac\_name@\texttt{d{-}{-}efmac\_name}}%
 d--efmac
 
-\noindent\texttt{d{-}{-}efspec\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[Special Form]
+\noindent\texttt{d{-}{-}efspec\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[Special Form]
 
 
 
@@ -2288,7 +2293,7 @@ d--efspec
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
 d--efvar
 
-\noindent\texttt{d{-}{-}efvar\_name \EmbracOn{}\textsl{arg{-}{-}var 
arg{-}{-}var1}}\hfill[Variable]
+\noindent\texttt{d{-}{-}efvar\_name \EmbracOn{}\textsl{arg{-}{-}var 
arg{-}{-}var1}\EmbracOff{}}\hfill[Variable]
 
 
 
@@ -2330,7 +2335,7 @@ d--efivar
 \index[cp]{d--eftypeivar\_name of c--lass@\texttt{d{-}{-}eftypeivar\_name of 
c{-}{-}lass}}%
 d--eftypeivar
 
-\noindent\texttt{d{-}{-}efmethod\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[Method on \texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efmethod\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[Method on 
\texttt{c{-}{-}lass}]
 
 
 
@@ -2672,39 +2677,39 @@ l--ine
 
 
 
-\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and}}\hfill[truc]
+\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose 
and}\EmbracOff{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and  
after}}\hfill[truc]
+\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and  
after}\EmbracOff{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and }}\hfill[truc]
+\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and 
}\EmbracOff{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and and 
after}}\hfill[truc]
+\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and and 
after}\EmbracOff{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{followed \EmbracOn{}\textsl{by a comment}}\hfill[truc]
+\noindent\texttt{followed \EmbracOn{}\textsl{by a 
comment}\EmbracOff{}}\hfill[truc]
 
 
 
 \index[fn]{followed@\texttt{followed}}%
 Various deff lines
-\noindent\texttt{after \EmbracOn{}\textsl{a deff item}}\hfill[truc]
+\noindent\texttt{after \EmbracOn{}\textsl{a deff item}\EmbracOff{}}\hfill[truc]
 
 
 
 \index[fn]{after@\texttt{after}}%
 
-\noindent\texttt{\textsl{invalid} \EmbracOn{}\textsl{a g}}\hfill[fsetinv]
+\noindent\texttt{\textsl{invalid} \EmbracOn{}\textsl{a 
g}\EmbracOff{}}\hfill[fsetinv]
 
 
 
@@ -3378,52 +3383,52 @@ f--ormat
 s--mallformat
 \endgroup{}%
 
-\noindent\texttt{d{-}{-}effn\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[c--ategory]
+\noindent\texttt{d{-}{-}effn\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[c--ategory]
 
 
 
 \index[fn]{d--effn\_name@\texttt{d{-}{-}effn\_name}}%
 d--effn
 
-\noindent\texttt{de{-}{-}ffn\_name \EmbracOn{}\textsl{ar{-}{-}guments    more 
args \leavevmode{}\\ even more so}}\hfill[cate--gory]
+\noindent\texttt{de{-}{-}ffn\_name \EmbracOn{}\textsl{ar{-}{-}guments    more 
args \leavevmode{}\\ even more so}\EmbracOff{}}\hfill[cate--gory]
 
 
 
 \index[fn]{de--ffn\_name@\texttt{de{-}{-}ffn\_name}}%
 def--fn
 
-\noindent\texttt{\textsl{i} \EmbracOn{}\textsl{a g}}\hfill[fset]
+\noindent\texttt{\textsl{i} \EmbracOn{}\textsl{a g}\EmbracOff{}}\hfill[fset]
 
 
 
 \index[fn]{i@\texttt{\textsl{i}}}%
 \index[cp]{index entry within deffn}%
-\noindent\texttt{truc \EmbracOn{}\textsl{}}\hfill[cmde]
+\noindent\texttt{truc \EmbracOn{}\textsl{}\EmbracOff{}}\hfill[cmde]
 
 
 
 \index[fn]{truc@\texttt{truc}}%
-\noindent\texttt{log trap \EmbracOn{}\textsl{}}\hfill[Command]
+\noindent\texttt{log trap \EmbracOn{}\textsl{}\EmbracOff{}}\hfill[Command]
 
 
 
 \index[fn]{log trap@\texttt{log trap}}%
-\noindent\texttt{log trap1 \EmbracOn{}\textsl{}}\hfill[Command]
+\noindent\texttt{log trap1 \EmbracOn{}\textsl{}\EmbracOff{}}\hfill[Command]
 
 
 
 \index[fn]{log trap1@\texttt{log trap1}}%
-\noindent\texttt{log trap2 \EmbracOn{}\textsl{}}\hfill[Command]
+\noindent\texttt{log trap2 \EmbracOn{}\textsl{}\EmbracOff{}}\hfill[Command]
 
 
 
 \index[fn]{log trap2@\texttt{log trap2}}%
-\noindent\texttt{\textbf{id ule} \EmbracOn{}\textsl{truc}}\hfill[cmde]
+\noindent\texttt{\textbf{id ule} 
\EmbracOn{}\textsl{truc}\EmbracOff{}}\hfill[cmde]
 
 
 
 \index[fn]{id ule@\texttt{\textbf{id ule}}}%
-\noindent\texttt{\textbf{id `\texttt{i}' ule} 
\EmbracOn{}\textsl{truc}}\hfill[cmde2]
+\noindent\texttt{\textbf{id `\texttt{i}' ule} 
\EmbracOn{}\textsl{truc}\EmbracOff{}}\hfill[cmde2]
 
 
 
@@ -3451,7 +3456,7 @@ def--fn
 
 
 
-\noindent\texttt{followed \EmbracOn{}\textsl{by a comment}}\hfill[truc]
+\noindent\texttt{followed \EmbracOn{}\textsl{by a 
comment}\EmbracOff{}}\hfill[truc]
 
 
 
@@ -3460,12 +3465,14 @@ def--fn
 
 
 
-\noindent\texttt{a \EmbracOn{}\textsl{b c d e \EmbracOff{}\textbf{f 
g}\EmbracOn{} h i}}\hfill[truc]
-
+\noindent\texttt{a \EmbracOn{}\textsl{b c d e 
\EmbracMakeKnown{textbf}\textbf{f g} h i}\EmbracOff{}}\hfill[truc]
 
 
+\ExplSyntaxOn%
+\cs_undefine:N{\embrac_textbf:nn}\cs_undefine:N{\embrac_orig_textbf:n}\cs_undefine:N{\__embrac_textbf:n}%
+\ExplSyntaxOff%
 \index[fn]{a@\texttt{a}}%
-\noindent\texttt{deffnx \EmbracOn{}\textsl{before end deffn}}\hfill[truc]
+\noindent\texttt{deffnx \EmbracOn{}\textsl{before end 
deffn}\EmbracOff{}}\hfill[truc]
 
 
 
@@ -3478,7 +3485,7 @@ def--fn
 
 \index[fn]{deffn@\texttt{deffn}}%
 
-\noindent\texttt{deffn \EmbracOn{}\textsl{with deffnx}}\hfill[empty]
+\noindent\texttt{deffn \EmbracOn{}\textsl{with 
deffnx}\EmbracOff{}}\hfill[empty]
 
 
 
@@ -3489,12 +3496,12 @@ def--fn
 
 \index[fn]{deffnx@\texttt{deffnx}}%
 
-\noindent\texttt{\textsl{i} \EmbracOn{}\textsl{a g}}\hfill[fset]
+\noindent\texttt{\textsl{i} \EmbracOn{}\textsl{a g}\EmbracOff{}}\hfill[fset]
 
 
 
 \index[fn]{i@\texttt{\textsl{i}}}%
-\noindent\texttt{truc \EmbracOn{}\textsl{}}\hfill[cmde]
+\noindent\texttt{truc \EmbracOn{}\textsl{}\EmbracOff{}}\hfill[cmde]
 
 
 
@@ -3509,7 +3516,7 @@ text in def item for second def item
 \index[cp]{d--efvr\_name@\texttt{d{-}{-}efvr\_name}}%
 d--efvr
 
-\noindent\texttt{n{-}{-}ame 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[c--ategory]
+\noindent\texttt{n{-}{-}ame 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[c--ategory]
 
 
 
@@ -3565,7 +3572,7 @@ d--eftypevr
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
 d--efcv
 
-\noindent\texttt{d{-}{-}efcv\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efcv\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
 
 
 
@@ -3586,7 +3593,7 @@ d--eftypecv
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name of 
c{-}{-}lass}}%
 d--eftypecv with arguments
 
-\noindent\texttt{d{-}{-}efop\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efop\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
 
 
 
@@ -3600,28 +3607,28 @@ d--efop
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name on c{-}{-}lass}}%
 d--efop no arg
 
-\noindent\texttt{d{-}{-}eftp\_name 
\EmbracOn{}\textsl{a{-}{-}ttributes...}}\hfill[c--ategory]
+\noindent\texttt{d{-}{-}eftp\_name 
\EmbracOn{}\textsl{a{-}{-}ttributes...}\EmbracOff{}}\hfill[c--ategory]
 
 
 
 \index[tp]{d--eftp\_name@\texttt{d{-}{-}eftp\_name}}%
 d--eftp
 
-\noindent\texttt{d{-}{-}efun\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[Function]
+\noindent\texttt{d{-}{-}efun\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[Function]
 
 
 
 \index[fn]{d--efun\_name@\texttt{d{-}{-}efun\_name}}%
 d--efun
 
-\noindent\texttt{d{-}{-}efmac\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[Macro]
+\noindent\texttt{d{-}{-}efmac\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[Macro]
 
 
 
 \index[fn]{d--efmac\_name@\texttt{d{-}{-}efmac\_name}}%
 d--efmac
 
-\noindent\texttt{d{-}{-}efspec\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[Special Form]
+\noindent\texttt{d{-}{-}efspec\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[Special Form]
 
 
 
@@ -3635,7 +3642,7 @@ d--efspec
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
 d--efvar
 
-\noindent\texttt{d{-}{-}efvar\_name \EmbracOn{}\textsl{arg{-}{-}var 
arg{-}{-}var1}}\hfill[Variable]
+\noindent\texttt{d{-}{-}efvar\_name \EmbracOn{}\textsl{arg{-}{-}var 
arg{-}{-}var1}\EmbracOff{}}\hfill[Variable]
 
 
 
@@ -3677,7 +3684,7 @@ d--efivar
 \index[cp]{d--eftypeivar\_name of c--lass@\texttt{d{-}{-}eftypeivar\_name of 
c{-}{-}lass}}%
 d--eftypeivar
 
-\noindent\texttt{d{-}{-}efmethod\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[Method on \texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efmethod\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[Method on 
\texttt{c{-}{-}lass}]
 
 
 
@@ -4019,39 +4026,39 @@ l--ine
 
 
 
-\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and}}\hfill[truc]
+\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose 
and}\EmbracOff{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and  
after}}\hfill[truc]
+\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and  
after}\EmbracOff{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and }}\hfill[truc]
+\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and 
}\EmbracOff{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and and 
after}}\hfill[truc]
+\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and and 
after}\EmbracOff{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{followed \EmbracOn{}\textsl{by a comment}}\hfill[truc]
+\noindent\texttt{followed \EmbracOn{}\textsl{by a 
comment}\EmbracOff{}}\hfill[truc]
 
 
 
 \index[fn]{followed@\texttt{followed}}%
 Various deff lines
-\noindent\texttt{after \EmbracOn{}\textsl{a deff item}}\hfill[truc]
+\noindent\texttt{after \EmbracOn{}\textsl{a deff item}\EmbracOff{}}\hfill[truc]
 
 
 
 \index[fn]{after@\texttt{after}}%
 
-\noindent\texttt{\textsl{invalid} \EmbracOn{}\textsl{a g}}\hfill[fsetinv]
+\noindent\texttt{\textsl{invalid} \EmbracOn{}\textsl{a 
g}\EmbracOff{}}\hfill[fsetinv]
 
 
 
@@ -4703,52 +4710,52 @@ f--ormat
 s--mallformat
 \endgroup{}%
 
-\noindent\texttt{d{-}{-}effn\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[c--ategory]
+\noindent\texttt{d{-}{-}effn\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[c--ategory]
 
 
 
 \index[fn]{d--effn\_name@\texttt{d{-}{-}effn\_name}}%
 d--effn
 
-\noindent\texttt{de{-}{-}ffn\_name \EmbracOn{}\textsl{ar{-}{-}guments    more 
args \leavevmode{}\\ even more so}}\hfill[cate--gory]
+\noindent\texttt{de{-}{-}ffn\_name \EmbracOn{}\textsl{ar{-}{-}guments    more 
args \leavevmode{}\\ even more so}\EmbracOff{}}\hfill[cate--gory]
 
 
 
 \index[fn]{de--ffn\_name@\texttt{de{-}{-}ffn\_name}}%
 def--fn
 
-\noindent\texttt{\textsl{i} \EmbracOn{}\textsl{a g}}\hfill[fset]
+\noindent\texttt{\textsl{i} \EmbracOn{}\textsl{a g}\EmbracOff{}}\hfill[fset]
 
 
 
 \index[fn]{i@\texttt{\textsl{i}}}%
 \index[cp]{index entry within deffn}%
-\noindent\texttt{truc \EmbracOn{}\textsl{}}\hfill[cmde]
+\noindent\texttt{truc \EmbracOn{}\textsl{}\EmbracOff{}}\hfill[cmde]
 
 
 
 \index[fn]{truc@\texttt{truc}}%
-\noindent\texttt{log trap \EmbracOn{}\textsl{}}\hfill[Command]
+\noindent\texttt{log trap \EmbracOn{}\textsl{}\EmbracOff{}}\hfill[Command]
 
 
 
 \index[fn]{log trap@\texttt{log trap}}%
-\noindent\texttt{log trap1 \EmbracOn{}\textsl{}}\hfill[Command]
+\noindent\texttt{log trap1 \EmbracOn{}\textsl{}\EmbracOff{}}\hfill[Command]
 
 
 
 \index[fn]{log trap1@\texttt{log trap1}}%
-\noindent\texttt{log trap2 \EmbracOn{}\textsl{}}\hfill[Command]
+\noindent\texttt{log trap2 \EmbracOn{}\textsl{}\EmbracOff{}}\hfill[Command]
 
 
 
 \index[fn]{log trap2@\texttt{log trap2}}%
-\noindent\texttt{\textbf{id ule} \EmbracOn{}\textsl{truc}}\hfill[cmde]
+\noindent\texttt{\textbf{id ule} 
\EmbracOn{}\textsl{truc}\EmbracOff{}}\hfill[cmde]
 
 
 
 \index[fn]{id ule@\texttt{\textbf{id ule}}}%
-\noindent\texttt{\textbf{id `\texttt{i}' ule} 
\EmbracOn{}\textsl{truc}}\hfill[cmde2]
+\noindent\texttt{\textbf{id `\texttt{i}' ule} 
\EmbracOn{}\textsl{truc}\EmbracOff{}}\hfill[cmde2]
 
 
 
@@ -4776,7 +4783,7 @@ def--fn
 
 
 
-\noindent\texttt{followed \EmbracOn{}\textsl{by a comment}}\hfill[truc]
+\noindent\texttt{followed \EmbracOn{}\textsl{by a 
comment}\EmbracOff{}}\hfill[truc]
 
 
 
@@ -4785,12 +4792,14 @@ def--fn
 
 
 
-\noindent\texttt{a \EmbracOn{}\textsl{b c d e \EmbracOff{}\textbf{f 
g}\EmbracOn{} h i}}\hfill[truc]
-
+\noindent\texttt{a \EmbracOn{}\textsl{b c d e 
\EmbracMakeKnown{textbf}\textbf{f g} h i}\EmbracOff{}}\hfill[truc]
 
 
+\ExplSyntaxOn%
+\cs_undefine:N{\embrac_textbf:nn}\cs_undefine:N{\embrac_orig_textbf:n}\cs_undefine:N{\__embrac_textbf:n}%
+\ExplSyntaxOff%
 \index[fn]{a@\texttt{a}}%
-\noindent\texttt{deffnx \EmbracOn{}\textsl{before end deffn}}\hfill[truc]
+\noindent\texttt{deffnx \EmbracOn{}\textsl{before end 
deffn}\EmbracOff{}}\hfill[truc]
 
 
 
@@ -4803,7 +4812,7 @@ def--fn
 
 \index[fn]{deffn@\texttt{deffn}}%
 
-\noindent\texttt{deffn \EmbracOn{}\textsl{with deffnx}}\hfill[empty]
+\noindent\texttt{deffn \EmbracOn{}\textsl{with 
deffnx}\EmbracOff{}}\hfill[empty]
 
 
 
@@ -4814,12 +4823,12 @@ def--fn
 
 \index[fn]{deffnx@\texttt{deffnx}}%
 
-\noindent\texttt{\textsl{i} \EmbracOn{}\textsl{a g}}\hfill[fset]
+\noindent\texttt{\textsl{i} \EmbracOn{}\textsl{a g}\EmbracOff{}}\hfill[fset]
 
 
 
 \index[fn]{i@\texttt{\textsl{i}}}%
-\noindent\texttt{truc \EmbracOn{}\textsl{}}\hfill[cmde]
+\noindent\texttt{truc \EmbracOn{}\textsl{}\EmbracOff{}}\hfill[cmde]
 
 
 
@@ -4834,7 +4843,7 @@ text in def item for second def item
 \index[cp]{d--efvr\_name@\texttt{d{-}{-}efvr\_name}}%
 d--efvr
 
-\noindent\texttt{n{-}{-}ame 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[c--ategory]
+\noindent\texttt{n{-}{-}ame 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[c--ategory]
 
 
 
@@ -4890,7 +4899,7 @@ d--eftypevr
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
 d--efcv
 
-\noindent\texttt{d{-}{-}efcv\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efcv\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
 
 
 
@@ -4911,7 +4920,7 @@ d--eftypecv
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name of 
c{-}{-}lass}}%
 d--eftypecv with arguments
 
-\noindent\texttt{d{-}{-}efop\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efop\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
 
 
 
@@ -4925,28 +4934,28 @@ d--efop
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name on c{-}{-}lass}}%
 d--efop no arg
 
-\noindent\texttt{d{-}{-}eftp\_name 
\EmbracOn{}\textsl{a{-}{-}ttributes...}}\hfill[c--ategory]
+\noindent\texttt{d{-}{-}eftp\_name 
\EmbracOn{}\textsl{a{-}{-}ttributes...}\EmbracOff{}}\hfill[c--ategory]
 
 
 
 \index[tp]{d--eftp\_name@\texttt{d{-}{-}eftp\_name}}%
 d--eftp
 
-\noindent\texttt{d{-}{-}efun\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[Function]
+\noindent\texttt{d{-}{-}efun\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[Function]
 
 
 
 \index[fn]{d--efun\_name@\texttt{d{-}{-}efun\_name}}%
 d--efun
 
-\noindent\texttt{d{-}{-}efmac\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[Macro]
+\noindent\texttt{d{-}{-}efmac\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[Macro]
 
 
 
 \index[fn]{d--efmac\_name@\texttt{d{-}{-}efmac\_name}}%
 d--efmac
 
-\noindent\texttt{d{-}{-}efspec\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[Special Form]
+\noindent\texttt{d{-}{-}efspec\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[Special Form]
 
 
 
@@ -4960,7 +4969,7 @@ d--efspec
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
 d--efvar
 
-\noindent\texttt{d{-}{-}efvar\_name \EmbracOn{}\textsl{arg{-}{-}var 
arg{-}{-}var1}}\hfill[Variable]
+\noindent\texttt{d{-}{-}efvar\_name \EmbracOn{}\textsl{arg{-}{-}var 
arg{-}{-}var1}\EmbracOff{}}\hfill[Variable]
 
 
 
@@ -5002,7 +5011,7 @@ d--efivar
 \index[cp]{d--eftypeivar\_name of c--lass@\texttt{d{-}{-}eftypeivar\_name of 
c{-}{-}lass}}%
 d--eftypeivar
 
-\noindent\texttt{d{-}{-}efmethod\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[Method on \texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efmethod\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[Method on 
\texttt{c{-}{-}lass}]
 
 
 
@@ -5344,39 +5353,39 @@ l--ine
 
 
 
-\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and}}\hfill[truc]
+\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose 
and}\EmbracOff{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and  
after}}\hfill[truc]
+\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and  
after}\EmbracOff{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and }}\hfill[truc]
+\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and 
}\EmbracOff{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and and 
after}}\hfill[truc]
+\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and and 
after}\EmbracOff{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{followed \EmbracOn{}\textsl{by a comment}}\hfill[truc]
+\noindent\texttt{followed \EmbracOn{}\textsl{by a 
comment}\EmbracOff{}}\hfill[truc]
 
 
 
 \index[fn]{followed@\texttt{followed}}%
 Various deff lines
-\noindent\texttt{after \EmbracOn{}\textsl{a deff item}}\hfill[truc]
+\noindent\texttt{after \EmbracOn{}\textsl{a deff item}\EmbracOff{}}\hfill[truc]
 
 
 
 \index[fn]{after@\texttt{after}}%
 
-\noindent\texttt{\textsl{invalid} \EmbracOn{}\textsl{a g}}\hfill[fsetinv]
+\noindent\texttt{\textsl{invalid} \EmbracOn{}\textsl{a 
g}\EmbracOff{}}\hfill[fsetinv]
 
 
 
@@ -6283,7 +6292,7 @@ s--mallformat
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt{d{-}{-}effn\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[c--ategory]
+\noindent\texttt{d{-}{-}effn\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[c--ategory]
 
 
 
@@ -6294,7 +6303,7 @@ d{-}{-}effn
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt{de{-}{-}ffn\_name \EmbracOn{}\textsl{ar{-}{-}guments    more 
args \leavevmode{}\\ even more so}}\hfill[cate--gory]
+\noindent\texttt{de{-}{-}ffn\_name \EmbracOn{}\textsl{ar{-}{-}guments    more 
args \leavevmode{}\\ even more so}\EmbracOff{}}\hfill[cate--gory]
 
 
 
@@ -6305,7 +6314,7 @@ def{-}{-}fn
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt{\textsl{i} \EmbracOn{}\textsl{a g}}\hfill[fset]
+\noindent\texttt{\textsl{i} \EmbracOn{}\textsl{a g}\EmbracOff{}}\hfill[fset]
 
 
 
@@ -6313,32 +6322,32 @@ def{-}{-}fn
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 \index[cp]{index entry within deffn}%
 \endgroup{}%
-\noindent\texttt{truc \EmbracOn{}\textsl{}}\hfill[cmde]
+\noindent\texttt{truc \EmbracOn{}\textsl{}\EmbracOff{}}\hfill[cmde]
 
 
 
 \index[fn]{truc@\texttt{truc}}%
-\noindent\texttt{log trap \EmbracOn{}\textsl{}}\hfill[Command]
+\noindent\texttt{log trap \EmbracOn{}\textsl{}\EmbracOff{}}\hfill[Command]
 
 
 
 \index[fn]{log trap@\texttt{log trap}}%
-\noindent\texttt{log trap1 \EmbracOn{}\textsl{}}\hfill[Command]
+\noindent\texttt{log trap1 \EmbracOn{}\textsl{}\EmbracOff{}}\hfill[Command]
 
 
 
 \index[fn]{log trap1@\texttt{log trap1}}%
-\noindent\texttt{log trap2 \EmbracOn{}\textsl{}}\hfill[Command]
+\noindent\texttt{log trap2 \EmbracOn{}\textsl{}\EmbracOff{}}\hfill[Command]
 
 
 
 \index[fn]{log trap2@\texttt{log trap2}}%
-\noindent\texttt{\textbf{id ule} \EmbracOn{}\textsl{truc}}\hfill[cmde]
+\noindent\texttt{\textbf{id ule} 
\EmbracOn{}\textsl{truc}\EmbracOff{}}\hfill[cmde]
 
 
 
 \index[fn]{id ule@\texttt{\textbf{id ule}}}%
-\noindent\texttt{\textbf{id `\texttt{i}' ule} 
\EmbracOn{}\textsl{truc}}\hfill[cmde2]
+\noindent\texttt{\textbf{id `\texttt{i}' ule} 
\EmbracOn{}\textsl{truc}\EmbracOff{}}\hfill[cmde2]
 
 
 
@@ -6366,7 +6375,7 @@ def{-}{-}fn
 
 
 
-\noindent\texttt{followed \EmbracOn{}\textsl{by a comment}}\hfill[truc]
+\noindent\texttt{followed \EmbracOn{}\textsl{by a 
comment}\EmbracOff{}}\hfill[truc]
 
 
 
@@ -6377,12 +6386,14 @@ def{-}{-}fn
 
 
 
-\noindent\texttt{a \EmbracOn{}\textsl{b c d e \EmbracOff{}\textbf{f 
g}\EmbracOn{} h i}}\hfill[truc]
-
+\noindent\texttt{a \EmbracOn{}\textsl{b c d e 
\EmbracMakeKnown{textbf}\textbf{f g} h i}\EmbracOff{}}\hfill[truc]
 
 
+\ExplSyntaxOn%
+\cs_undefine:N{\embrac_textbf:nn}\cs_undefine:N{\embrac_orig_textbf:n}\cs_undefine:N{\__embrac_textbf:n}%
+\ExplSyntaxOff%
 \index[fn]{a@\texttt{a}}%
-\noindent\texttt{deffnx \EmbracOn{}\textsl{before end deffn}}\hfill[truc]
+\noindent\texttt{deffnx \EmbracOn{}\textsl{before end 
deffn}\EmbracOff{}}\hfill[truc]
 
 
 
@@ -6399,7 +6410,7 @@ def{-}{-}fn
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt{deffn \EmbracOn{}\textsl{with deffnx}}\hfill[empty]
+\noindent\texttt{deffn \EmbracOn{}\textsl{with 
deffnx}\EmbracOff{}}\hfill[empty]
 
 
 
@@ -6414,12 +6425,12 @@ def{-}{-}fn
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt{\textsl{i} \EmbracOn{}\textsl{a g}}\hfill[fset]
+\noindent\texttt{\textsl{i} \EmbracOn{}\textsl{a g}\EmbracOff{}}\hfill[fset]
 
 
 
 \index[fn]{i@\texttt{\textsl{i}}}%
-\noindent\texttt{truc \EmbracOn{}\textsl{}}\hfill[cmde]
+\noindent\texttt{truc \EmbracOn{}\textsl{}\EmbracOff{}}\hfill[cmde]
 
 
 
@@ -6442,7 +6453,7 @@ d{-}{-}efvr
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt{n{-}{-}ame 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[c--ategory]
+\noindent\texttt{n{-}{-}ame 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[c--ategory]
 
 
 
@@ -6530,7 +6541,7 @@ d{-}{-}efcv
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt{d{-}{-}efcv\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efcv\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
 
 
 
@@ -6563,7 +6574,7 @@ d{-}{-}eftypecv with arguments
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt{d{-}{-}efop\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efop\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
 
 
 
@@ -6585,7 +6596,7 @@ d{-}{-}efop no arg
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt{d{-}{-}eftp\_name 
\EmbracOn{}\textsl{a{-}{-}ttributes...}}\hfill[c--ategory]
+\noindent\texttt{d{-}{-}eftp\_name 
\EmbracOn{}\textsl{a{-}{-}ttributes...}\EmbracOff{}}\hfill[c--ategory]
 
 
 
@@ -6596,7 +6607,7 @@ d{-}{-}eftp
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt{d{-}{-}efun\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[Function]
+\noindent\texttt{d{-}{-}efun\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[Function]
 
 
 
@@ -6607,7 +6618,7 @@ d{-}{-}efun
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt{d{-}{-}efmac\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[Macro]
+\noindent\texttt{d{-}{-}efmac\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[Macro]
 
 
 
@@ -6618,7 +6629,7 @@ d{-}{-}efmac
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt{d{-}{-}efspec\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[Special Form]
+\noindent\texttt{d{-}{-}efspec\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[Special Form]
 
 
 
@@ -6640,7 +6651,7 @@ d{-}{-}efvar
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt{d{-}{-}efvar\_name \EmbracOn{}\textsl{arg{-}{-}var 
arg{-}{-}var1}}\hfill[Variable]
+\noindent\texttt{d{-}{-}efvar\_name \EmbracOn{}\textsl{arg{-}{-}var 
arg{-}{-}var1}\EmbracOff{}}\hfill[Variable]
 
 
 
@@ -6706,7 +6717,7 @@ d{-}{-}eftypeivar
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt{d{-}{-}efmethod\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}}\hfill[Method on \texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efmethod\_name 
\EmbracOn{}\textsl{a{-}{-}rguments...}\EmbracOff{}}\hfill[Method on 
\texttt{c{-}{-}lass}]
 
 
 
@@ -7184,27 +7195,27 @@ l{-}{-}ine
 
 
 
-\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and}}\hfill[truc]
+\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose 
and}\EmbracOff{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and  
after}}\hfill[truc]
+\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and  
after}\EmbracOff{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and }}\hfill[truc]
+\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and 
}\EmbracOff{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and and 
after}}\hfill[truc]
+\noindent\texttt{machin \EmbracOn{}\textsl{bidule chose and and 
after}\EmbracOff{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{followed \EmbracOn{}\textsl{by a comment}}\hfill[truc]
+\noindent\texttt{followed \EmbracOn{}\textsl{by a 
comment}\EmbracOff{}}\hfill[truc]
 
 
 
@@ -7212,7 +7223,7 @@ l{-}{-}ine
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 Various deff lines
 \endgroup{}%
-\noindent\texttt{after \EmbracOn{}\textsl{a deff item}}\hfill[truc]
+\noindent\texttt{after \EmbracOn{}\textsl{a deff item}\EmbracOff{}}\hfill[truc]
 
 
 
@@ -7220,7 +7231,7 @@ Various deff lines
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt{\textsl{invalid} \EmbracOn{}\textsl{a g}}\hfill[fsetinv]
+\noindent\texttt{\textsl{invalid} \EmbracOn{}\textsl{a 
g}\EmbracOff{}}\hfill[fsetinv]
 
 
 



reply via email to

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