texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: Add more tests for @var in definition commands.


From: Patrice Dumas
Subject: branch master updated: Add more tests for @var in definition commands.
Date: Wed, 10 Aug 2022 05:07:11 -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 b2d467c55d Add more tests for @var in definition commands.
b2d467c55d is described below

commit b2d467c55d46156b3012bfa78143c9518285ba05
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Aug 10 11:06:48 2022 +0200

    Add more tests for @var in definition commands.
---
 tp/t/converters_tests.t                            |    6 +
 .../converters_tests/definition_commands.pl        | 9140 ++++++++++++--------
 .../definition_commands/res_html/chapter.html      |   88 +-
 .../res_latex/definition_commands.tex              |   30 +
 4 files changed, 5646 insertions(+), 3618 deletions(-)

diff --git a/tp/t/converters_tests.t b/tp/t/converters_tests.t
index e29bcefb58..4540f77ce1 100644
--- a/tp/t/converters_tests.t
+++ b/tp/t/converters_tests.t
@@ -821,10 +821,12 @@ deffn r slanted for @var{a---rg1} and @var{a--rg2}
 
 @defspec foobar (var [from to [inc]]) default
 @defspecx foobar (var @r{[}from to @r{[}inc@r{]]}) r
+@defspecx foobar (var @var{[}from to @var{[}inc@var{]]}) var
 @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{@var{[}}from to @r{@var{[}}inc@r{@var{]]}}) r:var
 @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
@@ -898,10 +900,12 @@ In deffn with code and var used
 
 @deftypefn {Library Function} int foobar  (int @var{f---oo}[, float 
@var{b--ar}]) default
 @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}@var{[}, float 
@var{b--ar}@var{]}) var
 @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{@var{[}}, float 
@var{b--ar}@r{@var{]}}) r:var
 @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
@@ -910,10 +914,12 @@ separators
 
 @deftypefn {Library Function} int foobar  (i--nt @var{f---oo}[, float 
@var{b--ar}]) default
 @deftypefnx {Library Function} int foobar  (@r{i--nt} @var{f---oo}[, float 
@var{b--ar}]) r
+@deftypefnx {Library Function} int foobar  (@var{i--nt} @var{f---oo}[, float 
@var{b--ar}]) var
 @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{@var{i--nt}} @var{f---oo}[, 
float @var{b--ar}]) r:var
 @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
diff --git a/tp/t/results/converters_tests/definition_commands.pl 
b/tp/t/results/converters_tests/definition_commands.pl
index e5e8535ea5..8c31de6aad 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -1497,7 +1497,7 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'slanted',
+                      'cmdname' => 'var',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -1552,7 +1552,7 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'slanted',
+                      'cmdname' => 'var',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -1584,7 +1584,7 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'slanted',
+                      'cmdname' => 'var',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -1617,7 +1617,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'slanted'
+                      'text' => 'var'
                     },
                     {
                       'extra' => {
@@ -1743,7 +1743,7 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'code',
+                      'cmdname' => 'slanted',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -1798,7 +1798,7 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'code',
+                      'cmdname' => 'slanted',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -1830,7 +1830,7 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'code',
+                      'cmdname' => 'slanted',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -1863,7 +1863,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'code'
+                      'text' => 'slanted'
                     },
                     {
                       'extra' => {
@@ -1989,7 +1989,7 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 't',
+                      'cmdname' => 'code',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -2044,7 +2044,7 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 't',
+                      'cmdname' => 'code',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -2076,7 +2076,7 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 't',
+                      'cmdname' => 'code',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -2109,7 +2109,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 't'
+                      'text' => 'code'
                     },
                     {
                       'extra' => {
@@ -2227,26 +2227,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => '['
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'b',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 26,
-                                'macro' => ''
-                              }
+                              'text' => '['
                             }
                           ],
                           'parent' => {},
@@ -2300,26 +2282,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => '['
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'b',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 26,
-                                'macro' => ''
-                              }
+                              'text' => '['
                             }
                           ],
                           'parent' => {},
@@ -2350,26 +2314,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => ']]'
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'b',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 26,
-                                'macro' => ''
-                              }
+                              'text' => ']]'
                             }
                           ],
                           'parent' => {},
@@ -2409,7 +2355,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 't:b'
+                      'text' => 't'
                     },
                     {
                       'extra' => {
@@ -2539,7 +2485,7 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 'slanted',
+                              'cmdname' => 'b',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
@@ -2553,7 +2499,7 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -2612,7 +2558,7 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 'slanted',
+                              'cmdname' => 'b',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
@@ -2626,7 +2572,7 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -2662,7 +2608,7 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 'slanted',
+                              'cmdname' => 'b',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
@@ -2676,7 +2622,7 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -2709,7 +2655,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'r:slanted'
+                      'text' => 't:b'
                     },
                     {
                       'extra' => {
@@ -2839,7 +2785,7 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 'code',
+                              'cmdname' => 'var',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
@@ -2912,7 +2858,7 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 'code',
+                              'cmdname' => 'var',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
@@ -2962,7 +2908,7 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 'code',
+                              'cmdname' => 'var',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
@@ -3009,7 +2955,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'r:code'
+                      'text' => 'r:var'
                     },
                     {
                       'extra' => {
@@ -3139,7 +3085,7 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 't',
+                              'cmdname' => 'slanted',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
@@ -3212,7 +3158,7 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 't',
+                              'cmdname' => 'slanted',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
@@ -3262,7 +3208,7 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 't',
+                              'cmdname' => 'slanted',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
@@ -3309,7 +3255,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'r:t'
+                      'text' => 'r:slanted'
                     },
                     {
                       'extra' => {
@@ -3359,74 +3305,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' => 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' => [
                 {
@@ -3467,12 +3345,20 @@ $result_trees{'definition_commands'} = {
                       'text' => ' ',
                       'type' => 'spaces'
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '(',
+                      'type' => 'delimiter'
+                    },
                     {
                       'extra' => {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'va---riable'
+                      'text' => 'var'
                     },
                     {
                       'extra' => {
@@ -3482,75 +3368,55 @@ $result_trees{'definition_commands'} = {
                       'text' => ' ',
                       'type' => 'spaces'
                     },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '['
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'code',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 30,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 30,
+                        'macro' => ''
+                      }
+                    },
                     {
                       'extra' => {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'default'
-                    },
-                    {
-                      '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' => 13
-                },
-                'original_def_cmdname' => 'defspec'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 33,
-                'macro' => ''
-              },
-              'type' => 'def_line'
-            },
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'contents' => [
-                        {
-                          'parent' => {},
-                          'text' => 'Special Form'
-                        }
-                      ],
-                      'extra' => {
-                        'def_role' => 'category'
-                      },
-                      'parent' => {},
-                      'type' => 'bracketed_inserted'
+                      'text' => 'from'
                     },
                     {
                       'extra' => {
@@ -3558,14 +3424,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' => {
@@ -3580,15 +3446,33 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '['
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'code',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'va---riable'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 30,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 'r',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -3596,120 +3480,42 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 34,
+                        'line_nr' => 30,
                         'macro' => ''
                       }
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
                     {
                       'extra' => {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'var'
-                    },
-                    {
-                      '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' => 14
-                },
-                'original_def_cmdname' => 'defspecx',
-                'spaces_before_argument' => ' '
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 34,
-                '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'
+                      'text' => 'inc'
                     },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ']]'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'code',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'va---riable'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 30,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
@@ -3724,10 +3530,18 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 35,
+                        'line_nr' => 30,
                         'macro' => ''
                       }
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ')',
+                      'type' => 'delimiter'
+                    },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
@@ -3741,7 +3555,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'r'
+                      'text' => 'r:code'
                     },
                     {
                       'extra' => {
@@ -3778,7 +3592,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec',
                   'node' => {},
-                  'number' => 15
+                  'number' => 13
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -3786,7 +3600,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 35,
+                'line_nr' => 30,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -3831,20 +3645,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' => 31,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'slanted',
+                      'cmdname' => 'r',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -3852,10 +3707,17 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 36,
+                        'line_nr' => 31,
                         'macro' => ''
                       }
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'text' => 'from'
+                    },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
@@ -3869,18 +3731,142 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'slanted'
+                      'text' => 'to'
                     },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => '
-',
-                      'type' => 'spaces_at_end'
-                    }
-                  ],
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '['
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 't',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 31,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 31,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'text' => 'inc'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ']]'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 't',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 31,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 31,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ')',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'text' => 'r:t'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
                   'parent' => {},
                   'type' => 'line_arg'
                 }
@@ -3906,7 +3892,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec',
                   'node' => {},
-                  'number' => 16
+                  'number' => 14
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -3914,11 +3900,79 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
+                'line_nr' => 31,
                 'macro' => ''
               },
               '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' => 33,
+                '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' => [
                 {
@@ -3960,29 +4014,11 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => 'va---riable'
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'code',
-                      'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 37,
-                        'macro' => ''
-                      }
+                      'text' => 'va---riable'
                     },
                     {
                       'extra' => {
@@ -3997,7 +4033,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'code'
+                      'text' => 'default'
                     },
                     {
                       'extra' => {
@@ -4010,10 +4046,9 @@ $result_trees{'definition_commands'} = {
                     }
                   ],
                   'parent' => {},
-                  'type' => 'line_arg'
+                  'type' => 'block_line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
               'extra' => {
                 'def_command' => 'defspec',
                 'def_parsed_hash' => {
@@ -4029,20 +4064,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' => 17
+                  'number' => 15
                 },
-                'original_def_cmdname' => 'defspecx',
-                'spaces_before_argument' => ' '
+                'original_def_cmdname' => 'defspec'
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 37,
+                'line_nr' => 35,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -4100,7 +4134,7 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 't',
+                      'cmdname' => 'var',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -4108,7 +4142,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 38,
+                        'line_nr' => 36,
                         'macro' => ''
                       }
                     },
@@ -4125,7 +4159,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 't'
+                      'text' => 'var'
                     },
                     {
                       'extra' => {
@@ -4162,7 +4196,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec',
                   'node' => {},
-                  'number' => 18
+                  'number' => 16
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -4170,7 +4204,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 38,
+                'line_nr' => 36,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -4220,33 +4254,15 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => 'va---riable'
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'b',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 39,
-                                'macro' => ''
-                              }
+                              'text' => 'va---riable'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 't',
+                      'cmdname' => 'r',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -4254,7 +4270,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 39,
+                        'line_nr' => 37,
                         'macro' => ''
                       }
                     },
@@ -4271,7 +4287,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 't:b'
+                      'text' => 'r'
                     },
                     {
                       'extra' => {
@@ -4308,7 +4324,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec',
                   'node' => {},
-                  'number' => 19
+                  'number' => 17
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -4316,7 +4332,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 39,
+                'line_nr' => 37,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -4366,33 +4382,15 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => 'va---riable'
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'var',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 40,
-                                'macro' => ''
-                              }
+                              'text' => 'va---riable'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 'slanted',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -4400,7 +4398,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 40,
+                        'line_nr' => 38,
                         'macro' => ''
                       }
                     },
@@ -4417,7 +4415,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'r:var'
+                      'text' => 'slanted'
                     },
                     {
                       'extra' => {
@@ -4454,7 +4452,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec',
                   'node' => {},
-                  'number' => 20
+                  'number' => 18
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -4462,7 +4460,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 40,
+                'line_nr' => 38,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -4512,33 +4510,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' => 41,
-                                'macro' => ''
-                              }
+                              'text' => 'va---riable'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 'code',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -4546,7 +4526,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 41,
+                        'line_nr' => 39,
                         'macro' => ''
                       }
                     },
@@ -4563,7 +4543,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'r:slanted'
+                      'text' => 'code'
                     },
                     {
                       'extra' => {
@@ -4600,7 +4580,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec',
                   'node' => {},
-                  'number' => 21
+                  'number' => 19
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -4608,7 +4588,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 41,
+                'line_nr' => 39,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -4658,33 +4638,15 @@ $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' => 42,
-                                'macro' => ''
-                              }
+                              'text' => 'va---riable'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -4692,7 +4654,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 42,
+                        'line_nr' => 40,
                         'macro' => ''
                       }
                     },
@@ -4709,7 +4671,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'r:code'
+                      'text' => 't'
                     },
                     {
                       'extra' => {
@@ -4746,7 +4708,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec',
                   'node' => {},
-                  'number' => 22
+                  'number' => 20
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -4754,7 +4716,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 42,
+                'line_nr' => 40,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -4816,12 +4778,12 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 't',
+                              'cmdname' => 'b',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 43,
+                                'line_nr' => 41,
                                 'macro' => ''
                               }
                             }
@@ -4830,7 +4792,7 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -4838,7 +4800,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 43,
+                        'line_nr' => 41,
                         'macro' => ''
                       }
                     },
@@ -4855,7 +4817,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'r:t'
+                      'text' => 't:b'
                     },
                     {
                       'extra' => {
@@ -4892,7 +4854,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec',
                   'node' => {},
-                  'number' => 23
+                  'number' => 21
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -4900,89 +4862,27 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
+                'line_nr' => 41,
                 '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' => [
                     {
+                      'contents' => [
+                        {
+                          'parent' => {},
+                          'text' => 'Special Form'
+                        }
+                      ],
                       'extra' => {
                         'def_role' => 'category'
                       },
                       'parent' => {},
-                      'text' => 'Request'
+                      'type' => 'bracketed_inserted'
                     },
                     {
                       'extra' => {
@@ -4990,32 +4890,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' => 47,
-                        'macro' => ''
-                      }
+                      'text' => 'foobar'
                     },
                     {
                       'extra' => {
@@ -5025,14 +4907,6 @@ $result_trees{'definition_commands'} = {
                       'text' => ' ',
                       'type' => 'spaces'
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'delimiter'
-                      },
-                      'parent' => {},
-                      'text' => '[',
-                      'type' => 'delimiter'
-                    },
                     {
                       'args' => [
                         {
@@ -5043,19 +4917,19 @@ $result_trees{'definition_commands'} = {
                                   'contents' => [
                                     {
                                       'parent' => {},
-                                      'text' => 'font'
+                                      'text' => 'va---riable'
                                     }
                                   ],
                                   'parent' => {},
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 'slanted',
+                              'cmdname' => 'var',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 47,
+                                'line_nr' => 42,
                                 'macro' => ''
                               }
                             }
@@ -5072,17 +4946,24 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 47,
+                        'line_nr' => 42,
                         'macro' => ''
                       }
                     },
                     {
                       'extra' => {
-                        'def_role' => 'delimiter'
+                        'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => ']',
-                      'type' => 'delimiter'
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'text' => 'r:var'
                     },
                     {
                       'extra' => {
@@ -5095,11 +4976,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' => {}
@@ -5113,19 +4995,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' => 24
+                  'number' => 22
                 },
-                'original_def_cmdname' => 'deffn'
+                'original_def_cmdname' => 'defspecx',
+                'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 47,
+                'line_nr' => 42,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -5138,35 +5021,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' => 48,
-                            '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' => {
@@ -5177,92 +5054,62 @@ $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' => 48,
-                            'macro' => ''
-                          }
-                        },
+                      'args' => [
                         {
-                          'args' => [
+                          'contents' => [
                             {
-                              'contents' => [
+                              'args' => [
                                 {
-                                  'args' => [
+                                  'contents' => [
                                     {
-                                      'contents' => [
-                                        {
-                                          'parent' => {},
-                                          'text' => 'f'
-                                        }
-                                      ],
                                       'parent' => {},
-                                      'type' => 'brace_command_arg'
+                                      'text' => 'va---riable'
                                     }
                                   ],
-                                  'cmdname' => 'slanted',
-                                  'contents' => [],
                                   'parent' => {},
-                                  'source_info' => {
-                                    'file_name' => '',
-                                    'line_nr' => 48,
-                                    'macro' => ''
-                                  }
+                                  'type' => 'brace_command_arg'
                                 }
                               ],
-                              'parent' => {},
-                              'type' => 'brace_command_arg'
-                            }
-                          ],
-                          'cmdname' => 'r',
-                          'contents' => [],
-                          'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 48,
-                            'macro' => ''
-                          }
-                        },
-                        {
-                          'args' => [
-                            {
+                              'cmdname' => 'slanted',
                               'contents' => [],
                               'parent' => {},
-                              'type' => 'brace_command_arg'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 43,
+                                'macro' => ''
+                              }
                             }
                           ],
-                          'cmdname' => 't',
-                          'contents' => [],
                           'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 48,
-                            'macro' => ''
-                          }
+                          'type' => 'brace_command_arg'
                         }
                       ],
+                      'cmdname' => 'r',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'name'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'type' => 'def_aggregate'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 43,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'text' => 'r:slanted'
                     },
                     {
                       'extra' => {
@@ -5278,9 +5125,9 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
+              'cmdname' => 'defspecx',
               'extra' => {
-                'def_command' => 'deffn',
+                'def_command' => 'defspec',
                 'def_parsed_hash' => {
                   'category' => {},
                   'name' => {}
@@ -5294,20 +5141,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' => 25
+                  'number' => 23
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 48,
+                'line_nr' => 43,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -5320,35 +5167,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' => 49,
-                            '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' => {
@@ -5359,92 +5200,62 @@ $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' => 49,
-                            'macro' => ''
-                          }
-                        },
+                      'args' => [
                         {
-                          'args' => [
+                          'contents' => [
                             {
-                              'contents' => [
+                              'args' => [
                                 {
-                                  'args' => [
+                                  'contents' => [
                                     {
-                                      'contents' => [
-                                        {
-                                          'parent' => {},
-                                          'text' => 'fn'
-                                        }
-                                      ],
                                       'parent' => {},
-                                      'type' => 'brace_command_arg'
+                                      'text' => 'va---riable'
                                     }
                                   ],
-                                  'cmdname' => 'slanted',
-                                  'contents' => [],
                                   'parent' => {},
-                                  'source_info' => {
-                                    'file_name' => '',
-                                    'line_nr' => 49,
-                                    'macro' => ''
-                                  }
+                                  'type' => 'brace_command_arg'
                                 }
                               ],
-                              'parent' => {},
-                              'type' => 'brace_command_arg'
-                            }
-                          ],
-                          'cmdname' => 'r',
-                          'contents' => [],
-                          'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 49,
-                            'macro' => ''
-                          }
-                        },
-                        {
-                          'args' => [
-                            {
+                              'cmdname' => 'code',
                               'contents' => [],
                               'parent' => {},
-                              'type' => 'brace_command_arg'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 44,
+                                'macro' => ''
+                              }
                             }
                           ],
-                          'cmdname' => 't',
-                          'contents' => [],
                           'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 49,
-                            'macro' => ''
-                          }
+                          'type' => 'brace_command_arg'
                         }
                       ],
+                      'cmdname' => 'r',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'name'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'type' => 'def_aggregate'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 44,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'text' => 'r:code'
                     },
                     {
                       'extra' => {
@@ -5460,9 +5271,9 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
+              'cmdname' => 'defspecx',
               'extra' => {
-                'def_command' => 'deffn',
+                'def_command' => 'defspec',
                 'def_parsed_hash' => {
                   'category' => {},
                   'name' => {}
@@ -5476,20 +5287,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' => 26
+                  'number' => 24
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 49,
+                'line_nr' => 44,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -5502,35 +5313,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' => 50,
-                            'macro' => ''
-                          }
-                        },
-                        {
-                          'parent' => {},
-                          'text' => 'sequence'
+                          'text' => 'Special Form'
                         }
                       ],
                       'extra' => {
                         'def_role' => 'category'
                       },
                       'parent' => {},
-                      'type' => 'def_aggregate'
+                      'type' => 'bracketed_inserted'
                     },
                     {
                       'extra' => {
@@ -5538,100 +5328,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' => 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' => ''
-                          }
-                        }
-                      ],
                       'extra' => {
                         'def_role' => 'name'
                       },
                       'parent' => {},
-                      'type' => 'def_aggregate'
+                      'text' => 'foobar'
                     },
                     {
                       'extra' => {
@@ -5641,31 +5345,6 @@ $result_trees{'definition_commands'} = {
                       'text' => ' ',
                       'type' => 'spaces'
                     },
-                    {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => '\\f['
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 't',
-                      'contents' => [],
-                      'extra' => {
-                        'def_role' => 'arg'
-                      },
-                      'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 50,
-                        'macro' => ''
-                      }
-                    },
                     {
                       'args' => [
                         {
@@ -5676,19 +5355,19 @@ $result_trees{'definition_commands'} = {
                                   'contents' => [
                                     {
                                       'parent' => {},
-                                      'text' => 'font'
+                                      'text' => 'va---riable'
                                     }
                                   ],
                                   'parent' => {},
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 'slanted',
+                              'cmdname' => 't',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 50,
+                                'line_nr' => 45,
                                 'macro' => ''
                               }
                             }
@@ -5705,34 +5384,24 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 50,
+                        'line_nr' => 45,
                         'macro' => ''
                       }
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => ']'
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 't',
-                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
                       'extra' => {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 50,
-                        'macro' => ''
-                      }
+                      'text' => 'r:t'
                     },
                     {
                       'extra' => {
@@ -5748,9 +5417,9 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
+              'cmdname' => 'defspecx',
               'extra' => {
-                'def_command' => 'deffn',
+                'def_command' => 'defspec',
                 'def_parsed_hash' => {
                   'category' => {},
                   'name' => {}
@@ -5764,50 +5433,118 @@ $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' => 27
+                  'number' => 25
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
+                'line_nr' => 45,
                 'macro' => ''
               },
               'type' => 'def_line'
             },
             {
-              'args' => [
+              'contents' => [
                 {
                   'contents' => [
                     {
-                      'extra' => {
-                        'def_role' => 'category'
-                      },
                       'parent' => {},
-                      'text' => 'Register'
-                    },
+                      'text' => 'name
+'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'paragraph'
+                }
+              ],
+              'parent' => {},
+              'type' => 'def_item'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
                     {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
-                    {
-                      'args' => [
+                      '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' => 47,
+                'macro' => ''
+              }
+            }
+          ],
+          'extra' => {
+            'end_command' => {},
+            'spaces_before_argument' => ' '
+          },
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 35,
+            'macro' => ''
+          }
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'cmdname' => 'deffn',
+          'contents' => [
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
+                      'parent' => {},
+                      'text' => 'Request'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
                         {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => '\\n[.sty]'
+                              'text' => '.ft'
                             }
                           ],
                           'parent' => {},
@@ -5822,10 +5559,77 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 51,
+                        'line_nr' => 49,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      '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' => 49,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 49,
                         'macro' => ''
                       }
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ']',
+                      'type' => 'delimiter'
+                    },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
@@ -5837,10 +5641,9 @@ $result_trees{'definition_commands'} = {
                     }
                   ],
                   'parent' => {},
-                  'type' => 'line_arg'
+                  'type' => 'block_line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
               'extra' => {
                 'def_command' => 'deffn',
                 'def_parsed_hash' => {
@@ -5856,245 +5659,205 @@ $result_trees{'definition_commands'} = {
                     {}
                   ],
                   'in_code' => 1,
-                  'index_at_command' => 'deffnx',
+                  'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
                   'index_type_command' => 'deffn',
                   'node' => {},
-                  'number' => 28
+                  'number' => 26
                 },
-                'original_def_cmdname' => 'deffnx',
-                'spaces_before_argument' => ' '
+                'original_def_cmdname' => 'deffn'
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 51,
+                'line_nr' => 49,
                 'macro' => ''
               },
               'type' => 'def_line'
             },
             {
-              'contents' => [
+              'args' => [
                 {
                   'contents' => [
                     {
-                      'parent' => {},
-                      'text' => 'The '
-                    },
-                    {
-                      'args' => [
+                      'contents' => [
                         {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => 'ft'
-                            }
-                          ],
                           'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'code',
-                      'contents' => [],
-                      'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 52,
-                        'macro' => ''
-                      }
-                    },
-                    {
-                      'parent' => {},
-                      'text' => ' request and the '
-                    },
-                    {
-                      'args' => [
+                          'text' => 'Escape'
+                        },
                         {
-                          'contents' => [
+                          'args' => [
                             {
+                              'contents' => [],
                               'parent' => {},
-                              'text' => '\\f'
+                              'type' => 'brace_command_arg'
                             }
                           ],
+                          'cmdname' => 'tie',
+                          'contents' => [],
                           'parent' => {},
-                          'type' => 'brace_command_arg'
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 50,
+                            'macro' => ''
+                          }
+                        },
+                        {
+                          'parent' => {},
+                          'text' => 'sequence'
                         }
                       ],
-                      'cmdname' => 'code',
-                      'contents' => [],
-                      'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 52,
-                        'macro' => ''
-                      }
-                    },
-                    {
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
                       'parent' => {},
-                      'text' => ' escape change the current font
-'
+                      'type' => 'def_aggregate'
                     },
                     {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       'parent' => {},
-                      'text' => 'to '
+                      'text' => ' ',
+                      'type' => 'spaces'
                     },
                     {
-                      'args' => [
+                      'contents' => [
                         {
-                          'contents' => [
+                          'args' => [
                             {
+                              'contents' => [
+                                {
+                                  'parent' => {},
+                                  'text' => '\\f'
+                                }
+                              ],
                               'parent' => {},
-                              'text' => 'font'
+                              'type' => 'brace_command_arg'
                             }
                           ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'var',
-                      'contents' => [],
-                      'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 53,
-                        'macro' => ''
-                      }
-                    },
-                    {
-                      'parent' => {},
-                      'text' => ' (one-character name'
-                    },
-                    {
-                      'args' => [
-                        {
+                          'cmdname' => 't',
                           'contents' => [],
                           'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'tie',
-                      'contents' => [],
-                      'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 53,
-                        'macro' => ''
-                      }
-                    },
-                    {
-                      'args' => [
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 50,
+                            'macro' => ''
+                          }
+                        },
                         {
-                          'contents' => [
+                          'args' => [
                             {
+                              'contents' => [
+                                {
+                                  'args' => [
+                                    {
+                                      'contents' => [
+                                        {
+                                          'parent' => {},
+                                          'text' => 'f'
+                                        }
+                                      ],
+                                      'parent' => {},
+                                      'type' => 'brace_command_arg'
+                                    }
+                                  ],
+                                  'cmdname' => 'slanted',
+                                  'contents' => [],
+                                  'parent' => {},
+                                  'source_info' => {
+                                    'file_name' => '',
+                                    'line_nr' => 50,
+                                    'macro' => ''
+                                  }
+                                }
+                              ],
                               'parent' => {},
-                              'text' => 'f'
+                              'type' => 'brace_command_arg'
                             }
                           ],
+                          'cmdname' => 'r',
+                          'contents' => [],
                           'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'var',
-                      'contents' => [],
-                      'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 53,
-                        'macro' => ''
-                      }
-                    },
-                    {
-                      'parent' => {},
-                      'text' => ', two-character name
-'
-                    },
-                    {
-                      'args' => [
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 50,
+                            'macro' => ''
+                          }
+                        },
                         {
-                          'contents' => [
+                          'args' => [
                             {
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'fn'
+                              'type' => 'brace_command_arg'
                             }
                           ],
+                          'cmdname' => 't',
+                          'contents' => [],
                           'parent' => {},
-                          'type' => 'brace_command_arg'
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 50,
+                            'macro' => ''
+                          }
                         }
                       ],
-                      'cmdname' => 'var',
-                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 54,
-                        'macro' => ''
-                      }
+                      'type' => 'def_aggregate'
                     },
                     {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       'parent' => {},
-                      'text' => ').
-'
-                    }
-                  ],
-                  'parent' => {},
-                  'type' => 'paragraph'
-                }
-              ],
-              'parent' => {},
-              'type' => 'def_item'
-            },
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'deffn'
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
                     }
                   ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
                   'parent' => {},
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'end',
+              'cmdname' => 'deffnx',
               'extra' => {
-                'command_argument' => 'deffn',
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'deffn'
+                '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' => 55,
+                'line_nr' => 50,
                 'macro' => ''
-              }
-            }
-          ],
-          'extra' => {
-            'end_command' => {},
-            'spaces_before_argument' => ' '
-          },
-          'parent' => {},
-          'source_info' => {
-            'file_name' => '',
-            'line_nr' => 47,
-            'macro' => ''
-          }
-        },
-        {
-          'parent' => {},
-          'text' => '
-',
-          'type' => 'empty_line'
-        },
-        {
-          'cmdname' => 'defspec',
-          'contents' => [
+              },
+              'type' => 'def_line'
+            },
             {
               'args' => [
                 {
@@ -6103,78 +5866,35 @@ $result_trees{'definition_commands'} = {
                       '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'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
-                    {
-                      'args' => [
+                          'text' => 'Escape'
+                        },
                         {
-                          'contents' => [
+                          'args' => [
                             {
+                              'contents' => [],
                               'parent' => {},
-                              'text' => '['
+                              'type' => 'brace_command_arg'
                             }
                           ],
+                          'cmdname' => 'tie',
+                          'contents' => [],
                           'parent' => {},
-                          'type' => 'brace_command_arg'
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 51,
+                            'macro' => ''
+                          }
+                        },
+                        {
+                          'parent' => {},
+                          'text' => 'sequence'
                         }
                       ],
-                      'cmdname' => 'r',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'category'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 57,
-                        'macro' => ''
-                      }
+                      'type' => 'def_aggregate'
                     },
                     {
                       'extra' => {
@@ -6185,95 +5905,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'
-                        }
-                      ],
-                      'cmdname' => 'slanted',
-                      'contents' => [],
-                      'extra' => {
-                        'def_role' => 'arg'
-                      },
-                      'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 57,
-                        'macro' => ''
-                      }
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
-                    {
-                      'args' => [
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 51,
+                            'macro' => ''
+                          }
+                        },
                         {
-                          'contents' => [
+                          'args' => [
+                            {
+                              'contents' => [
+                                {
+                                  'args' => [
+                                    {
+                                      'contents' => [
+                                        {
+                                          'parent' => {},
+                                          'text' => 'fn'
+                                        }
+                                      ],
+                                      'parent' => {},
+                                      'type' => 'brace_command_arg'
+                                    }
+                                  ],
+                                  'cmdname' => 'slanted',
+                                  'contents' => [],
+                                  'parent' => {},
+                                  'source_info' => {
+                                    'file_name' => '',
+                                    'line_nr' => 51,
+                                    'macro' => ''
+                                  }
+                                }
+                              ],
+                              'parent' => {},
+                              'type' => 'brace_command_arg'
+                            }
+                          ],
+                          'cmdname' => 'r',
+                          'contents' => [],
+                          'parent' => {},
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 51,
+                            'macro' => ''
+                          }
+                        },
+                        {
+                          'args' => [
                             {
+                              'contents' => [],
                               'parent' => {},
-                              'text' => '['
+                              'type' => 'brace_command_arg'
                             }
                           ],
+                          'cmdname' => 't',
+                          'contents' => [],
                           'parent' => {},
-                          'type' => 'brace_command_arg'
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 51,
+                            'macro' => ''
+                          }
                         }
                       ],
-                      'cmdname' => 'code',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'name'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 57,
-                        'macro' => ''
-                      }
+                      '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' => 28
+                },
+                'original_def_cmdname' => 'deffnx',
+                'spaces_before_argument' => ' '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 51,
+                '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' => 52,
+                            'macro' => ''
+                          }
+                        },
+                        {
+                          'parent' => {},
+                          'text' => 'sequence'
                         }
                       ],
-                      'cmdname' => 't',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'category'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 57,
-                        'macro' => ''
-                      }
+                      'type' => 'def_aggregate'
                     },
                     {
                       'extra' => {
@@ -6284,98 +6087,97 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
-                      'args' => [
+                      'contents' => [
                         {
-                          'contents' => [
+                          'args' => [
                             {
-                              'args' => [
+                              'contents' => [
                                 {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => '['
-                                    }
-                                  ],
                                   'parent' => {},
-                                  'type' => 'brace_command_arg'
+                                  'text' => '\\f['
                                 }
                               ],
-                              'cmdname' => 'slanted',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 57,
-                                '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' => 57,
-                        'macro' => ''
-                      }
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
-                    {
-                      'args' => [
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 52,
+                            'macro' => ''
+                          }
+                        },
                         {
-                          'contents' => [
+                          'args' => [
                             {
-                              'args' => [
+                              'contents' => [
                                 {
-                                  'contents' => [
+                                  'args' => [
                                     {
+                                      'contents' => [
+                                        {
+                                          'parent' => {},
+                                          'text' => 'font'
+                                        }
+                                      ],
                                       'parent' => {},
-                                      'text' => '['
+                                      'type' => 'brace_command_arg'
                                     }
                                   ],
+                                  'cmdname' => 'slanted',
+                                  'contents' => [],
                                   'parent' => {},
-                                  'type' => 'brace_command_arg'
+                                  'source_info' => {
+                                    'file_name' => '',
+                                    'line_nr' => 52,
+                                    'macro' => ''
+                                  }
                                 }
                               ],
-                              'cmdname' => 'code',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 57,
-                                'macro' => ''
-                              }
+                              'type' => 'brace_command_arg'
                             }
                           ],
+                          'cmdname' => 'r',
+                          'contents' => [],
                           'parent' => {},
-                          'type' => 'brace_command_arg'
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 52,
+                            'macro' => ''
+                          }
+                        },
+                        {
+                          'args' => [
+                            {
+                              'contents' => [
+                                {
+                                  'parent' => {},
+                                  'text' => ']'
+                                }
+                              ],
+                              'parent' => {},
+                              'type' => 'brace_command_arg'
+                            }
+                          ],
+                          'cmdname' => 't',
+                          'contents' => [],
+                          'parent' => {},
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 52,
+                            'macro' => ''
+                          }
                         }
                       ],
-                      'cmdname' => 'r',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'name'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 57,
-                        'macro' => ''
-                      }
+                      'type' => 'def_aggregate'
                     },
                     {
                       'extra' => {
@@ -6390,51 +6192,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' => 57,
-                                        'macro' => ''
-                                      }
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'code',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 57,
-                                'macro' => ''
-                              }
+                              'text' => '\\f['
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -6442,18 +6208,10 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 57,
+                        'line_nr' => 52,
                         'macro' => ''
                       }
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
                     {
                       'args' => [
                         {
@@ -6464,19 +6222,19 @@ $result_trees{'definition_commands'} = {
                                   'contents' => [
                                     {
                                       'parent' => {},
-                                      'text' => '['
+                                      'text' => 'font'
                                     }
                                   ],
                                   'parent' => {},
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 't',
+                              'cmdname' => 'slanted',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 57,
+                                'line_nr' => 52,
                                 'macro' => ''
                               }
                             }
@@ -6493,48 +6251,24 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 57,
+                        'line_nr' => 52,
                         'macro' => ''
                       }
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'delimiter'
-                      },
-                      'parent' => {},
-                      'text' => ',',
-                      'type' => 'delimiter'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => ','
+                              'text' => ']'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -6542,10 +6276,69 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 57,
+                        'line_nr' => 52,
                         'macro' => ''
                       }
                     },
+                    {
+                      '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' => 29
+                },
+                'original_def_cmdname' => 'deffnx',
+                'spaces_before_argument' => ' '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 52,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
+                      'parent' => {},
+                      'text' => 'Register'
+                    },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
@@ -6560,22 +6353,22 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => ','
+                              'text' => '\\n[.sty]'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'slanted',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'name'
                       },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 57,
+                        'line_nr' => 53,
                         'macro' => ''
                       }
                     },
@@ -6584,8 +6377,56 @@ $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' => 30
+                },
+                'original_def_cmdname' => 'deffnx',
+                'spaces_before_argument' => ' '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 53,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'The '
                     },
                     {
                       'args' => [
@@ -6593,7 +6434,7 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => ','
+                              'text' => 'ft'
                             }
                           ],
                           'parent' => {},
@@ -6602,23 +6443,16 @@ $result_trees{'definition_commands'} = {
                       ],
                       'cmdname' => 'code',
                       'contents' => [],
-                      'extra' => {
-                        'def_role' => 'arg'
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 57,
+                        'line_nr' => 54,
                         'macro' => ''
                       }
                     },
                     {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
+                      'text' => ' request and the '
                     },
                     {
                       'args' => [
@@ -6626,247 +6460,219 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => ','
+                              'text' => '\\f'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 't',
+                      'cmdname' => 'code',
                       'contents' => [],
-                      'extra' => {
-                        'def_role' => 'arg'
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 57,
+                        'line_nr' => 54,
                         'macro' => ''
                       }
                     },
                     {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
+                      'text' => ' escape change the current font
+'
+                    },
+                    {
+                      'parent' => {},
+                      'text' => 'to '
                     },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => ','
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'slanted',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 57,
-                                'macro' => ''
-                              }
+                              'text' => 'font'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 'var',
                       'contents' => [],
-                      'extra' => {
-                        'def_role' => 'arg'
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 57,
+                        'line_nr' => 55,
                         'macro' => ''
                       }
                     },
                     {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
+                      'text' => ' (one-character name'
                     },
                     {
                       'args' => [
                         {
-                          'contents' => [
-                            {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => ','
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'code',
-                              'contents' => [],
-                              'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 57,
-                                'macro' => ''
-                              }
-                            }
-                          ],
+                          'contents' => [],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 'tie',
                       'contents' => [],
-                      'extra' => {
-                        'def_role' => 'arg'
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 57,
+                        'line_nr' => 55,
                         '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' => 57,
-                                        'macro' => ''
-                                      }
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'code',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 57,
-                                'macro' => ''
-                              }
+                              'text' => 'f'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 'var',
                       'contents' => [],
-                      'extra' => {
-                        'def_role' => 'arg'
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 57,
+                        'line_nr' => 55,
                         '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' => 't',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 57,
-                                'macro' => ''
-                              }
+                              'text' => 'fn'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 'var',
                       'contents' => [],
-                      'extra' => {
-                        'def_role' => 'arg'
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 57,
+                        'line_nr' => 56,
                         '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' => 57,
+                'macro' => ''
+              }
+            }
+          ],
+          'extra' => {
+            'end_command' => {},
+            'spaces_before_argument' => ' '
+          },
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 49,
+            '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'
@@ -6880,7 +6686,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'text' => ']',
+                      'text' => '[',
                       'type' => 'delimiter'
                     },
                     {
@@ -6897,7 +6703,7 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => ']'
+                              'text' => '['
                             }
                           ],
                           'parent' => {},
@@ -6912,7 +6718,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 57,
+                        'line_nr' => 59,
                         'macro' => ''
                       }
                     },
@@ -6930,7 +6736,7 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => ']'
+                              'text' => '['
                             }
                           ],
                           'parent' => {},
@@ -6945,7 +6751,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 57,
+                        'line_nr' => 59,
                         'macro' => ''
                       }
                     },
@@ -6963,7 +6769,7 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => ']'
+                              'text' => '['
                             }
                           ],
                           'parent' => {},
@@ -6978,7 +6784,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 57,
+                        'line_nr' => 59,
                         'macro' => ''
                       }
                     },
@@ -6996,7 +6802,7 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => ']'
+                              'text' => '['
                             }
                           ],
                           'parent' => {},
@@ -7011,7 +6817,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 57,
+                        'line_nr' => 59,
                         'macro' => ''
                       }
                     },
@@ -7033,7 +6839,7 @@ $result_trees{'definition_commands'} = {
                                   'contents' => [
                                     {
                                       'parent' => {},
-                                      'text' => ']'
+                                      'text' => '['
                                     }
                                   ],
                                   'parent' => {},
@@ -7045,7 +6851,7 @@ $result_trees{'definition_commands'} = {
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 57,
+                                'line_nr' => 59,
                                 'macro' => ''
                               }
                             }
@@ -7062,7 +6868,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 57,
+                        'line_nr' => 59,
                         'macro' => ''
                       }
                     },
@@ -7084,7 +6890,7 @@ $result_trees{'definition_commands'} = {
                                   'contents' => [
                                     {
                                       'parent' => {},
-                                      'text' => ']'
+                                      'text' => '['
                                     }
                                   ],
                                   'parent' => {},
@@ -7096,7 +6902,7 @@ $result_trees{'definition_commands'} = {
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 57,
+                                'line_nr' => 59,
                                 'macro' => ''
                               }
                             }
@@ -7113,7 +6919,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 57,
+                        'line_nr' => 59,
                         'macro' => ''
                       }
                     },
@@ -7139,7 +6945,7 @@ $result_trees{'definition_commands'} = {
                                           'contents' => [
                                             {
                                               'parent' => {},
-                                              'text' => ']'
+                                              'text' => '['
                                             }
                                           ],
                                           'parent' => {},
@@ -7151,7 +6957,7 @@ $result_trees{'definition_commands'} = {
                                       'parent' => {},
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 57,
+                                        'line_nr' => 59,
                                         'macro' => ''
                                       }
                                     }
@@ -7165,7 +6971,7 @@ $result_trees{'definition_commands'} = {
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 57,
+                                'line_nr' => 59,
                                 'macro' => ''
                               }
                             }
@@ -7182,7 +6988,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 57,
+                        'line_nr' => 59,
                         'macro' => ''
                       }
                     },
@@ -7204,7 +7010,7 @@ $result_trees{'definition_commands'} = {
                                   'contents' => [
                                     {
                                       'parent' => {},
-                                      'text' => ']'
+                                      'text' => '['
                                     }
                                   ],
                                   'parent' => {},
@@ -7216,7 +7022,7 @@ $result_trees{'definition_commands'} = {
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 57,
+                                'line_nr' => 59,
                                 'macro' => ''
                               }
                             }
@@ -7233,88 +7039,10 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 57,
+                        'line_nr' => 59,
                         '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' => 29
-                },
-                'original_def_cmdname' => 'defspec'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 57,
-                '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'
@@ -7328,15 +7056,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'text' => '[',
-                      'type' => 'delimiter'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'delimiter'
-                      },
-                      'parent' => {},
-                      'text' => ']',
+                      'text' => ',',
                       'type' => 'delimiter'
                     },
                     {
@@ -7353,7 +7073,7 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => '[]'
+                              'text' => ','
                             }
                           ],
                           'parent' => {},
@@ -7368,7 +7088,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 58,
+                        'line_nr' => 59,
                         'macro' => ''
                       }
                     },
@@ -7386,7 +7106,7 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => '[]'
+                              'text' => ','
                             }
                           ],
                           'parent' => {},
@@ -7401,7 +7121,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 58,
+                        'line_nr' => 59,
                         'macro' => ''
                       }
                     },
@@ -7419,7 +7139,7 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => '[]'
+                              'text' => ','
                             }
                           ],
                           'parent' => {},
@@ -7434,7 +7154,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 58,
+                        'line_nr' => 59,
                         'macro' => ''
                       }
                     },
@@ -7452,7 +7172,7 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => '[]'
+                              'text' => ','
                             }
                           ],
                           'parent' => {},
@@ -7467,7 +7187,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 58,
+                        'line_nr' => 59,
                         'macro' => ''
                       }
                     },
@@ -7489,7 +7209,7 @@ $result_trees{'definition_commands'} = {
                                   'contents' => [
                                     {
                                       'parent' => {},
-                                      'text' => '[]'
+                                      'text' => ','
                                     }
                                   ],
                                   'parent' => {},
@@ -7501,7 +7221,7 @@ $result_trees{'definition_commands'} = {
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 58,
+                                'line_nr' => 59,
                                 'macro' => ''
                               }
                             }
@@ -7518,7 +7238,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 58,
+                        'line_nr' => 59,
                         'macro' => ''
                       }
                     },
@@ -7540,7 +7260,7 @@ $result_trees{'definition_commands'} = {
                                   'contents' => [
                                     {
                                       'parent' => {},
-                                      'text' => '[]'
+                                      'text' => ','
                                     }
                                   ],
                                   'parent' => {},
@@ -7552,7 +7272,7 @@ $result_trees{'definition_commands'} = {
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 58,
+                                'line_nr' => 59,
                                 'macro' => ''
                               }
                             }
@@ -7569,7 +7289,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 58,
+                        'line_nr' => 59,
                         'macro' => ''
                       }
                     },
@@ -7595,7 +7315,7 @@ $result_trees{'definition_commands'} = {
                                           'contents' => [
                                             {
                                               'parent' => {},
-                                              'text' => '[]'
+                                              'text' => ','
                                             }
                                           ],
                                           'parent' => {},
@@ -7607,7 +7327,7 @@ $result_trees{'definition_commands'} = {
                                       'parent' => {},
                                       'source_info' => {
                                         'file_name' => '',
-                                        'line_nr' => 58,
+                                        'line_nr' => 59,
                                         'macro' => ''
                                       }
                                     }
@@ -7621,7 +7341,7 @@ $result_trees{'definition_commands'} = {
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 58,
+                                'line_nr' => 59,
                                 'macro' => ''
                               }
                             }
@@ -7638,7 +7358,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 58,
+                        'line_nr' => 59,
                         'macro' => ''
                       }
                     },
@@ -7647,138 +7367,51 @@ $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' => 30
-                },
-                'original_def_cmdname' => 'defspecx',
-                'spaces_before_argument' => ' '
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 58,
-                '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' => 60,
-                'macro' => ''
-              }
-            }
-          ],
-          'extra' => {
-            'end_command' => {},
-            'spaces_before_argument' => ' '
-          },
-          'parent' => {},
-          'source_info' => {
-            'file_name' => '',
-            'line_nr' => 57,
-            'macro' => ''
-          }
-        },
-        {
-          'parent' => {},
-          'text' => '
-',
-          'type' => 'empty_line'
-        },
-        {
-          'cmdname' => 'deftypefn',
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
                     {
-                      'contents' => [
+                      'args' => [
                         {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ','
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 't',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 59,
+                                'macro' => ''
+                              }
+                            }
+                          ],
                           'parent' => {},
-                          'text' => 'Library Function'
+                          'type' => 'brace_command_arg'
                         }
                       ],
+                      'cmdname' => 'r',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'category'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 62,
+                        'line_nr' => 59,
                         'macro' => ''
-                      },
-                      'type' => 'bracketed_def_content'
+                      }
                     },
                     {
                       'extra' => {
@@ -7790,10 +7423,11 @@ $result_trees{'definition_commands'} = {
                     },
                     {
                       'extra' => {
-                        'def_role' => 'type'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'text' => 'int'
+                      'text' => ']',
+                      'type' => 'delimiter'
                     },
                     {
                       'extra' => {
@@ -7804,34 +7438,29 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => ']'
+                            }
+                          ],
+                          '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' => 59,
+                        'macro' => ''
+                      }
                     },
                     {
                       'extra' => {
@@ -7847,14 +7476,14 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'f---oo'
+                              'text' => ']'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 'slanted',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -7862,18 +7491,10 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 62,
+                        'line_nr' => 59,
                         'macro' => ''
                       }
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'delimiter'
-                      },
-                      'parent' => {},
-                      'text' => ',',
-                      'type' => 'delimiter'
-                    },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
@@ -7883,11 +7504,29 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => ']'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'code',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'typearg'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'float'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 59,
+                        'macro' => ''
+                      }
                     },
                     {
                       'extra' => {
@@ -7903,14 +7542,14 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'b--ar'
+                              'text' => ']'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -7918,202 +7557,278 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 62,
+                        'line_nr' => 59,
                         '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' => 31
-                },
-                'original_def_cmdname' => 'deftypefn'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 62,
-                'macro' => ''
-              },
-              'type' => 'def_line'
-            },
-            {
-              'contents' => [
-                {
-                  'contents' => [
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
                     {
                       'args' => [
                         {
-                          'contents' => [],
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ']'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'slanted',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 59,
+                                'macro' => ''
+                              }
+                            }
+                          ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'dots',
+                      'cmdname' => 'r',
                       'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 63,
+                        'line_nr' => 59,
                         'macro' => ''
                       }
                     },
                     {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       'parent' => {},
-                      'text' => ' with var for '
+                      'text' => ' ',
+                      'type' => 'spaces'
                     },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ']'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'code',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'f---oo'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 59,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 'r',
                       'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 63,
+                        'line_nr' => 59,
                         'macro' => ''
                       }
                     },
                     {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       'parent' => {},
-                      'text' => ' and '
+                      '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' => 59,
+                                        'macro' => ''
+                                      }
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'code',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'b--ar'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 59,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 'r',
                       'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 63,
+                        'line_nr' => 59,
                         'macro' => ''
                       }
                     },
                     {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       'parent' => {},
-                      'text' => '
-'
-                    }
-                  ],
-                  'parent' => {},
-                  'type' => 'paragraph'
-                }
-              ],
-              'parent' => {},
-              'type' => 'def_item'
-            },
-            {
-              'args' => [
-                {
-                  'contents' => [
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ']'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 't',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 59,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 59,
+                        'macro' => ''
+                      }
+                    },
                     {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       'parent' => {},
-                      'text' => 'deftypefn'
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
                     }
                   ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
                   'parent' => {},
-                  'type' => 'line_arg'
+                  'type' => 'block_line_arg'
                 }
               ],
-              'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefn',
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'deftypefn'
+                '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' => 31
+                },
+                'original_def_cmdname' => 'defspec'
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 64,
+                'line_nr' => 59,
                 'macro' => ''
-              }
-            }
-          ],
-          'extra' => {
-            'end_command' => {},
-            'spaces_before_argument' => ' '
-          },
-          'parent' => {},
-          'source_info' => {
-            'file_name' => '',
-            'line_nr' => 62,
-            'macro' => ''
-          }
-        },
-        {
-          'parent' => {},
-          'text' => '
-',
-          'type' => 'empty_line'
-        },
-        {
-          'cmdname' => 'deftypefn',
-          'contents' => [
+              },
+              'type' => 'def_line'
+            },
             {
               'args' => [
                 {
@@ -8122,19 +7837,14 @@ $result_trees{'definition_commands'} = {
                       'contents' => [
                         {
                           'parent' => {},
-                          'text' => 'Library Function'
+                          'text' => 'Special Form'
                         }
                       ],
                       'extra' => {
                         'def_role' => 'category'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 66,
-                        'macro' => ''
-                      },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_inserted'
                     },
                     {
                       'extra' => {
@@ -8142,14 +7852,14 @@ $result_trees{'definition_commands'} = {
                       },
                       'parent' => {},
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     },
                     {
                       'extra' => {
-                        'def_role' => 'type'
+                        'def_role' => 'name'
                       },
                       'parent' => {},
-                      'text' => 'int'
+                      'text' => 'foobar'
                     },
                     {
                       'extra' => {
@@ -8161,33 +7871,52 @@ $result_trees{'definition_commands'} = {
                     },
                     {
                       'extra' => {
-                        'def_role' => 'name'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'text' => 'foobar'
+                      'text' => '[',
+                      'type' => 'delimiter'
                     },
                     {
                       'extra' => {
-                        'def_role' => 'spaces'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'text' => '  ',
-                      'type' => 'spaces'
+                      'text' => ']',
+                      'type' => 'delimiter'
                     },
                     {
                       'extra' => {
-                        'def_role' => 'delimiter'
+                        'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => '(',
-                      'type' => 'delimiter'
+                      'text' => ' ',
+                      'type' => 'spaces'
                     },
                     {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => '[]'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'typearg'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'int'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 60,
+                        'macro' => ''
+                      }
                     },
                     {
                       'extra' => {
@@ -8202,33 +7931,15 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => 'f---oo'
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'slanted',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 66,
-                                'macro' => ''
-                              }
+                              'text' => '[]'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 'slanted',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -8236,17 +7947,42 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 66,
+                        'line_nr' => 60,
                         'macro' => ''
                       }
                     },
                     {
                       'extra' => {
-                        'def_role' => 'delimiter'
+                        'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => ',',
-                      'type' => 'delimiter'
+                      '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' => 60,
+                        'macro' => ''
+                      }
                     },
                     {
                       'extra' => {
@@ -8257,11 +7993,29 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => '[]'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 't',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'typearg'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'float'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 60,
+                        'macro' => ''
+                      }
                     },
                     {
                       'extra' => {
@@ -8281,7 +8035,7 @@ $result_trees{'definition_commands'} = {
                                   'contents' => [
                                     {
                                       'parent' => {},
-                                      'text' => 'b--ar'
+                                      'text' => '[]'
                                     }
                                   ],
                                   'parent' => {},
@@ -8293,7 +8047,7 @@ $result_trees{'definition_commands'} = {
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 66,
+                                'line_nr' => 60,
                                 'macro' => ''
                               }
                             }
@@ -8310,17 +8064,129 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 66,
+                        'line_nr' => 60,
                         'macro' => ''
                       }
                     },
                     {
                       'extra' => {
-                        'def_role' => 'delimiter'
+                        'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => ')',
-                      'type' => 'delimiter'
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '[]'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'code',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 60,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 60,
+                        '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' => 60,
+                                        'macro' => ''
+                                      }
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'code',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 60,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 60,
+                        'macro' => ''
+                      }
                     },
                     {
                       'extra' => {
@@ -8333,15 +8199,15 @@ $result_trees{'definition_commands'} = {
                     }
                   ],
                   'parent' => {},
-                  'type' => 'block_line_arg'
+                  'type' => 'line_arg'
                 }
               ],
+              'cmdname' => 'defspecx',
               'extra' => {
-                'def_command' => 'deftypefn',
+                'def_command' => 'defspec',
                 'def_parsed_hash' => {
                   'category' => {},
-                  'name' => {},
-                  'type' => {}
+                  'name' => {}
                 },
                 'index_entry' => {
                   'command' => {},
@@ -8352,19 +8218,20 @@ $result_trees{'definition_commands'} = {
                     {}
                   ],
                   'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
+                  'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
+                  'index_type_command' => 'defspec',
                   'node' => {},
                   'number' => 32
                 },
-                'original_def_cmdname' => 'deftypefn'
+                'original_def_cmdname' => 'defspecx',
+                'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 66,
+                'line_nr' => 60,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -8373,78 +8240,9 @@ $result_trees{'definition_commands'} = {
               'contents' => [
                 {
                   'contents' => [
-                    {
-                      'args' => [
-                        {
-                          'contents' => [],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'dots',
-                      'contents' => [],
-                      'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 67,
-                        'macro' => ''
-                      }
-                    },
-                    {
-                      'parent' => {},
-                      'text' => ' with r slanted for '
-                    },
-                    {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => 'f---oo'
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'var',
-                      'contents' => [],
-                      'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 67,
-                        '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' => 67,
-                        'macro' => ''
-                      }
-                    },
                     {
                       'parent' => {},
-                      'text' => '
+                      'text' => 'test formatting of separators
 '
                     }
                   ],
@@ -8461,7 +8259,7 @@ $result_trees{'definition_commands'} = {
                   'contents' => [
                     {
                       'parent' => {},
-                      'text' => 'deftypefn'
+                      'text' => 'defspec'
                     }
                   ],
                   'extra' => {
@@ -8474,14 +8272,14 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefn',
+                'command_argument' => 'defspec',
                 'spaces_before_argument' => ' ',
-                'text_arg' => 'deftypefn'
+                'text_arg' => 'defspec'
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 68,
+                'line_nr' => 62,
                 'macro' => ''
               }
             }
@@ -8493,7 +8291,7 @@ $result_trees{'definition_commands'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 66,
+            'line_nr' => 59,
             'macro' => ''
           }
         },
@@ -8504,38 +8302,7 @@ $result_trees{'definition_commands'} = {
           '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',
+          'cmdname' => 'deftypefn',
           'contents' => [
             {
               'args' => [
@@ -8545,7 +8312,7 @@ $result_trees{'definition_commands'} = {
                       'contents' => [
                         {
                           'parent' => {},
-                          'text' => 'Class Option'
+                          'text' => 'Library Function'
                         }
                       ],
                       'extra' => {
@@ -8554,7 +8321,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 71,
+                        'line_nr' => 64,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -8569,10 +8336,10 @@ $result_trees{'definition_commands'} = {
                     },
                     {
                       'extra' => {
-                        'def_role' => 'class'
+                        'def_role' => 'type'
                       },
                       'parent' => {},
-                      'text' => 'Window'
+                      'text' => 'int'
                     },
                     {
                       'extra' => {
@@ -8587,161 +8354,71 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'name'
                       },
                       'parent' => {},
-                      'text' => 'border-pattern'
+                      'text' => 'foobar'
                     },
                     {
                       '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' => [
+                      'text' => '  ',
+                      'type' => 'spaces'
+                    },
                     {
-                      'args' => [
-                        {
-                          'contents' => [],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'dots',
-                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 72,
-                        'macro' => ''
-                      }
+                      'text' => '(',
+                      'type' => 'delimiter'
                     },
                     {
+                      'extra' => {
+                        'def_role' => 'typearg'
+                      },
                       'parent' => {},
-                      'text' => '
-'
-                    }
-                  ],
-                  'parent' => {},
-                  'type' => 'paragraph'
-                }
-              ],
-              'parent' => {},
-              'type' => 'def_item'
-            },
-            {
-              'args' => [
-                {
-                  'contents' => [
+                      'text' => 'int'
+                    },
                     {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       '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' => [
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
                     {
-                      'contents' => [
+                      'args' => [
                         {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'f---oo'
+                            }
+                          ],
                           'parent' => {},
-                          'text' => 'Class Option'
+                          'type' => 'brace_command_arg'
                         }
                       ],
+                      'cmdname' => 'var',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'category'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 75,
+                        'line_nr' => 64,
                         'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
                       },
-                      'type' => 'bracketed_def_content'
+                      'parent' => {},
+                      'text' => ',',
+                      'type' => 'delimiter'
                     },
                     {
                       'extra' => {
@@ -8753,9 +8430,10 @@ $result_trees{'definition_commands'} = {
                     },
                     {
                       'extra' => {
-                        'def_role' => 'class'
+                        'def_role' => 'typearg'
                       },
-                      'text' => 'Window'
+                      'parent' => {},
+                      'text' => 'float'
                     },
                     {
                       'extra' => {
@@ -8771,38 +8449,32 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'int'
+                              'text' => 'b--ar'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'code',
+                      'cmdname' => 'var',
                       'contents' => [],
                       'extra' => {
-                        'def_role' => 'type'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 75,
+                        'line_nr' => 64,
                         'macro' => ''
                       }
                     },
                     {
                       'extra' => {
-                        'def_role' => 'spaces'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'name'
-                      },
-                      'text' => 'border-pattern'
+                      'text' => ')',
+                      'type' => 'delimiter'
                     },
                     {
                       'extra' => {
@@ -8819,43 +8491,34 @@ $result_trees{'definition_commands'} = {
                 }
               ],
               'extra' => {
-                'def_command' => 'deftypecv',
+                'def_command' => 'deftypefn',
                 '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_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
-                  'index_name' => 'vr',
-                  'index_type_command' => 'deftypecv',
+                  'index_name' => 'fn',
+                  'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 2
+                  'number' => 33
                 },
-                'original_def_cmdname' => 'deftypecv'
+                'original_def_cmdname' => 'deftypefn'
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 75,
+                'line_nr' => 64,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -8877,7 +8540,59 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 76,
+                        'line_nr' => 65,
+                        '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' => 65,
+                        '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' => 65,
                         'macro' => ''
                       }
                     },
@@ -8900,7 +8615,7 @@ $result_trees{'definition_commands'} = {
                   'contents' => [
                     {
                       'parent' => {},
-                      'text' => 'deftypecv'
+                      'text' => 'deftypefn'
                     }
                   ],
                   'extra' => {
@@ -8913,14 +8628,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' => 77,
+                'line_nr' => 66,
                 'macro' => ''
               }
             }
@@ -8932,7 +8647,7 @@ $result_trees{'definition_commands'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 75,
+            'line_nr' => 64,
             'macro' => ''
           }
         },
@@ -8943,366 +8658,2238 @@ $result_trees{'definition_commands'} = {
           'type' => 'empty_line'
         },
         {
-          'cmdname' => 'quotation',
+          'cmdname' => 'deftypefn',
           'contents' => [
             {
-              'extra' => {
-                'command' => {}
-              },
-              'parent' => {},
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'contents' => [
+                        {
+                          'parent' => {},
+                          'text' => 'Library Function'
+                        }
+                      ],
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 68,
+                        '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' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 68,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 68,
+                        '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' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => 'b--ar'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'slanted',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 68,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 68,
+                        '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' => 34
+                },
+                'original_def_cmdname' => 'deftypefn'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 68,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'args' => [
+                        {
+                          'contents' => [],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'dots',
+                      'contents' => [],
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 69,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'parent' => {},
+                      'text' => ' with r slanted for '
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'f---oo'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 69,
+                        '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' => 69,
+                        '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' => 70,
+                'macro' => ''
+              }
+            }
+          ],
+          'extra' => {
+            'end_command' => {},
+            'spaces_before_argument' => ' '
+          },
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 68,
+            'macro' => ''
+          }
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'cmdname' => 'noindent',
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 72,
+            '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' => 73,
+                        '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' => 73,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'args' => [
+                        {
+                          'contents' => [],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'dots',
+                      'contents' => [],
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 74,
+                        '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' => 75,
+                'macro' => ''
+              }
+            }
+          ],
+          'extra' => {
+            'end_command' => {},
+            'spaces_before_argument' => ' '
+          },
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 73,
+            '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' => 77,
+                        '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' => 77,
+                        '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' => 77,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'args' => [
+                        {
+                          'contents' => [],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'dots',
+                      'contents' => [],
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 78,
+                        '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' => 79,
+                'macro' => ''
+              }
+            }
+          ],
+          'extra' => {
+            'end_command' => {},
+            'spaces_before_argument' => ' '
+          },
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 77,
+            'macro' => ''
+          }
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'cmdname' => 'quotation',
+          'contents' => [
+            {
+              'extra' => {
+                'command' => {}
+              },
+              'parent' => {},
               'text' => '
 ',
-              'type' => 'empty_line_after_command'
+              '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' => 82,
+                            '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' => 82,
+                            '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' => 82,
+                            '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' => 35
+                    },
+                    'original_def_cmdname' => 'deftypefn'
+                  },
+                  'parent' => {},
+                  'source_info' => {
+                    'file_name' => '',
+                    'line_nr' => 82,
+                    'macro' => ''
+                  },
+                  'type' => 'def_line'
+                },
+                {
+                  'contents' => [
+                    {
+                      'contents' => [
+                        {
+                          'args' => [
+                            {
+                              'contents' => [],
+                              'parent' => {},
+                              'type' => 'brace_command_arg'
+                            }
+                          ],
+                          'cmdname' => 'dots',
+                          'contents' => [],
+                          'parent' => {},
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 83,
+                            'macro' => ''
+                          }
+                        },
+                        {
+                          'parent' => {},
+                          'text' => ' for '
+                        },
+                        {
+                          'args' => [
+                            {
+                              'contents' => [
+                                {
+                                  'parent' => {},
+                                  'text' => 'foo'
+                                }
+                              ],
+                              'parent' => {},
+                              'type' => 'brace_command_arg'
+                            }
+                          ],
+                          'cmdname' => 'var',
+                          'contents' => [],
+                          'parent' => {},
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 83,
+                            'macro' => ''
+                          }
+                        },
+                        {
+                          'parent' => {},
+                          'text' => ' and '
+                        },
+                        {
+                          'args' => [
+                            {
+                              'contents' => [
+                                {
+                                  'parent' => {},
+                                  'text' => 'bar'
+                                }
+                              ],
+                              'parent' => {},
+                              'type' => 'brace_command_arg'
+                            }
+                          ],
+                          'cmdname' => 'var',
+                          'contents' => [],
+                          'parent' => {},
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 83,
+                            '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' => 84,
+                    'macro' => ''
+                  }
+                }
+              ],
+              'extra' => {
+                'end_command' => {},
+                'spaces_before_argument' => ' '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 82,
+                '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' => 85,
+                'macro' => ''
+              }
+            }
+          ],
+          'extra' => {
+            'end_command' => {}
+          },
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 81,
+            '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' => 36
+                },
+                'original_def_cmdname' => 'defun'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 87,
+                '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' => 88,
+                        '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' => 88,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'parent' => {},
+                      'text' => ' with '
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'arguments'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 88,
+                        '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' => 89,
+                'macro' => ''
+              }
+            }
+          ],
+          'extra' => {
+            'end_command' => {},
+            'spaces_before_argument' => ' '
+          },
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 87,
+            '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' => 91,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 91,
+                        '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' => 37
+                },
+                'original_def_cmdname' => 'defun'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 91,
+                'macro' => ''
+              },
+              'type' => 'def_line'
             },
             {
-              'cmdname' => 'deftypefn',
               'contents' => [
                 {
-                  'args' => [
+                  'contents' => [
                     {
-                      'contents' => [
+                      'parent' => {},
+                      'text' => 'explicit keyword marking, no var '
+                    },
+                    {
+                      'args' => [
                         {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'Library Function'
+                              'text' => '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'
-                        },
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 92,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'parent' => {},
+                      'text' => ' with '
+                    },
+                    {
+                      'args' => [
                         {
-                          'extra' => {
-                            'def_role' => 'spaces'
-                          },
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'arguments'
+                            }
+                          ],
                           'parent' => {},
-                          'text' => ' ',
-                          'type' => 'spaces'
-                        },
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 92,
+                        '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' => 93,
+                'macro' => ''
+              }
+            }
+          ],
+          'extra' => {
+            'end_command' => {},
+            'spaces_before_argument' => ' '
+          },
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 91,
+            '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' => [
                         {
-                          'args' => [
+                          'contents' => [
                             {
-                              'contents' => [
-                                {
-                                  'parent' => {},
-                                  'text' => 'foo'
-                                }
-                              ],
                               'parent' => {},
-                              'type' => 'brace_command_arg'
+                              'text' => 'int'
                             }
                           ],
-                          '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'
-                        },
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'code',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 95,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
                         {
-                          'extra' => {
-                            'def_role' => 'spaces'
-                          },
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'a--b'
+                            }
+                          ],
                           'parent' => {},
-                          'text' => ' ',
-                          'type' => 'spaces'
-                        },
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'code',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 95,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
                         {
-                          'args' => [
+                          'contents' => [
                             {
-                              'contents' => [
-                                {
-                                  'parent' => {},
-                                  'text' => 'bar'
-                                }
-                              ],
                               'parent' => {},
-                              'type' => 'brace_command_arg'
+                              'text' => 'v--ar1'
                             }
                           ],
-                          'cmdname' => 'var',
-                          'contents' => [],
-                          'extra' => {
-                            'def_role' => 'arg'
-                          },
                           'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 80,
-                            'macro' => ''
-                          }
-                        },
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 95,
+                        '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' => [
                         {
-                          'extra' => {
-                            'def_role' => 'delimiter'
-                          },
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => '--'
+                            }
+                          ],
                           'parent' => {},
-                          'text' => ')',
-                          'type' => 'delimiter'
-                        },
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'code',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 95,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '(',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'args' => [
                         {
-                          'extra' => {
-                            'def_role' => 'spaces'
-                          },
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'type o--ther'
+                            }
+                          ],
                           'parent' => {},
-                          'text' => '
-',
-                          'type' => 'spaces_at_end'
+                          'type' => 'brace_command_arg'
                         }
                       ],
+                      'cmdname' => 'code',
+                      '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' => 95,
+                        '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' => 33
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ',',
+                      'type' => 'delimiter'
                     },
-                    'original_def_cmdname' => 'deftypefn'
-                  },
-                  'parent' => {},
-                  'source_info' => {
-                    'file_name' => '',
-                    'line_nr' => 80,
-                    'macro' => ''
-                  },
-                  'type' => 'def_line'
-                },
-                {
-                  'contents' => [
                     {
-                      'contents' => [
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
                         {
-                          'args' => [
+                          'contents' => [
                             {
-                              'contents' => [],
                               'parent' => {},
-                              'type' => 'brace_command_arg'
+                              'text' => 'v---ar2'
                             }
                           ],
-                          'cmdname' => 'dots',
-                          'contents' => [],
-                          'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 81,
-                            'macro' => ''
-                          }
-                        },
-                        {
                           'parent' => {},
-                          'text' => ' for '
-                        },
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 95,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '  ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '[',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'args' => [
                         {
-                          'args' => [
+                          'contents' => [
                             {
-                              'contents' => [
-                                {
-                                  'parent' => {},
-                                  'text' => 'foo'
-                                }
-                              ],
                               'parent' => {},
-                              'type' => 'brace_command_arg'
+                              'text' => 'float'
                             }
                           ],
-                          'cmdname' => 'var',
-                          'contents' => [],
-                          'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 81,
-                            'macro' => ''
-                          }
-                        },
-                        {
                           'parent' => {},
-                          'text' => ' and '
-                        },
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'code',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 96,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '[',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'args' => [
                         {
-                          'args' => [
+                          'contents' => [
                             {
-                              'contents' => [
-                                {
-                                  'parent' => {},
-                                  'text' => 'bar'
-                                }
-                              ],
                               'parent' => {},
-                              'type' => 'brace_command_arg'
+                              'text' => 'var4'
                             }
                           ],
-                          'cmdname' => 'var',
-                          'contents' => [],
                           'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 81,
-                            'macro' => ''
-                          }
-                        },
-                        {
-                          'parent' => {},
-                          'text' => '
-'
+                          'type' => 'brace_command_arg'
                         }
                       ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
-                      'type' => 'paragraph'
-                    }
-                  ],
-                  'parent' => {},
-                  'type' => 'def_item'
-                },
-                {
-                  'args' => [
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 96,
+                        'macro' => ''
+                      }
+                    },
                     {
-                      'contents' => [
-                        {
-                          'parent' => {},
-                          'text' => 'deftypefn'
-                        }
-                      ],
                       'extra' => {
-                        'spaces_after_argument' => '
-'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'type' => 'line_arg'
+                      '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'
                     }
                   ],
-                  'cmdname' => 'end',
-                  'extra' => {
-                    'command_argument' => 'deftypefn',
-                    'spaces_before_argument' => ' ',
-                    'text_arg' => 'deftypefn'
-                  },
                   'parent' => {},
-                  'source_info' => {
-                    'file_name' => '',
-                    'line_nr' => 82,
-                    'macro' => ''
-                  }
+                  'type' => 'block_line_arg'
                 }
               ],
               'extra' => {
-                'end_command' => {},
-                'spaces_before_argument' => ' '
+                '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' => 38
+                },
+                'original_def_cmdname' => 'deffn'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 95,
+                'macro' => ''
               },
+              'type' => 'def_line'
+            },
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'In deffn with code and var used
+'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'paragraph'
+                }
+              ],
               'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 80,
-                'macro' => ''
-              }
+              'type' => 'def_item'
             },
             {
               'args' => [
@@ -9310,7 +10897,7 @@ $result_trees{'definition_commands'} = {
                   'contents' => [
                     {
                       'parent' => {},
-                      'text' => 'quotation'
+                      'text' => 'deffn'
                     }
                   ],
                   'extra' => {
@@ -9323,25 +10910,26 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
+                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
-                'text_arg' => 'quotation'
+                'text_arg' => 'deffn'
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 83,
+                'line_nr' => 98,
                 'macro' => ''
               }
             }
           ],
           'extra' => {
-            'end_command' => {}
+            'end_command' => {},
+            'spaces_before_argument' => ' '
           },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 79,
+            'line_nr' => 95,
             'macro' => ''
           }
         },
@@ -9352,7 +10940,7 @@ $result_trees{'definition_commands'} = {
           'type' => 'empty_line'
         },
         {
-          'cmdname' => 'defun',
+          'cmdname' => 'deftypefn',
           'contents' => [
             {
               'args' => [
@@ -9362,14 +10950,19 @@ $result_trees{'definition_commands'} = {
                       'contents' => [
                         {
                           'parent' => {},
-                          'text' => 'Function'
+                          'text' => 'Library Function'
                         }
                       ],
                       'extra' => {
                         'def_role' => 'category'
                       },
                       'parent' => {},
-                      'type' => 'bracketed_inserted'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 100,
+                        'macro' => ''
+                      },
+                      'type' => 'bracketed_def_content'
                     },
                     {
                       'extra' => {
@@ -9377,14 +10970,52 @@ $result_trees{'definition_commands'} = {
                       },
                       'parent' => {},
                       'text' => ' ',
-                      'type' => 'spaces_inserted'
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'type'
+                      },
+                      'parent' => {},
+                      'text' => 'int'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
                     },
                     {
                       'extra' => {
                         'def_role' => 'name'
                       },
                       'parent' => {},
-                      'text' => 'apply'
+                      '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' => {
@@ -9395,11 +11026,45 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'f---oo'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'function'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 100,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '[',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ',',
+                      'type' => 'delimiter'
                     },
                     {
                       'extra' => {
@@ -9411,10 +11076,10 @@ $result_trees{'definition_commands'} = {
                     },
                     {
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => '&rest'
+                      'text' => 'float'
                     },
                     {
                       'extra' => {
@@ -9425,11 +11090,60 @@ $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' => 'arguments'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 100,
+                        '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' => {
@@ -9446,10 +11160,11 @@ $result_trees{'definition_commands'} = {
                 }
               ],
               'extra' => {
-                'def_command' => 'defun',
+                'def_command' => 'deftypefn',
                 'def_parsed_hash' => {
                   'category' => {},
-                  'name' => {}
+                  'name' => {},
+                  'type' => {}
                 },
                 'index_entry' => {
                   'command' => {},
@@ -9460,78 +11175,186 @@ $result_trees{'definition_commands'} = {
                     {}
                   ],
                   'in_code' => 1,
-                  'index_at_command' => 'defun',
+                  'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defun',
+                  'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 34
+                  'number' => 39
                 },
-                'original_def_cmdname' => 'defun'
+                'original_def_cmdname' => 'deftypefn'
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 85,
+                'line_nr' => 100,
                 'macro' => ''
               },
               'type' => 'def_line'
             },
             {
-              'contents' => [
+              'args' => [
                 {
                   'contents' => [
+                    {
+                      'contents' => [
+                        {
+                          'parent' => {},
+                          'text' => 'Library Function'
+                        }
+                      ],
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 101,
+                        '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' => 'apply'
+                              'text' => 'f---oo'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'code',
+                      'cmdname' => 'var',
                       'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 86,
+                        'line_nr' => 101,
                         'macro' => ''
                       }
                     },
-                    {
-                      'parent' => {},
-                      'text' => ' calls no var '
-                    },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'function'
+                              'text' => '['
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 'r',
                       'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 86,
+                        'line_nr' => 101,
                         'macro' => ''
                       }
                     },
                     {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
                       'parent' => {},
-                      'text' => ' with '
+                      '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' => [
@@ -9539,7 +11362,7 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'arguments'
+                              'text' => 'b--ar'
                             }
                           ],
                           'parent' => {},
@@ -9548,77 +11371,113 @@ $result_trees{'definition_commands'} = {
                       ],
                       'cmdname' => 'var',
                       'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 101,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => ']'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 86,
+                        'line_nr' => 101,
                         'macro' => ''
                       }
                     },
                     {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
                       'parent' => {},
-                      'text' => '
-'
-                    }
-                  ],
-                  'parent' => {},
-                  'type' => 'paragraph'
-                }
-              ],
-              'parent' => {},
-              'type' => 'def_item'
-            },
-            {
-              'args' => [
-                {
-                  'contents' => [
+                      'text' => ')',
+                      'type' => 'delimiter'
+                    },
                     {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       'parent' => {},
-                      'text' => 'defun'
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'typearg'
+                      },
+                      'parent' => {},
+                      'text' => 'r'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
                     }
                   ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
                   'parent' => {},
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'end',
+              'cmdname' => 'deftypefnx',
               'extra' => {
-                'command_argument' => 'defun',
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'defun'
+                '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' => 40
+                },
+                'original_def_cmdname' => 'deftypefnx',
+                'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 87,
+                'line_nr' => 101,
                 'macro' => ''
-              }
-            }
-          ],
-          'extra' => {
-            'end_command' => {},
-            'spaces_before_argument' => ' '
-          },
-          'parent' => {},
-          'source_info' => {
-            'file_name' => '',
-            'line_nr' => 85,
-            'macro' => ''
-          }
-        },
-        {
-          'parent' => {},
-          'text' => '
-',
-          'type' => 'empty_line'
-        },
-        {
-          'cmdname' => 'defun',
-          'contents' => [
+              },
+              'type' => 'def_line'
+            },
             {
               'args' => [
                 {
@@ -9627,14 +11486,19 @@ $result_trees{'definition_commands'} = {
                       'contents' => [
                         {
                           'parent' => {},
-                          'text' => 'Function'
+                          'text' => 'Library Function'
                         }
                       ],
                       'extra' => {
                         'def_role' => 'category'
                       },
                       'parent' => {},
-                      'type' => 'bracketed_inserted'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 102,
+                        'macro' => ''
+                      },
+                      'type' => 'bracketed_def_content'
                     },
                     {
                       'extra' => {
@@ -9642,14 +11506,14 @@ $result_trees{'definition_commands'} = {
                       },
                       'parent' => {},
                       'text' => ' ',
-                      'type' => 'spaces_inserted'
+                      'type' => 'spaces'
                     },
                     {
                       'extra' => {
-                        'def_role' => 'name'
+                        'def_role' => 'type'
                       },
                       'parent' => {},
-                      'text' => 'apply'
+                      'text' => 'int'
                     },
                     {
                       'extra' => {
@@ -9661,130 +11525,41 @@ $result_trees{'definition_commands'} = {
                     },
                     {
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'name'
                       },
                       'parent' => {},
-                      'text' => 'function'
+                      'text' => 'foobar'
                     },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => ' ',
+                      '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'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
+                      'text' => '(',
+                      'type' => 'delimiter'
                     },
                     {
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'argument'
+                      'text' => 'int'
                     },
                     {
                       '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 '
+                      'text' => ' ',
+                      'type' => 'spaces'
                     },
                     {
                       'args' => [
@@ -9792,7 +11567,7 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'function'
+                              'text' => 'f---oo'
                             }
                           ],
                           'parent' => {},
@@ -9801,24 +11576,23 @@ $result_trees{'definition_commands'} = {
                       ],
                       'cmdname' => 'var',
                       'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 90,
+                        'line_nr' => 102,
                         'macro' => ''
                       }
                     },
-                    {
-                      'parent' => {},
-                      'text' => ' with '
-                    },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'arguments'
+                              'text' => '['
                             }
                           ],
                           'parent' => {},
@@ -9827,87 +11601,23 @@ $result_trees{'definition_commands'} = {
                       ],
                       'cmdname' => 'var',
                       'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 90,
+                        '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' => 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'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'text' => 'Category'
+                      'text' => ',',
+                      'type' => 'delimiter'
                     },
                     {
                       'extra' => {
@@ -9919,10 +11629,10 @@ $result_trees{'definition_commands'} = {
                     },
                     {
                       'extra' => {
-                        'def_role' => 'name'
+                        'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'name'
+                      'text' => 'float'
                     },
                     {
                       'extra' => {
@@ -9933,19 +11643,29 @@ $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' => 'argument'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 102,
+                        'macro' => ''
+                      }
                     },
                     {
                       'args' => [
@@ -9953,14 +11673,14 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'int'
+                              'text' => ']'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'code',
+                      'cmdname' => 'var',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -9968,10 +11688,18 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 93,
+                        'line_nr' => 102,
                         'macro' => ''
                       }
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ')',
+                      'type' => 'delimiter'
+                    },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
@@ -9981,29 +11709,82 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
-                      'args' => [
+                      'extra' => {
+                        'def_role' => 'typearg'
+                      },
+                      'parent' => {},
+                      'text' => 'var'
+                    },
+                    {
+                      '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' => 'a--b'
-                            }
-                          ],
                           'parent' => {},
-                          'type' => 'brace_command_arg'
+                          'text' => 'Library Function'
                         }
                       ],
-                      'cmdname' => 'code',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'category'
                       },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 93,
+                        'line_nr' => 103,
                         'macro' => ''
-                      }
+                      },
+                      'type' => 'bracketed_def_content'
                     },
                     {
                       'extra' => {
@@ -10014,52 +11795,49 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => 'v--ar1'
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'var',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'type'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 93,
-                        'macro' => ''
-                      }
+                      'text' => 'int'
                     },
                     {
                       'extra' => {
-                        'def_role' => 'delimiter'
+                        'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => ',',
-                      'type' => 'delimiter'
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
+                      'parent' => {},
+                      'text' => 'foobar'
                     },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => ' ',
+                      'text' => '  ',
                       'type' => 'spaces'
                     },
                     {
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'text' => 'word'
+                      'text' => '(',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'typearg'
+                      },
+                      'parent' => {},
+                      'text' => 'int'
                     },
                     {
                       'extra' => {
@@ -10075,14 +11853,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'
@@ -10090,40 +11868,24 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 93,
+                        'line_nr' => 103,
                         'macro' => ''
                       }
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'delimiter'
-                      },
-                      'parent' => {},
-                      'text' => '(',
-                      'type' => 'delimiter'
-                    },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'type o--ther'
+                              'text' => '['
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'code',
+                      'cmdname' => 'slanted',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -10131,7 +11893,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 93,
+                        'line_nr' => 103,
                         'macro' => ''
                       }
                     },
@@ -10152,60 +11914,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' => 93,
-                        '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'
@@ -10213,40 +11949,24 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 94,
+                        'line_nr' => 103,
                         'macro' => ''
                       }
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'delimiter'
-                      },
-                      'parent' => {},
-                      'text' => '[',
-                      'type' => 'delimiter'
-                    },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'var4'
+                              'text' => ']'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 'slanted',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -10254,7 +11974,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 94,
+                        'line_nr' => 103,
                         'macro' => ''
                       }
                     },
@@ -10263,24 +11983,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' => 'slanted'
                     },
                     {
                       'extra' => {
@@ -10293,14 +12012,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' => {},
@@ -10311,91 +12032,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' => 36
+                  'number' => 42
                 },
-                'original_def_cmdname' => 'deffn'
+                'original_def_cmdname' => 'deftypefnx',
+                'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 93,
+                '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' => 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' => [
                 {
@@ -10413,7 +12067,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 98,
+                        'line_nr' => 104,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -10476,8 +12130,33 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
+                      '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' => 104,
+                        'macro' => ''
+                      }
                     },
                     {
                       'args' => [
@@ -10485,33 +12164,25 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'f---oo'
+                              'text' => '['
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 'code',
                       'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'typearg'
                       },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 98,
+                        'line_nr' => 104,
                         'macro' => ''
                       }
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'delimiter'
-                      },
-                      'parent' => {},
-                      'text' => '[',
-                      'type' => 'delimiter'
-                    },
                     {
                       'extra' => {
                         'def_role' => 'delimiter'
@@ -10564,17 +12235,34 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 98,
+                        'line_nr' => 104,
                         'macro' => ''
                       }
                     },
                     {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => ']'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'code',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'delimiter'
+                        'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => ']',
-                      'type' => 'delimiter'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 104,
+                        'macro' => ''
+                      }
                     },
                     {
                       'extra' => {
@@ -10597,7 +12285,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'default'
+                      'text' => 'code'
                     },
                     {
                       'extra' => {
@@ -10610,9 +12298,10 @@ $result_trees{'definition_commands'} = {
                     }
                   ],
                   'parent' => {},
-                  'type' => 'block_line_arg'
+                  'type' => 'line_arg'
                 }
               ],
+              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_parsed_hash' => {
@@ -10629,19 +12318,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' => 43
                 },
-                'original_def_cmdname' => 'deftypefn'
+                'original_def_cmdname' => 'deftypefnx',
+                'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 98,
+                'line_nr' => 104,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -10663,7 +12353,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 99,
+                        'line_nr' => 105,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -10750,7 +12440,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 99,
+                        'line_nr' => 105,
                         'macro' => ''
                       }
                     },
@@ -10767,7 +12457,7 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -10775,7 +12465,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 99,
+                        'line_nr' => 105,
                         'macro' => ''
                       }
                     },
@@ -10831,7 +12521,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 99,
+                        'line_nr' => 105,
                         'macro' => ''
                       }
                     },
@@ -10848,7 +12538,7 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -10856,7 +12546,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 99,
+                        'line_nr' => 105,
                         'macro' => ''
                       }
                     },
@@ -10881,7 +12571,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'r'
+                      'text' => 't'
                     },
                     {
                       'extra' => {
@@ -10919,7 +12609,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 38
+                  'number' => 44
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -10927,7 +12617,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 99,
+                'line_nr' => 105,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -10949,7 +12639,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 100,
+                        'line_nr' => 106,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -11036,7 +12726,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 100,
+                        'line_nr' => 106,
                         'macro' => ''
                       }
                     },
@@ -11045,15 +12735,33 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '['
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'b',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => '['
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 106,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'slanted',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -11061,7 +12769,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 100,
+                        'line_nr' => 106,
                         'macro' => ''
                       }
                     },
@@ -11117,7 +12825,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 100,
+                        'line_nr' => 106,
                         'macro' => ''
                       }
                     },
@@ -11126,15 +12834,33 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ']'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'b',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => ']'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 106,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'slanted',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -11142,7 +12868,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 100,
+                        'line_nr' => 106,
                         'macro' => ''
                       }
                     },
@@ -11167,7 +12893,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'slanted'
+                      'text' => 't:b'
                     },
                     {
                       'extra' => {
@@ -11205,7 +12931,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 39
+                  'number' => 45
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -11213,7 +12939,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 100,
+                'line_nr' => 106,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -11235,7 +12961,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 101,
+                        'line_nr' => 107,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -11322,7 +13048,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 101,
+                        'line_nr' => 107,
                         'macro' => ''
                       }
                     },
@@ -11331,23 +13057,41 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '['
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'var',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => '['
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 107,
+                                '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' => 101,
+                        'line_nr' => 107,
                         'macro' => ''
                       }
                     },
@@ -11403,7 +13147,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 101,
+                        'line_nr' => 107,
                         'macro' => ''
                       }
                     },
@@ -11412,23 +13156,41 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ']'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'var',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => ']'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 107,
+                                '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' => 101,
+                        'line_nr' => 107,
                         'macro' => ''
                       }
                     },
@@ -11453,7 +13215,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'code'
+                      'text' => 'r:var'
                     },
                     {
                       'extra' => {
@@ -11491,7 +13253,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 40
+                  'number' => 46
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -11499,7 +13261,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 101,
+                'line_nr' => 107,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -11521,7 +13283,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 102,
+                        'line_nr' => 108,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -11608,7 +13370,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 102,
+                        'line_nr' => 108,
                         'macro' => ''
                       }
                     },
@@ -11617,15 +13379,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' => 108,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 't',
+                      'cmdname' => 'r',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -11633,7 +13413,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 102,
+                        'line_nr' => 108,
                         'macro' => ''
                       }
                     },
@@ -11689,7 +13469,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 102,
+                        'line_nr' => 108,
                         'macro' => ''
                       }
                     },
@@ -11698,15 +13478,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' => 108,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 't',
+                      'cmdname' => 'r',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -11714,7 +13512,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 102,
+                        'line_nr' => 108,
                         'macro' => ''
                       }
                     },
@@ -11739,7 +13537,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 't'
+                      'text' => 'r:slanted'
                     },
                     {
                       'extra' => {
@@ -11777,7 +13575,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 41
+                  'number' => 47
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -11785,7 +13583,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 102,
+                'line_nr' => 108,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -11807,7 +13605,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 103,
+                        'line_nr' => 109,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -11894,7 +13692,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 103,
+                        'line_nr' => 109,
                         'macro' => ''
                       }
                     },
@@ -11915,12 +13713,12 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 'b',
+                              'cmdname' => 'code',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 103,
+                                'line_nr' => 109,
                                 'macro' => ''
                               }
                             }
@@ -11929,7 +13727,7 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 't',
+                      'cmdname' => 'r',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -11937,7 +13735,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 103,
+                        'line_nr' => 109,
                         'macro' => ''
                       }
                     },
@@ -11993,7 +13791,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 103,
+                        'line_nr' => 109,
                         'macro' => ''
                       }
                     },
@@ -12014,12 +13812,12 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 'b',
+                              'cmdname' => 'code',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 103,
+                                'line_nr' => 109,
                                 'macro' => ''
                               }
                             }
@@ -12028,7 +13826,7 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 't',
+                      'cmdname' => 'r',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -12036,7 +13834,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 103,
+                        'line_nr' => 109,
                         'macro' => ''
                       }
                     },
@@ -12061,7 +13859,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 't:b'
+                      'text' => 'r:code'
                     },
                     {
                       'extra' => {
@@ -12099,7 +13897,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 42
+                  'number' => 48
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -12107,7 +13905,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
+                'line_nr' => 109,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -12129,7 +13927,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 104,
+                        'line_nr' => 110,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -12216,7 +14014,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 104,
+                        'line_nr' => 110,
                         'macro' => ''
                       }
                     },
@@ -12237,12 +14035,12 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 'slanted',
+                              'cmdname' => 't',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 104,
+                                'line_nr' => 110,
                                 'macro' => ''
                               }
                             }
@@ -12259,7 +14057,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 104,
+                        'line_nr' => 110,
                         'macro' => ''
                       }
                     },
@@ -12315,7 +14113,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 104,
+                        'line_nr' => 110,
                         'macro' => ''
                       }
                     },
@@ -12336,12 +14134,12 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 'slanted',
+                              'cmdname' => 't',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 104,
+                                'line_nr' => 110,
                                 'macro' => ''
                               }
                             }
@@ -12358,7 +14156,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 104,
+                        'line_nr' => 110,
                         'macro' => ''
                       }
                     },
@@ -12383,7 +14181,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'r:slanted'
+                      'text' => 'r:t'
                     },
                     {
                       'extra' => {
@@ -12421,7 +14219,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 43
+                  'number' => 49
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -12429,11 +14227,79 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
+                'line_nr' => 110,
                 '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' => 112,
+                'macro' => ''
+              }
+            }
+          ],
+          'extra' => {
+            'end_command' => {},
+            'spaces_before_argument' => ' '
+          },
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 100,
+            'macro' => ''
+          }
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'cmdname' => 'deftypefn',
+          'contents' => [
             {
               'args' => [
                 {
@@ -12451,7 +14317,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 105,
+                        'line_nr' => 114,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -12507,7 +14373,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'int'
+                      'text' => 'i--nt'
                     },
                     {
                       'extra' => {
@@ -12538,52 +14404,17 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 105,
+                        'line_nr' => 114,
                         'macro' => ''
                       }
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => '['
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'code',
-                              'contents' => [],
-                              'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 105,
-                                'macro' => ''
-                              }
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'r',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 105,
-                        'macro' => ''
-                      }
+                      'text' => '[',
+                      'type' => 'delimiter'
                     },
                     {
                       'extra' => {
@@ -12637,52 +14468,17 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 105,
+                        'line_nr' => 114,
                         'macro' => ''
                       }
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => ']'
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'code',
-                              'contents' => [],
-                              'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 105,
-                                'macro' => ''
-                              }
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'r',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 105,
-                        'macro' => ''
-                      }
+                      'text' => ']',
+                      'type' => 'delimiter'
                     },
                     {
                       'extra' => {
@@ -12705,7 +14501,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'r:code'
+                      'text' => 'default'
                     },
                     {
                       'extra' => {
@@ -12718,10 +14514,9 @@ $result_trees{'definition_commands'} = {
                     }
                   ],
                   'parent' => {},
-                  'type' => 'line_arg'
+                  'type' => 'block_line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_parsed_hash' => {
@@ -12738,20 +14533,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' => 44
+                  'number' => 50
                 },
-                'original_def_cmdname' => 'deftypefnx',
-                'spaces_before_argument' => ' '
+                'original_def_cmdname' => 'deftypefn'
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 105,
+                'line_nr' => 114,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -12773,7 +14567,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 106,
+                        'line_nr' => 115,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -12824,35 +14618,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'
@@ -12860,42 +14639,32 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 106,
+                        'line_nr' => 115,
                         'macro' => ''
                       }
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => '['
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 't',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 106,
-                                'macro' => ''
-                              }
+                              'text' => 'f---oo'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 'var',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -12903,10 +14672,18 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 106,
+                        'line_nr' => 115,
                         'macro' => ''
                       }
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '[',
+                      'type' => 'delimiter'
+                    },
                     {
                       'extra' => {
                         'def_role' => 'delimiter'
@@ -12959,52 +14736,17 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 106,
+                        'line_nr' => 115,
                         'macro' => ''
                       }
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => ']'
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 't',
-                              'contents' => [],
-                              'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 106,
-                                'macro' => ''
-                              }
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'r',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 106,
-                        'macro' => ''
-                      }
+                      'text' => ']',
+                      'type' => 'delimiter'
                     },
                     {
                       'extra' => {
@@ -13027,7 +14769,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'r:t'
+                      'text' => 'r'
                     },
                     {
                       'extra' => {
@@ -13065,7 +14807,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 45
+                  'number' => 51
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -13073,79 +14815,11 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 106,
+                'line_nr' => 115,
                 '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' => 108,
-                'macro' => ''
-              }
-            }
-          ],
-          'extra' => {
-            'end_command' => {},
-            'spaces_before_argument' => ' '
-          },
-          'parent' => {},
-          'source_info' => {
-            'file_name' => '',
-            'line_nr' => 98,
-            'macro' => ''
-          }
-        },
-        {
-          'parent' => {},
-          'text' => '
-',
-          'type' => 'empty_line'
-        },
-        {
-          'cmdname' => 'deftypefn',
-          'contents' => [
             {
               'args' => [
                 {
@@ -13163,7 +14837,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 110,
+                        'line_nr' => 116,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -13215,11 +14889,29 @@ $result_trees{'definition_commands'} = {
                       'type' => 'delimiter'
                     },
                     {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'i--nt'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'typearg'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'i--nt'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 116,
+                        'macro' => ''
+                      }
                     },
                     {
                       'extra' => {
@@ -13250,7 +14942,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 110,
+                        'line_nr' => 116,
                         'macro' => ''
                       }
                     },
@@ -13314,7 +15006,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 110,
+                        'line_nr' => 116,
                         'macro' => ''
                       }
                     },
@@ -13347,7 +15039,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'default'
+                      'text' => 'var'
                     },
                     {
                       'extra' => {
@@ -13360,9 +15052,10 @@ $result_trees{'definition_commands'} = {
                     }
                   ],
                   'parent' => {},
-                  'type' => 'block_line_arg'
+                  'type' => 'line_arg'
                 }
               ],
+              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_parsed_hash' => {
@@ -13379,19 +15072,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' => 46
+                  'number' => 52
                 },
-                'original_def_cmdname' => 'deftypefn'
+                'original_def_cmdname' => 'deftypefnx',
+                'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 110,
+                'line_nr' => 116,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -13413,7 +15107,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 111,
+                        'line_nr' => 117,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -13477,7 +15171,7 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 'slanted',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -13485,7 +15179,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 111,
+                        'line_nr' => 117,
                         'macro' => ''
                       }
                     },
@@ -13518,7 +15212,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 111,
+                        'line_nr' => 117,
                         'macro' => ''
                       }
                     },
@@ -13582,7 +15276,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 111,
+                        'line_nr' => 117,
                         'macro' => ''
                       }
                     },
@@ -13615,7 +15309,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'r'
+                      'text' => 'slanted'
                     },
                     {
                       'extra' => {
@@ -13653,7 +15347,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 47
+                  'number' => 53
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -13661,7 +15355,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 111,
+                'line_nr' => 117,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -13683,7 +15377,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 112,
+                        'line_nr' => 118,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -13747,15 +15441,15 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'slanted',
+                      'cmdname' => 'code',
                       'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'typearg'
                       },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 112,
+                        'line_nr' => 118,
                         'macro' => ''
                       }
                     },
@@ -13788,7 +15482,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 112,
+                        'line_nr' => 118,
                         'macro' => ''
                       }
                     },
@@ -13852,7 +15546,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 112,
+                        'line_nr' => 118,
                         'macro' => ''
                       }
                     },
@@ -13885,7 +15579,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'slanted'
+                      'text' => 'code'
                     },
                     {
                       'extra' => {
@@ -13923,7 +15617,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 48
+                  'number' => 54
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -13931,7 +15625,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 112,
+                'line_nr' => 118,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -13953,7 +15647,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 113,
+                        'line_nr' => 119,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -14017,15 +15711,15 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'code',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
-                        'def_role' => 'typearg'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 113,
+                        'line_nr' => 119,
                         'macro' => ''
                       }
                     },
@@ -14058,7 +15752,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 113,
+                        'line_nr' => 119,
                         'macro' => ''
                       }
                     },
@@ -14122,7 +15816,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 113,
+                        'line_nr' => 119,
                         'macro' => ''
                       }
                     },
@@ -14155,7 +15849,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'code'
+                      'text' => 't'
                     },
                     {
                       'extra' => {
@@ -14193,7 +15887,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 49
+                  'number' => 55
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -14201,7 +15895,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 113,
+                'line_nr' => 119,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -14223,7 +15917,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 114,
+                        'line_nr' => 120,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -14279,8 +15973,26 @@ $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' => 120,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
@@ -14295,7 +16007,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 114,
+                        'line_nr' => 120,
                         'macro' => ''
                       }
                     },
@@ -14328,7 +16040,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 114,
+                        'line_nr' => 120,
                         'macro' => ''
                       }
                     },
@@ -14392,7 +16104,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 114,
+                        'line_nr' => 120,
                         'macro' => ''
                       }
                     },
@@ -14425,7 +16137,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 't'
+                      'text' => 't:b'
                     },
                     {
                       'extra' => {
@@ -14463,7 +16175,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 50
+                  'number' => 56
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -14471,7 +16183,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 114,
+                'line_nr' => 120,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -14493,7 +16205,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 115,
+                        'line_nr' => 121,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -14561,12 +16273,12 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 'b',
+                              'cmdname' => 'var',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 115,
+                                'line_nr' => 121,
                                 'macro' => ''
                               }
                             }
@@ -14575,7 +16287,7 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 't',
+                      'cmdname' => 'r',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -14583,7 +16295,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 115,
+                        'line_nr' => 121,
                         'macro' => ''
                       }
                     },
@@ -14616,7 +16328,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 115,
+                        'line_nr' => 121,
                         'macro' => ''
                       }
                     },
@@ -14680,7 +16392,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 115,
+                        'line_nr' => 121,
                         'macro' => ''
                       }
                     },
@@ -14713,7 +16425,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 't:b'
+                      'text' => 'r:var'
                     },
                     {
                       'extra' => {
@@ -14751,7 +16463,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 51
+                  'number' => 57
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -14759,7 +16471,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 115,
+                'line_nr' => 121,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -14781,7 +16493,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 116,
+                        'line_nr' => 122,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -14854,7 +16566,7 @@ $result_trees{'definition_commands'} = {
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 116,
+                                'line_nr' => 122,
                                 'macro' => ''
                               }
                             }
@@ -14871,7 +16583,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 116,
+                        'line_nr' => 122,
                         'macro' => ''
                       }
                     },
@@ -14904,7 +16616,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 116,
+                        'line_nr' => 122,
                         'macro' => ''
                       }
                     },
@@ -14968,7 +16680,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 116,
+                        'line_nr' => 122,
                         'macro' => ''
                       }
                     },
@@ -15039,7 +16751,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 52
+                  'number' => 58
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -15047,7 +16759,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 116,
+                'line_nr' => 122,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -15069,7 +16781,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 117,
+                        'line_nr' => 123,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -15142,7 +16854,7 @@ $result_trees{'definition_commands'} = {
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 117,
+                                'line_nr' => 123,
                                 'macro' => ''
                               }
                             }
@@ -15159,7 +16871,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 117,
+                        'line_nr' => 123,
                         'macro' => ''
                       }
                     },
@@ -15192,7 +16904,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 117,
+                        'line_nr' => 123,
                         'macro' => ''
                       }
                     },
@@ -15256,7 +16968,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 117,
+                        'line_nr' => 123,
                         'macro' => ''
                       }
                     },
@@ -15327,7 +17039,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 53
+                  'number' => 59
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -15335,7 +17047,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 117,
+                'line_nr' => 123,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -15357,7 +17069,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 118,
+                        'line_nr' => 124,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -15430,7 +17142,7 @@ $result_trees{'definition_commands'} = {
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 118,
+                                'line_nr' => 124,
                                 'macro' => ''
                               }
                             }
@@ -15447,7 +17159,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 118,
+                        'line_nr' => 124,
                         'macro' => ''
                       }
                     },
@@ -15480,7 +17192,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 118,
+                        'line_nr' => 124,
                         'macro' => ''
                       }
                     },
@@ -15544,7 +17256,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 118,
+                        'line_nr' => 124,
                         'macro' => ''
                       }
                     },
@@ -15615,7 +17327,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 54
+                  'number' => 60
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -15623,7 +17335,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 118,
+                'line_nr' => 124,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -15671,7 +17383,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 120,
+                'line_nr' => 126,
                 'macro' => ''
               }
             }
@@ -15683,7 +17395,7 @@ $result_trees{'definition_commands'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 110,
+            'line_nr' => 114,
             'macro' => ''
           }
         },
@@ -16014,8 +17726,6 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[7]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[7];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0];
@@ -16023,14 +17733,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[12]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[12];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[12]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[13]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[14]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[14];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[14]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0];
@@ -16166,13 +17872,93 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8
 
$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]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[12]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[12];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[12]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[13]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[14];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[14]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[15]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[16]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[17]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[18]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0];
 
$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]{'contents'}[1]{'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]{'contents'}[2]{'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]{'contents'}[3]{'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]{'contents'}[4]{'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]{'contents'}[5]{'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]{'contents'}[6]{'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]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[7]{'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]{'contents'}[8]{'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]{'contents'}[9]{'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]{'contents'}[10]{'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]{'contents'}[11]{'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]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[12]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[12];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[12]{'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]{'contents'}[13]{'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]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[14];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[14]{'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]{'contents'}[15]{'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]{'contents'}[16]{'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]{'contents'}[17]{'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]{'contents'}[18]{'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]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'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'}[12];
 $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];
@@ -17339,8 +19125,6 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[9]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[9];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[10]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[10];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0];
@@ -17351,8 +19135,6 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[15]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[15]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[15];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[15]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[16]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[16]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[16];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[16]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0];
@@ -17498,13 +19280,99 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[
 
$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]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[10]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[10];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[12]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[13]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[14]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[15]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[15]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[15];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[15]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[16]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[16]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[16];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[16]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[17]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[18]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[19]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[20]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[0];
 
$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]{'contents'}[1]{'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]{'contents'}[2]{'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]{'contents'}[3]{'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]{'contents'}[4]{'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]{'contents'}[5]{'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]{'contents'}[6]{'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]{'contents'}[7]{'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]{'contents'}[8]{'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]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[9]{'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]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[10]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[10];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[10]{'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]{'contents'}[11]{'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]{'contents'}[12]{'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]{'contents'}[13]{'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]{'contents'}[14]{'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]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[15]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[15]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[15];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[15]{'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]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[16]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[16]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[16];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[16]{'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]{'contents'}[17]{'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]{'contents'}[18]{'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]{'contents'}[19]{'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]{'contents'}[20]{'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]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'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'}[12];
 $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];
@@ -17698,8 +19566,6 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'args'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'args'}[0]{'contents'}[7]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'args'}[0]{'contents'}[7];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'args'}[0];
@@ -17846,13 +19712,91 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[
 
$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]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[12]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[13]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[14]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[15]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[15]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[15];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[15]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[16]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[17]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[18]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[19]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[20]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'contents'}[0];
 
$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]{'contents'}[1]{'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]{'contents'}[2]{'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]{'contents'}[3]{'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]{'contents'}[4]{'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]{'contents'}[5]{'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]{'contents'}[6]{'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]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'contents'}[7]{'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]{'contents'}[8]{'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]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'contents'}[9]{'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]{'contents'}[10]{'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]{'contents'}[11]{'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]{'contents'}[12]{'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]{'contents'}[13]{'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]{'contents'}[14]{'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]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'contents'}[15]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'contents'}[15]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'contents'}[15];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'contents'}[15]{'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]{'contents'}[16]{'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]{'contents'}[17]{'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]{'contents'}[18]{'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]{'contents'}[19]{'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]{'contents'}[20]{'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]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'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'}[12];
 $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'};
@@ -17879,10 +19823,12 @@ deffn r slanted for @var{a---rg1} and @var{a--rg2}
 
 @defspec foobar (var [from to [inc]]) default
 @defspecx foobar (var @r{[}from to @r{[}inc@r{]]}) r
+@defspecx foobar (var @var{[}from to @var{[}inc@var{]]}) var
 @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{@var{[}}from to @r{@var{[}}inc@r{@var{]]}}) r:var
 @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
@@ -17955,10 +19901,12 @@ In deffn with code and var used
 
 @deftypefn {Library Function} int foobar  (int @var{f---oo}[, float 
@var{b--ar}]) default
 @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}@var{[}, float 
@var{b--ar}@var{]}) var
 @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{@var{[}}, float 
@var{b--ar}@r{@var{]}}) r:var
 @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
@@ -17967,10 +19915,12 @@ separators
 
 @deftypefn {Library Function} int foobar  (i--nt @var{f---oo}[, float 
@var{b--ar}]) default
 @deftypefnx {Library Function} int foobar  (@r{i--nt} @var{f---oo}[, float 
@var{b--ar}]) r
+@deftypefnx {Library Function} int foobar  (@var{i--nt} @var{f---oo}[, float 
@var{b--ar}]) var
 @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{@var{i--nt}} @var{f---oo}[, 
float @var{b--ar}]) r:var
 @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
@@ -17998,10 +19948,12 @@ deffn r slanted for a--rg1 and a-rg2
 
 Special Form: foobar (var [from to [inc]]) default
 Special Form: foobar (var [from to [inc]]) r
+Special Form: foobar (var [from to [inc]]) var
 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:var
 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
@@ -18060,10 +20012,12 @@ In deffn with code and var used
 
 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]) var
 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:var
 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
@@ -18071,10 +20025,12 @@ 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]) var
 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:var
 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
@@ -18233,6 +20189,12 @@ $result_indices_sort_strings{'definition_commands'} = {
     'foobar',
     'foobar',
     'foobar',
+    'foobar',
+    'foobar',
+    'foobar',
+    'foobar',
+    'foobar',
+    'foobar',
     'name'
   ],
   'vr' => [
@@ -18260,10 +20222,12 @@ 
$result_converted{'plaintext'}->{'definition_commands'} = 'top section
 
  -- Special Form: foobar (var [from to [inc]]) default
  -- Special Form: foobar (var [from to [inc]]) r
+ -- Special Form: foobar (var [from to [inc]]) var
  -- 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:var
  -- 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
@@ -18323,10 +20287,12 @@ produces:
 
  -- 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]) var
  -- 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:var
  -- 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
@@ -18334,10 +20300,12 @@ produces:
 
  -- 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]) var
  -- 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:var
  -- 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
@@ -18383,28 +20351,30 @@ 
$result_converted{'html_text'}->{'definition_commands'} = '
 <dl class="first-deffn first-defspec-alias-first-deffn">
 <dt class="deffn defspec-alias-deffn" id="index-foobar"><span 
class="category-def">Special Form: </span><span><strong 
class="def-name">foobar</strong> <var class="def-var-arguments">(var [from to 
[inc]]) default</var><a class="copiable-link" href=\'#index-foobar\'> 
&para;</a></span></dt>
 <dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-1"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments">(var <span class="r">[</span>from to <span 
class="r">[</span>inc<span class="r">]]</span>) r</var><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="def-name">foobar</strong> <var 
class="def-var-arguments">(var <i class="slanted">[</i>from to <i 
class="slanted">[</i>inc<i class="slanted">]]</i>) slanted</var><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="def-name">foobar</strong> <var 
class="def-var-arguments">(var <code class="code">[</code>from to <code 
class="code">[</code>inc<code class="code">]]</code>) code</var><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="def-name">foobar</strong> <var 
class="def-var-arguments">(var <code class="t">[</code>from to <code 
class="t">[</code>inc<code class="t">]]</code>) t</var><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="def-name">foobar</strong> <var 
class="def-var-arguments">(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</var><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="def-name">foobar</strong> <var 
class="def-var-arguments">(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</var><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="def-name">foobar</strong> <var 
class="def-var-arguments">(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</var><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="def-name">foobar</strong> <var 
class="def-var-arguments">(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</var><a class="copiable-link" href=\'#index-foobar-8\'> 
&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="def-name">foobar</strong> <var 
class="def-var-arguments">(var <var class="var">[</var>from to <var 
class="var">[</var>inc<var class="var">]]</var>) var</var><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="def-name">foobar</strong> <var 
class="def-var-arguments">(var <i class="slanted">[</i>from to <i 
class="slanted">[</i>inc<i class="slanted">]]</i>) slanted</var><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="def-name">foobar</strong> <var 
class="def-var-arguments">(var <code class="code">[</code>from to <code 
class="code">[</code>inc<code class="code">]]</code>) code</var><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="def-name">foobar</strong> <var 
class="def-var-arguments">(var <code class="t">[</code>from to <code 
class="t">[</code>inc<code class="t">]]</code>) t</var><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="def-name">foobar</strong> <var 
class="def-var-arguments">(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</var><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="def-name">foobar</strong> <var 
class="def-var-arguments">(var <span class="r"><var 
class="var">[</var></span>from to <span class="r"><var 
class="var">[</var></span>inc<span class="r"><var class="var">]]</var></span>) 
r:var</var><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="def-name">foobar</strong> <var 
class="def-var-arguments">(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</var><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="def-name">foobar</strong> <var 
class="def-var-arguments">(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</var><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="def-name">foobar</strong> <var 
class="def-var-arguments">(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</var><a class="copiable-link" href=\'#index-foobar-10\'> 
&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-9"><span 
class="category-def">Special Form: </span><span><strong 
class="def-name">foobar</strong> <var class="def-var-arguments">va&mdash;riable 
default</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><var class="var">va&mdash;riable</var> var</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><span class="r">va&mdash;riable</span> r</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><i class="slanted">va&mdash;riable</i> 
slanted</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="code">va---riable</code> code</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="t">va---riable</code> t</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="t"><b 
class="b">va&mdash;riable</b></code> t:b</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><span class="r"><var 
class="var">va&mdash;riable</var></span> r:var</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><span class="r"><i 
class="slanted">va&mdash;riable</i></span> r:slanted</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><span class="r"><code 
class="code">va---riable</code></span> r:code</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><span class="r"><code 
class="t">va---riable</code></span> r:t</var><a class="copiable-link" 
href=\'#index-foobar-19\'> &para;</a></span></dt>
+<dt class="deffn defspec-alias-deffn" id="index-foobar-11"><span 
class="category-def">Special Form: </span><span><strong 
class="def-name">foobar</strong> <var class="def-var-arguments">va&mdash;riable 
default</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><var class="var">va&mdash;riable</var> var</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><span class="r">va&mdash;riable</span> r</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><i class="slanted">va&mdash;riable</i> 
slanted</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="code">va---riable</code> code</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="t">va---riable</code> t</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="t"><b 
class="b">va&mdash;riable</b></code> t:b</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><span class="r"><var 
class="var">va&mdash;riable</var></span> r:var</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><span class="r"><i 
class="slanted">va&mdash;riable</i></span> r:slanted</var><a 
class="copiable-link" href=\'#index-foobar-19\'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-20"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><span class="r"><code 
class="code">va---riable</code></span> r:code</var><a class="copiable-link" 
href=\'#index-foobar-20\'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-21"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><span class="r"><code 
class="t">va---riable</code></span> r:t</var><a class="copiable-link" 
href=\'#index-foobar-21\'> &para;</a></span></dt>
 <dd><p>name
 </p></dd></dl>
 
@@ -18420,18 +20390,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-20"><span 
class="category-def">Special Form: </span><span><strong 
class="def-name">foobar</strong> <var class="def-var-arguments">[ <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=" [...]
-<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-21"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments">[] <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></var [...]
+<dt class="deffn defspec-alias-deffn" id="index-foobar-22"><span 
class="category-def">Special Form: </span><span><strong 
class="def-name">foobar</strong> <var class="def-var-arguments">[ <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=" [...]
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-23"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments">[] <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></var [...]
 <dd><p>test formatting of separators
 </p></dd></dl>
 
 <dl class="first-deftypefn">
-<dt class="deftypefn" id="index-foobar-22"><span class="category-def">Library 
Function: </span><span><code class="def-type">int</code> <strong 
class="def-name">foobar</strong> <code class="def-code-arguments">(int <var 
class="var">f---oo</var>, float <var class="var">b--ar</var>)</code><a 
class="copiable-link" href=\'#index-foobar-22\'> &para;</a></span></dt>
+<dt class="deftypefn" id="index-foobar-24"><span class="category-def">Library 
Function: </span><span><code class="def-type">int</code> <strong 
class="def-name">foobar</strong> <code class="def-code-arguments">(int <var 
class="var">f---oo</var>, float <var class="var">b--ar</var>)</code><a 
class="copiable-link" href=\'#index-foobar-24\'> &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-23"><span class="category-def">Library 
Function: </span><span><code class="def-type">int</code> <strong 
class="def-name">foobar</strong> <code class="def-code-arguments">(int <span 
class="r"><i class="slanted">f&mdash;oo</i></span>, float <span class="r"><i 
class="slanted">b&ndash;ar</i></span>)</code><a class="copiable-link" 
href=\'#index-foobar-23\'> &para;</a></span></dt>
+<dt class="deftypefn" id="index-foobar-25"><span class="category-def">Library 
Function: </span><span><code class="def-type">int</code> <strong 
class="def-name">foobar</strong> <code class="def-code-arguments">(int <span 
class="r"><i class="slanted">f&mdash;oo</i></span>, float <span class="r"><i 
class="slanted">b&ndash;ar</i></span>)</code><a class="copiable-link" 
href=\'#index-foobar-25\'> &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>
 
@@ -18448,7 +20418,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-24"><span class="category-def">Library 
Function: </span><span><code class="def-type">int</code> <strong 
class="def-name">foobar</strong> <code class="def-code-arguments">(int <var 
class="var">foo</var>, float <var class="var">bar</var>)</code><a 
class="copiable-link" href=\'#index-foobar-24\'> &para;</a></span></dt>
+<dt class="deftypefn" id="index-foobar-26"><span class="category-def">Library 
Function: </span><span><code class="def-type">int</code> <strong 
class="def-name">foobar</strong> <code class="def-code-arguments">(int <var 
class="var">foo</var>, float <var class="var">bar</var>)</code><a 
class="copiable-link" href=\'#index-foobar-26\'> &para;</a></span></dt>
 <dd><p>&hellip; for <var class="var">foo</var> and <var class="var">bar</var>
 </p></dd></dl>
 </blockquote>
@@ -18469,28 +20439,32 @@ 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-25"><span class="category-def">Library 
Function: </span><span><code class="def-type">int</code> <strong 
class="def-name">foobar</strong> <code class="def-code-arguments">(int <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) 
default</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(int <var class="var">f---oo</var><span 
class="r">[</span>, float <var class="var">b--ar</var><span class="r">]</span>) 
r</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(int <var class="var">f---oo</var><i 
class="slanted">[</i>, float <var class="var">b--ar</var><i 
class="slanted">]</i>) slanted</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(int <var class="var">f---oo</var><code 
class="code">[</code>, float <var class="var">b--ar</var><code 
class="code">]</code>) code</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(int <var class="var">f---oo</var><code 
class="t">[</code>, float <var class="var">b--ar</var><code class="t">]</code>) 
t</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(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</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(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</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(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</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(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</code><a class="copiable-link" href=\'#index-foobar-33\'> 
&para;</a></span></dt>
+<dt class="deftypefn" id="index-foobar-27"><span class="category-def">Library 
Function: </span><span><code class="def-type">int</code> <strong 
class="def-name">foobar</strong> <code class="def-code-arguments">(int <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) 
default</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(int <var class="var">f---oo</var><span 
class="r">[</span>, float <var class="var">b--ar</var><span class="r">]</span>) 
r</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(int <var class="var">f---oo</var><var 
class="var">[</var>, float <var class="var">b--ar</var><var 
class="var">]</var>) var</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(int <var class="var">f---oo</var><i 
class="slanted">[</i>, float <var class="var">b--ar</var><i 
class="slanted">]</i>) slanted</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(int <var class="var">f---oo</var><code 
class="code">[</code>, float <var class="var">b--ar</var><code 
class="code">]</code>) code</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(int <var class="var">f---oo</var><code 
class="t">[</code>, float <var class="var">b--ar</var><code class="t">]</code>) 
t</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(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</code><a class="copiable-link" 
href=\'#index-foobar-33\'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-34"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(int <var class="var">f---oo</var><span 
class="r"><var class="var">[</var></span>, float <var 
class="var">b--ar</var><span class="r"><var class="var">]</var></span>) 
r:var</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(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</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(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</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(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</code><a class="copiable-link" href=\'#index-foobar-37\'> 
&para;</a></span></dt>
 <dd><p>separators
 </p></dd></dl>
 
 <dl class="first-deftypefn">
-<dt class="deftypefn" id="index-foobar-34"><span class="category-def">Library 
Function: </span><span><code class="def-type">int</code> <strong 
class="def-name">foobar</strong> <code class="def-code-arguments">(i--nt <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) 
default</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<span class="r">i&ndash;nt</span> <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) r</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<i class="slanted">i&ndash;nt</i> <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) 
slanted</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<code class="code">i--nt</code> <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) code</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<code class="t">i--nt</code> <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) t</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<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</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<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</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<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</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<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</code><a class="copiable-link" href=\'#index-foobar-42\'> 
&para;</a></span></dt>
+<dt class="deftypefn" id="index-foobar-38"><span class="category-def">Library 
Function: </span><span><code class="def-type">int</code> <strong 
class="def-name">foobar</strong> <code class="def-code-arguments">(i--nt <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) 
default</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<span class="r">i&ndash;nt</span> <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) r</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<var class="var">i--nt</var> <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) var</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<i class="slanted">i&ndash;nt</i> <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) 
slanted</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<code class="code">i--nt</code> <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) code</code><a 
class="copiable-link" href=\'#index-foobar-42\'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-43"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<code class="t">i--nt</code> <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) t</code><a 
class="copiable-link" href=\'#index-foobar-43\'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-44"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<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</code><a class="copiable-link" href=\'#index-foobar-44\'> 
&para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-45"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<span class="r"><var 
class="var">i&ndash;nt</var></span> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) r:var</code><a class="copiable-link" 
href=\'#index-foobar-45\'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-46"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<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</code><a class="copiable-link" 
href=\'#index-foobar-46\'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-47"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<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</code><a class="copiable-link" 
href=\'#index-foobar-47\'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-48"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<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</code><a class="copiable-link" href=\'#index-foobar-48\'> 
&para;</a></span></dt>
 <dd><p>name
 </p></dd></dl>
 
@@ -18522,50 +20496,52 @@ $result_converted{'xml'}->{'definition_commands'} = 
'<setfilename file="definiti
 
 <defspec spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="4">foobar</indexterm><defcategory automatic="on" bracketed="on">Special 
Form</defcategory> <deffunction>foobar</deffunction> 
<defdelimiter>(</defdelimiter><defparam>var</defparam> 
<defdelimiter>[</defdelimiter><defparam>from</defparam> <defparam>to</defparam> 
<defdelimiter>[</defdelimiter><defparam>inc</defparam><defdelimiter>]</defdelimiter><defdelimiter>]</defdelimiter><defdelimiter>)</defdelimiter>
 <defpar [...]
 <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><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 [...]
+<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><var>[</var></defparam><defparam>from</defparam> 
<defparam>to</defparam> 
<defparam><var>[</var></defparam><defparam>inc</defparam><defparam><var>]]</var></defparam><defdelimiter>)</defdelimiter>
 <defparam>var</defparam></definitionterm [...]
+<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><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="8">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="9">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="10">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></defi [...]
+<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><var>[</var></r></defparam><defparam>from</defparam> 
<defparam>to</defparam> 
<defparam><r><var>[</var></r></defparam><defparam>inc</defparam><defparam><r><var>]]</var></r></defparam><defdelimiter>)</defdelimiter>
 <defparam>r:var</d [...]
+<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><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="13">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="14">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="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>
+<defspec spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="15">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="16">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="17">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="18">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="19">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="20">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="21">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="22">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="23">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="24">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="25">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="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>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="26"><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="27"><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="28"><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="29"><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="30"><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="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 [...]
+<defspec spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="31">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="32">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="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>
+<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>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="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
 [...]
+<deftypefn spaces=" " endspaces=" "><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><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>
 
@@ -18579,44 +20555,48 @@ 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="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>
+<deftypefn spaces=" " endspaces=" "><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>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="34">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="36">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="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>
+<defun spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="37">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="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 [...]
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="38">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="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
 [...]
+<deftypefn spaces=" " endspaces=" "><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><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimiter><defdel [...]
+<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><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="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><var>[</var></defparam><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defparam><var>]</var></defparam><defdelimiter>
 [...]
+<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><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="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><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="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><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="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><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="46">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><var>[</var></r></defparam><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defparam><r><var>]</var></r></defparam> 
[...]
+<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="47">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="48">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="49">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="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 
[...]
+<deftypefn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="50">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="51">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="52">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparam><var>i--nt</var></defparam> 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimiter><defdelimiter>)
 [...]
+<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><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="54">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="55">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="56">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="57">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 
<defdelimiter>(</defdelimiter><defparam><r><var>i&textndash;nt</var></r></defparam>
 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimiter [...]
+<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="58">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="59">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="60">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>
 
@@ -18638,10 +20618,12 @@ $result_converted{'docbook'}->{'definition_commands'} 
= '<chapter label="1" id="
 </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">var</emphasis> [<emphasis 
role="arg">from</emphasis> <emphasis role="arg">to</emphasis> [<emphasis 
role="arg">inc</emphasis>]]) <emphasis role="arg">default</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</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"><replaceable>[</replaceable></emphasis><emphasis 
role="arg">from</emphasis> <emphasis role="arg">to</emphasis> <emphasis 
role="arg"><replaceable>[</replaceable></emphasis><emphasis 
role="arg">inc</emphasis><emphasis role="arg"><replaceable>]]</replaceable></ 
[...]
 <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"><replaceable>[</replaceable></emphasis><emphasis 
role="arg">from</emphasis> <emphasis role="arg">to</emphasis> <emphasis 
role="arg"><replaceable>[</replaceable></emphasis><emphasis 
role="arg">inc</emphasis><emphasis role="arg"><replaceable>]]</replaceable></ 
[...]
 <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>
@@ -18700,10 +20682,12 @@ to <replaceable>font</replaceable> (one-character 
name&#160;<replaceable>f</repl
 </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>int</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>  (<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"><replaceable>[</replaceable></emphasis>, <type>float</type> 
<emphasis role="arg"><replaceable>b--ar</replaceable></emphasis><emphasis 
role="arg"><replaceable>]</replaceable></e [...]
 <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"><replaceable>[</replaceable></emphasis>, <type>float</type> 
<emphasis role="arg"><replaceable>b--ar</replaceable></emphasis><emphasis 
role="arg"><replaceable>]</replaceable></e [...]
 <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>
@@ -18711,10 +20695,12 @@ to <replaceable>font</replaceable> (one-character 
name&#160;<replaceable>f</repl
 </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"><replaceable>i--nt</replaceable></emphasis> <emphasis 
role="arg"><replaceable>f---oo</replaceable></emphasis>[, <type>float</type> 
<emphasis role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>var</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"><replaceable>i&#8211;nt</replaceable></emphasis> <emphasis 
role="arg"><replaceable>f---oo</replaceable></emphasis>[, <type>float</type> 
<emphasis role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>r:var</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>
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 0304bdeeab..c91501dbef 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
@@ -53,28 +53,30 @@ Previous: <a href="index.html" accesskey="p" rel="prev">top 
section</a>, Up: <a
 <dl class="first-deffn first-defspec-alias-first-deffn">
 <dt class="deffn defspec-alias-deffn" id="index-foobar"><span 
class="category-def">Special Form: </span><span><strong 
class="def-name">foobar</strong> <var class="def-var-arguments">(var [from to 
[inc]]) default</var><a class="copiable-link" href='#index-foobar'> 
&para;</a></span></dt>
 <dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-1"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments">(var <span class="r">[</span>from to <span 
class="r">[</span>inc<span class="r">]]</span>) r</var><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="def-name">foobar</strong> <var 
class="def-var-arguments">(var <i class="slanted">[</i>from to <i 
class="slanted">[</i>inc<i class="slanted">]]</i>) slanted</var><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="def-name">foobar</strong> <var 
class="def-var-arguments">(var <code class="code">[</code>from to <code 
class="code">[</code>inc<code class="code">]]</code>) code</var><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="def-name">foobar</strong> <var 
class="def-var-arguments">(var <code class="t">[</code>from to <code 
class="t">[</code>inc<code class="t">]]</code>) t</var><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="def-name">foobar</strong> <var 
class="def-var-arguments">(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</var><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="def-name">foobar</strong> <var 
class="def-var-arguments">(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</var><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="def-name">foobar</strong> <var 
class="def-var-arguments">(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</var><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="def-name">foobar</strong> <var 
class="def-var-arguments">(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</var><a class="copiable-link" href='#index-foobar-8'> &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="def-name">foobar</strong> <var 
class="def-var-arguments">(var <var class="var">[</var>from to <var 
class="var">[</var>inc<var class="var">]]</var>) var</var><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="def-name">foobar</strong> <var 
class="def-var-arguments">(var <i class="slanted">[</i>from to <i 
class="slanted">[</i>inc<i class="slanted">]]</i>) slanted</var><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="def-name">foobar</strong> <var 
class="def-var-arguments">(var <code class="code">[</code>from to <code 
class="code">[</code>inc<code class="code">]]</code>) code</var><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="def-name">foobar</strong> <var 
class="def-var-arguments">(var <code class="t">[</code>from to <code 
class="t">[</code>inc<code class="t">]]</code>) t</var><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="def-name">foobar</strong> <var 
class="def-var-arguments">(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</var><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="def-name">foobar</strong> <var 
class="def-var-arguments">(var <span class="r"><var 
class="var">[</var></span>from to <span class="r"><var 
class="var">[</var></span>inc<span class="r"><var class="var">]]</var></span>) 
r:var</var><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="def-name">foobar</strong> <var 
class="def-var-arguments">(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</var><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="def-name">foobar</strong> <var 
class="def-var-arguments">(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</var><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="def-name">foobar</strong> <var 
class="def-var-arguments">(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</var><a class="copiable-link" href='#index-foobar-10'> 
&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-9"><span 
class="category-def">Special Form: </span><span><strong 
class="def-name">foobar</strong> <var class="def-var-arguments">va&mdash;riable 
default</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><var class="var">va&mdash;riable</var> var</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><span class="r">va&mdash;riable</span> r</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><i class="slanted">va&mdash;riable</i> 
slanted</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="code">va---riable</code> code</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="t">va---riable</code> t</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="t"><b 
class="b">va&mdash;riable</b></code> t:b</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><span class="r"><var 
class="var">va&mdash;riable</var></span> r:var</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><span class="r"><i 
class="slanted">va&mdash;riable</i></span> r:slanted</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><span class="r"><code 
class="code">va---riable</code></span> r:code</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><span class="r"><code 
class="t">va---riable</code></span> r:t</var><a class="copiable-link" 
href='#index-foobar-19'> &para;</a></span></dt>
+<dt class="deffn defspec-alias-deffn" id="index-foobar-11"><span 
class="category-def">Special Form: </span><span><strong 
class="def-name">foobar</strong> <var class="def-var-arguments">va&mdash;riable 
default</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><var class="var">va&mdash;riable</var> var</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><span class="r">va&mdash;riable</span> r</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><i class="slanted">va&mdash;riable</i> 
slanted</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="code">va---riable</code> code</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="t">va---riable</code> t</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="t"><b 
class="b">va&mdash;riable</b></code> t:b</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><span class="r"><var 
class="var">va&mdash;riable</var></span> r:var</var><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="def-name">foobar</strong> <var 
class="def-var-arguments"><span class="r"><i 
class="slanted">va&mdash;riable</i></span> r:slanted</var><a 
class="copiable-link" href='#index-foobar-19'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-20"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><span class="r"><code 
class="code">va---riable</code></span> r:code</var><a class="copiable-link" 
href='#index-foobar-20'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-21"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><span class="r"><code 
class="t">va---riable</code></span> r:t</var><a class="copiable-link" 
href='#index-foobar-21'> &para;</a></span></dt>
 <dd><p>name
 </p></dd></dl>
 
@@ -90,18 +92,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-20"><span 
class="category-def">Special Form: </span><span><strong 
class="def-name">foobar</strong> <var class="def-var-arguments">[ <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=" [...]
-<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-21"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments">[] <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></var [...]
+<dt class="deffn defspec-alias-deffn" id="index-foobar-22"><span 
class="category-def">Special Form: </span><span><strong 
class="def-name">foobar</strong> <var class="def-var-arguments">[ <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=" [...]
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-23"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments">[] <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></var [...]
 <dd><p>test formatting of separators
 </p></dd></dl>
 
 <dl class="first-deftypefn">
-<dt class="deftypefn" id="index-foobar-22"><span class="category-def">Library 
Function: </span><span><code class="def-type">int</code> <strong 
class="def-name">foobar</strong> <code class="def-code-arguments">(int <var 
class="var">f---oo</var>, float <var class="var">b--ar</var>)</code><a 
class="copiable-link" href='#index-foobar-22'> &para;</a></span></dt>
+<dt class="deftypefn" id="index-foobar-24"><span class="category-def">Library 
Function: </span><span><code class="def-type">int</code> <strong 
class="def-name">foobar</strong> <code class="def-code-arguments">(int <var 
class="var">f---oo</var>, float <var class="var">b--ar</var>)</code><a 
class="copiable-link" href='#index-foobar-24'> &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-23"><span class="category-def">Library 
Function: </span><span><code class="def-type">int</code> <strong 
class="def-name">foobar</strong> <code class="def-code-arguments">(int <span 
class="r"><i class="slanted">f&mdash;oo</i></span>, float <span class="r"><i 
class="slanted">b&ndash;ar</i></span>)</code><a class="copiable-link" 
href='#index-foobar-23'> &para;</a></span></dt>
+<dt class="deftypefn" id="index-foobar-25"><span class="category-def">Library 
Function: </span><span><code class="def-type">int</code> <strong 
class="def-name">foobar</strong> <code class="def-code-arguments">(int <span 
class="r"><i class="slanted">f&mdash;oo</i></span>, float <span class="r"><i 
class="slanted">b&ndash;ar</i></span>)</code><a class="copiable-link" 
href='#index-foobar-25'> &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>
 
@@ -118,7 +120,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-24"><span class="category-def">Library 
Function: </span><span><code class="def-type">int</code> <strong 
class="def-name">foobar</strong> <code class="def-code-arguments">(int <var 
class="var">foo</var>, float <var class="var">bar</var>)</code><a 
class="copiable-link" href='#index-foobar-24'> &para;</a></span></dt>
+<dt class="deftypefn" id="index-foobar-26"><span class="category-def">Library 
Function: </span><span><code class="def-type">int</code> <strong 
class="def-name">foobar</strong> <code class="def-code-arguments">(int <var 
class="var">foo</var>, float <var class="var">bar</var>)</code><a 
class="copiable-link" href='#index-foobar-26'> &para;</a></span></dt>
 <dd><p>&hellip; for <var class="var">foo</var> and <var class="var">bar</var>
 </p></dd></dl>
 </blockquote>
@@ -139,28 +141,32 @@ 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-25"><span class="category-def">Library 
Function: </span><span><code class="def-type">int</code> <strong 
class="def-name">foobar</strong> <code class="def-code-arguments">(int <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) 
default</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(int <var class="var">f---oo</var><span 
class="r">[</span>, float <var class="var">b--ar</var><span class="r">]</span>) 
r</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(int <var class="var">f---oo</var><i 
class="slanted">[</i>, float <var class="var">b--ar</var><i 
class="slanted">]</i>) slanted</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(int <var class="var">f---oo</var><code 
class="code">[</code>, float <var class="var">b--ar</var><code 
class="code">]</code>) code</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(int <var class="var">f---oo</var><code 
class="t">[</code>, float <var class="var">b--ar</var><code class="t">]</code>) 
t</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(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</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(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</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(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</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(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</code><a class="copiable-link" href='#index-foobar-33'> 
&para;</a></span></dt>
+<dt class="deftypefn" id="index-foobar-27"><span class="category-def">Library 
Function: </span><span><code class="def-type">int</code> <strong 
class="def-name">foobar</strong> <code class="def-code-arguments">(int <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) 
default</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(int <var class="var">f---oo</var><span 
class="r">[</span>, float <var class="var">b--ar</var><span class="r">]</span>) 
r</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(int <var class="var">f---oo</var><var 
class="var">[</var>, float <var class="var">b--ar</var><var 
class="var">]</var>) var</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(int <var class="var">f---oo</var><i 
class="slanted">[</i>, float <var class="var">b--ar</var><i 
class="slanted">]</i>) slanted</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(int <var class="var">f---oo</var><code 
class="code">[</code>, float <var class="var">b--ar</var><code 
class="code">]</code>) code</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(int <var class="var">f---oo</var><code 
class="t">[</code>, float <var class="var">b--ar</var><code class="t">]</code>) 
t</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(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</code><a class="copiable-link" 
href='#index-foobar-33'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-34"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(int <var class="var">f---oo</var><span 
class="r"><var class="var">[</var></span>, float <var 
class="var">b--ar</var><span class="r"><var class="var">]</var></span>) 
r:var</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(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</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(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</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(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</code><a class="copiable-link" href='#index-foobar-37'> 
&para;</a></span></dt>
 <dd><p>separators
 </p></dd></dl>
 
 <dl class="first-deftypefn">
-<dt class="deftypefn" id="index-foobar-34"><span class="category-def">Library 
Function: </span><span><code class="def-type">int</code> <strong 
class="def-name">foobar</strong> <code class="def-code-arguments">(i--nt <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) 
default</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<span class="r">i&ndash;nt</span> <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) r</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<i class="slanted">i&ndash;nt</i> <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) 
slanted</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<code class="code">i--nt</code> <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) code</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<code class="t">i--nt</code> <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) t</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<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</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<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</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<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</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<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</code><a class="copiable-link" href='#index-foobar-42'> 
&para;</a></span></dt>
+<dt class="deftypefn" id="index-foobar-38"><span class="category-def">Library 
Function: </span><span><code class="def-type">int</code> <strong 
class="def-name">foobar</strong> <code class="def-code-arguments">(i--nt <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) 
default</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<span class="r">i&ndash;nt</span> <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) r</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<var class="var">i--nt</var> <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) var</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<i class="slanted">i&ndash;nt</i> <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) 
slanted</code><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><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<code class="code">i--nt</code> <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) code</code><a 
class="copiable-link" href='#index-foobar-42'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-43"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<code class="t">i--nt</code> <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) t</code><a 
class="copiable-link" href='#index-foobar-43'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-44"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<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</code><a class="copiable-link" href='#index-foobar-44'> 
&para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-45"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<span class="r"><var 
class="var">i&ndash;nt</var></span> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) r:var</code><a class="copiable-link" 
href='#index-foobar-45'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-46"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<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</code><a class="copiable-link" 
href='#index-foobar-46'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-47"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<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</code><a class="copiable-link" 
href='#index-foobar-47'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-48"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<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</code><a class="copiable-link" href='#index-foobar-48'> 
&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 7eb92c7e73..1d78930d03 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
@@ -113,6 +113,11 @@ deffn r slanted for \textsl{a---rg1} and \textsl{a--rg2}
 
 
 
+\index[fn]{foobar@\texttt{foobar}}%
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var \textsl{[}from to 
\textsl{[}inc\textsl{]]}) var}}\EmbracOff{}}\hfill[Special Form]
+
+
+
 \index[fn]{foobar@\texttt{foobar}}%
 \noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var \textsl{[}from to 
\textsl{[}inc\textsl{]]}) slanted}}\EmbracOff{}}\hfill[Special Form]
 
@@ -140,6 +145,11 @@ deffn r slanted for \textsl{a---rg1} and \textsl{a--rg2}
 
\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{}\textnormal{\textsl{(var 
\EmbracOff{}\textnormal{\textsl{[}}\EmbracOn{}from to 
\EmbracOff{}\textnormal{\textsl{[}}\EmbracOn{}inc\EmbracOff{}\textnormal{\textsl{]]}}\EmbracOn{})
 r:var}}\EmbracOff{}}\hfill[Special Form]
+
+
+
 \index[fn]{foobar@\texttt{foobar}}%
 \noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracOff{}\textnormal{\textsl{[}}\EmbracOn{}from to 
\EmbracOff{}\textnormal{\textsl{[}}\EmbracOn{}inc\EmbracOff{}\textnormal{\textsl{]]}}\EmbracOn{})
 r:slanted}}\EmbracOff{}}\hfill[Special Form]
 
@@ -375,6 +385,11 @@ In deffn with code and var used
 
 
 
+\index[fn]{foobar@\texttt{foobar}}%
+\noindent\texttt{int foobar (int \textsl{f{-}{-}{-}oo}\textsl{[}, float 
\textsl{b{-}{-}ar}\textsl{]}) var}\hfill[Library Function]
+
+
+
 \index[fn]{foobar@\texttt{foobar}}%
 \noindent\texttt{int foobar (int \textsl{f{-}{-}{-}oo}\textsl{[}, float 
\textsl{b{-}{-}ar}\textsl{]}) slanted}\hfill[Library Function]
 
@@ -395,6 +410,11 @@ In deffn with code and var used
 
 
 
+\index[fn]{foobar@\texttt{foobar}}%
+\noindent\texttt{int foobar (int \textsl{f{-}{-}{-}oo}\textnormal{\textsl{[}}, 
float \textsl{b{-}{-}ar}\textnormal{\textsl{]}}) r:var}\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]
 
@@ -425,6 +445,11 @@ separators
 
 
 
+\index[fn]{foobar@\texttt{foobar}}%
+\noindent\texttt{int foobar (\textsl{i{-}{-}nt} \textsl{f{-}{-}{-}oo}[, float 
\textsl{b{-}{-}ar}]) var}\hfill[Library Function]
+
+
+
 \index[fn]{foobar@\texttt{foobar}}%
 \noindent\texttt{int foobar (\textsl{i{-}{-}nt} \textsl{f{-}{-}{-}oo}[, float 
\textsl{b{-}{-}ar}]) slanted}\hfill[Library Function]
 
@@ -445,6 +470,11 @@ separators
 
 
 
+\index[fn]{foobar@\texttt{foobar}}%
+\noindent\texttt{int foobar (\textnormal{\textsl{i--nt}} 
\textsl{f{-}{-}{-}oo}[, float \textsl{b{-}{-}ar}]) r:var}\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]
 



reply via email to

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