texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: Move combined_fonts test to converters_tests. Add


From: Patrice Dumas
Subject: branch master updated: Move combined_fonts test to converters_tests. Add more in definition_commands test.
Date: Sun, 21 Aug 2022 17:17:30 -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 1da5c3b5a2 Move combined_fonts test to converters_tests.  Add more in 
definition_commands test.
1da5c3b5a2 is described below

commit 1da5c3b5a2b93c51cd729b85cf25ce3672043192
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Aug 21 23:16:49 2022 +0200

    Move combined_fonts test to converters_tests.  Add more in 
definition_commands
    test.
---
 tp/t/converters_tests.t                            |    50 +
 tp/t/latex_tests.t                                 |    34 -
 .../combined_fonts.pl                              |    91 +-
 .../combined_fonts/res_docbook/combined_fonts.xml  |    33 +
 .../combined_fonts/res_html/chapter.html           |    65 +
 .../combined_fonts/res_html/index.html             |    43 +
 .../combined_fonts/res_info/combined_fonts.info    |    44 +
 .../combined_fonts/res_latex/combined_fonts.tex    |     1 -
 .../combined_fonts/res_xml/combined_fonts.xml      |    39 +
 .../converters_tests/definition_commands.pl        | 13350 +++++++++++++------
 .../definition_commands/res_html/chapter.html      |    92 +-
 .../res_latex/definition_commands.tex              |   128 +
 12 files changed, 9611 insertions(+), 4359 deletions(-)

diff --git a/tp/t/converters_tests.t b/tp/t/converters_tests.t
index 0e72c1b9c5..89a6e6d07c 100644
--- a/tp/t/converters_tests.t
+++ b/tp/t/converters_tests.t
@@ -830,6 +830,10 @@ deffn r slanted for @var{a---rg1} and @var{a--rg2}
 @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
+@defspecx foobar (var @code{@var{[}}from to @code{@var{[}}inc@code{@var{]]}}) 
code:var
+@defspecx foobar (var @t{@var{[}}from to @t{@var{[}}inc@t{@var{]]}}) t:var
+@defspecx foobar (var @code{@slanted{[}}from to 
@code{@slanted{[}}inc@code{@slanted{]]}}) code:slanted
+@defspecx foobar (var @t{@slanted{[}}from to 
@t{@slanted{[}}inc@t{@slanted{]]}}) t:slanted
 separators
 @end defspec
 
@@ -844,6 +848,10 @@ separators
 @defspecx foobar @r{@slanted{va---riable}} r:slanted
 @defspecx foobar @r{@code{va---riable}} r:code
 @defspecx foobar @r{@t{va---riable}} r:t
+@defspecx foobar @code{@var{va---riable}} code:var
+@defspecx foobar @t{@var{va---riable}} t:var
+@defspecx foobar @code{@slanted{va---riable}} code:slanted
+@defspecx foobar @t{@slanted{va---riable}} t:slanted
 name
 @end defspec
 
@@ -909,6 +917,10 @@ In deffn with code and var used
 @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
+@deftypefnx {Library Function} int foobar  (int @var{f---oo}@code{@var{[}}, 
float @var{b--ar}@code{@var{]}}) code:var
+@deftypefnx {Library Function} int foobar  (int @var{f---oo}@t{@var{[}}, float 
@var{b--ar}@t{@var{]}}) t:var
+@deftypefnx {Library Function} int foobar  (int 
@var{f---oo}@code{@slanted{[}}, float @var{b--ar}@code{@slanted{]}}) 
code:slanted
+@deftypefnx {Library Function} int foobar  (int @var{f---oo}@t{@slanted{[}}, 
float @var{b--ar}@t{@slanted{]}}) t:slanted
 separators
 @end deftypefn
 
@@ -923,6 +935,10 @@ separators
 @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
+@deftypefnx {Library Function} int foobar  (@code{@var{i--nt}} @var{f---oo}[, 
float @var{b--ar}]) code:var
+@deftypefnx {Library Function} int foobar  (@t{@var{i--nt}} @var{f---oo}[, 
float @var{b--ar}]) t:var
+@deftypefnx {Library Function} int foobar  (@code{@slanted{i--nt}} 
@var{f---oo}[, float @var{b--ar}]) code:slanted
+@deftypefnx {Library Function} int foobar  (@t{@slanted{i--nt}} @var{f---oo}[, 
float @var{b--ar}]) t:slanted
 name
 @end deftypefn
 
@@ -1051,6 +1067,40 @@ undef, {'test_file' => 'minimal_empty_with_input.texi'}],
 undef, {'test_file' => 'minimal_empty_empty.texi'}],
 ['empty',
 undef, {'test_file' => 'empty.texi'}],
+['combined_fonts',
+'@setfilename combined_fonts.info
+
+@node Top
+@top top section
+
+@node chapter
+@chapter chapter
+
+@code{code}, @dfn{dfn}, @var{var}, @strong{strong}, @kbd{kbd}, @samp{samp}.
+
+@code{@dfn{dfn in code}}
+@var{@code{code in var}}
+@code{@var{var in code}}
+@strong{@kbd{kbd in strong}}
+@samp{@strong{strong in samp}}
+@strong{@samp{samp in strong}}
+
+@cite{cite}
+
+@code{@cite{cite in code}}
+@cite{@code{code in cite}}
+
+@code{code} @slanted{slanted} @b{b}
+@code{@slanted{slanted in code}}
+@slanted{@code{code in slanted}}
+@b{@slanted{slanted in b}}
+@slanted{@b{b in slanted}}
+
+@example
+@var{var in example}
+@cite{cite in example}
+@end example
+'],
 );
 
 my %info_tests = (
diff --git a/tp/t/latex_tests.t b/tp/t/latex_tests.t
index d21fd104fc..87af8fecd2 100644
--- a/tp/t/latex_tests.t
+++ b/tp/t/latex_tests.t
@@ -736,40 +736,6 @@ New para
 
 Describe @error{}.
 '],
-['combined_fonts',
-'@setfilename combined_fonts.info
-
-@node Top
-@top top section
-
-@node chapter
-@chapter chapter
-
-@code{code}, @dfn{dfn}, @var{var}, @strong{strong}, @kbd{kbd}, @samp{samp}.
-
-@code{@dfn{dfn in code}}
-@var{@code{code in var}}
-@code{@var{var in code}}
-@strong{@kbd{kbd in strong}}
-@samp{@strong{strong in samp}}
-@strong{@samp{samp in strong}}
-
-@cite{cite}
-
-@code{@cite{cite in code}}
-@cite{@code{code in cite}}
-
-@code{code} @slanted{slanted} @b{b}
-@code{@slanted{slanted in code}}
-@slanted{@code{code in slanted}}
-@b{@slanted{slanted in b}}
-@slanted{@b{b in slanted}}
-
-@example
-@var{var in example}
-@cite{cite in example}
-@end example
-'],
 ['brace_in_index',
 '@{
 
diff --git a/tp/t/results/latex_tests/combined_fonts.pl 
b/tp/t/results/converters_tests/combined_fonts.pl
similarity index 96%
rename from tp/t/results/latex_tests/combined_fonts.pl
rename to tp/t/results/converters_tests/combined_fonts.pl
index a7f0e0aedf..29792a3322 100644
--- a/tp/t/results/latex_tests/combined_fonts.pl
+++ b/tp/t/results/converters_tests/combined_fonts.pl
@@ -10,45 +10,39 @@ $result_trees{'combined_fonts'} = {
     {
       'contents' => [
         {
-          'contents' => [
+          'args' => [
             {
-              'args' => [
+              'contents' => [
                 {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'combined_fonts.info'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
                   'parent' => {},
-                  'type' => 'line_arg'
+                  'text' => 'combined_fonts.info'
                 }
               ],
-              'cmdname' => 'setfilename',
               'extra' => {
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'combined_fonts.info'
+                'spaces_after_argument' => '
+'
               },
               'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 1,
-                'macro' => ''
-              }
-            },
-            {
-              'parent' => {},
-              'text' => '
-',
-              'type' => 'empty_line'
+              'type' => 'line_arg'
             }
           ],
+          'cmdname' => 'setfilename',
+          'extra' => {
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'combined_fonts.info'
+          },
           'parent' => {},
-          'type' => 'preamble_before_content'
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 1,
+            'macro' => ''
+          }
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
         }
       ],
       'parent' => {},
@@ -1187,11 +1181,10 @@ $result_trees{'combined_fonts'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0];
-$result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0];
 $result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'combined_fonts'}{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'combined_fonts'}{'contents'}[0];
 $result_trees{'combined_fonts'}{'contents'}[0]{'parent'} = 
$result_trees{'combined_fonts'};
 
$result_trees{'combined_fonts'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'combined_fonts'}{'contents'}[1]{'args'}[0];
 $result_trees{'combined_fonts'}{'contents'}[1]{'args'}[0]{'parent'} = 
$result_trees{'combined_fonts'}{'contents'}[1];
@@ -1512,38 +1505,4 @@ $result_errors{'combined_fonts'} = [];
 $result_floats{'combined_fonts'} = {};
 
 
-
-$result_converted{'latex'}->{'combined_fonts'} = '
-\\begin{document}
-\\label{anchor:Top}%
-\\chapter{{chapter}}
-\\label{anchor:chapter}%
-
-\\texttt{code}, \\textsl{dfn}, \\GNUTexinfocommandstyletextvar{var}, 
\\textbf{strong}, \\GNUTexinfocommandstyletextkbd{kbd}, `\\texttt{samp}\'.
-
-\\texttt{\\textsl{dfn in code}}
-\\GNUTexinfocommandstyletextvar{\\texttt{code in var}}
-\\texttt{\\GNUTexinfocommandstyletextvar{var in code}}
-\\textbf{\\GNUTexinfocommandstyletextkbd{kbd in strong}}
-`\\texttt{\\textbf{strong in samp}}\'
-\\textbf{`\\texttt{samp in strong}\'}
-
-\\GNUTexinfocommandstyletextcite{cite}
-
-\\texttt{\\GNUTexinfocommandstyletextcite{cite in code}}
-\\GNUTexinfocommandstyletextcite{\\texttt{code in cite}}
-
-\\texttt{code} \\textsl{slanted} \\textbf{b}
-\\texttt{\\textsl{slanted in code}}
-\\textsl{\\texttt{code in slanted}}
-\\textbf{\\textsl{slanted in b}}
-\\textsl{\\textbf{b in slanted}}
-
-\\begin{GNUTexinfopreformatted}
-\\leftskip=2em\\relax\\ttfamily%
-\\GNUTexinfocommandstyletextvar{var in example}
-\\GNUTexinfocommandstyletextcite{cite in example}
-\\end{GNUTexinfopreformatted}
-';
-
 1;
diff --git 
a/tp/t/results/converters_tests/combined_fonts/res_docbook/combined_fonts.xml 
b/tp/t/results/converters_tests/combined_fonts/res_docbook/combined_fonts.xml
new file mode 100644
index 0000000000..69a66d1f39
--- /dev/null
+++ 
b/tp/t/results/converters_tests/combined_fonts/res_docbook/combined_fonts.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" 
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+  <!ENTITY tex "TeX">
+  <!ENTITY latex "LaTeX">
+]>
+<book id="combined_fonts.xml" lang="en">
+<chapter label="1" id="chapter">
+<title>chapter</title>
+
+<para><literal>code</literal>, <firstterm>dfn</firstterm>, 
<replaceable>var</replaceable>, <emphasis role="bold">strong</emphasis>, 
<userinput>kbd</userinput>, &#8216;<literal>samp</literal>&#8217;.
+</para>
+<para><literal><firstterm>dfn in code</firstterm></literal>
+<replaceable><literal>code in var</literal></replaceable>
+<literal><replaceable>var in code</replaceable></literal>
+<emphasis role="bold"><userinput>kbd in strong</userinput></emphasis>
+&#8216;<literal><emphasis role="bold">strong in 
samp</emphasis></literal>&#8217;
+<emphasis role="bold">&#8216;<literal>samp in 
strong</literal>&#8217;</emphasis>
+</para>
+<para><citetitle>cite</citetitle>
+</para>
+<para><literal><citetitle>cite in code</citetitle></literal>
+<citetitle><literal>code in cite</literal></citetitle>
+</para>
+<para><literal>code</literal> slanted <emphasis role="bold">b</emphasis>
+<literal>slanted in code</literal>
+<literal>code in slanted</literal>
+<emphasis role="bold">slanted in b</emphasis>
+<emphasis role="bold">b in slanted</emphasis>
+</para>
+<screen><replaceable>var in example</replaceable>
+<citetitle>cite in example</citetitle>
+</screen></chapter>
+</book>
diff --git a/tp/t/results/converters_tests/combined_fonts/res_html/chapter.html 
b/tp/t/results/converters_tests/combined_fonts/res_html/chapter.html
new file mode 100644
index 0000000000..d6de6b645e
--- /dev/null
+++ b/tp/t/results/converters_tests/combined_fonts/res_html/chapter.html
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>chapter (top section)</title>
+
+<meta name="description" content="chapter (top section)">
+<meta name="keywords" content="chapter (top section)">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="index.html" rel="prev" title="Top">
+<style type="text/css">
+<!--
+div.example {margin-left: 3.2em}
+kbd.kbd {font-style: oblique}
+-->
+</style>
+
+
+</head>
+
+<body lang="en">
+<div class="chapter-level-extent" id="chapter">
+<div class="nav-panel">
+<p>
+Previous: <a href="index.html" accesskey="p" rel="prev">top section</a>, Up: 
<a href="index.html" accesskey="u" rel="up">top section</a> &nbsp; </p>
+</div>
+<hr>
+<h2 class="chapter" id="chapter-1">1 chapter</h2>
+
+<p><code class="code">code</code>, <em class="dfn">dfn</em>, <var 
class="var">var</var>, <strong class="strong">strong</strong>, <kbd 
class="kbd">kbd</kbd>, &lsquo;<samp class="samp">samp</samp>&rsquo;.
+</p>
+<p><code class="code"><em class="dfn">dfn in code</em></code>
+<var class="var"><code class="code">code in var</code></var>
+<code class="code"><var class="var">var in code</var></code>
+<strong class="strong"><kbd class="kbd">kbd in strong</kbd></strong>
+&lsquo;<samp class="samp"><strong class="strong">strong in 
samp</strong></samp>&rsquo;
+<strong class="strong">&lsquo;<samp class="samp">samp in 
strong</samp>&rsquo;</strong>
+</p>
+<p><cite class="cite">cite</cite>
+</p>
+<p><code class="code"><cite class="cite">cite in code</cite></code>
+<cite class="cite"><code class="code">code in cite</code></cite>
+</p>
+<p><code class="code">code</code> <i class="slanted">slanted</i> <b 
class="b">b</b>
+<code class="code"><i class="slanted">slanted in code</i></code>
+<i class="slanted"><code class="code">code in slanted</code></i>
+<b class="b"><i class="slanted">slanted in b</i></b>
+<i class="slanted"><b class="b">b in slanted</b></i>
+</p>
+<div class="example">
+<pre class="example-preformatted"><var class="var">var in example</var>
+<cite class="cite">cite in example</cite>
+</pre></div>
+</div>
+
+
+
+</body>
+</html>
diff --git a/tp/t/results/converters_tests/combined_fonts/res_html/index.html 
b/tp/t/results/converters_tests/combined_fonts/res_html/index.html
new file mode 100644
index 0000000000..5d606287e0
--- /dev/null
+++ b/tp/t/results/converters_tests/combined_fonts/res_html/index.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Top (top section)</title>
+
+<meta name="description" content="Top (top section)">
+<meta name="keywords" content="Top (top section)">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<link href="#Top" rel="start" title="Top">
+<link href="chapter.html" rel="next" title="chapter">
+
+
+</head>
+
+<body lang="en">
+
+<div class="top-level-extent" id="Top">
+<div class="nav-panel">
+<p>
+Next: <a href="chapter.html" accesskey="n" rel="next">chapter</a> &nbsp; </p>
+</div>
+<hr>
+<h1 class="top" id="top-section">top section</h1>
+
+<ul class="mini-toc">
+<li><a href="chapter.html" accesskey="1">chapter</a></li>
+</ul>
+</div>
+<hr>
+<div class="nav-panel">
+<p>
+Next: <a href="chapter.html" accesskey="n" rel="next">chapter</a> &nbsp; </p>
+</div>
+
+
+
+</body>
+</html>
diff --git 
a/tp/t/results/converters_tests/combined_fonts/res_info/combined_fonts.info 
b/tp/t/results/converters_tests/combined_fonts/res_info/combined_fonts.info
new file mode 100644
index 0000000000..c65af0f58c
--- /dev/null
+++ b/tp/t/results/converters_tests/combined_fonts/res_info/combined_fonts.info
@@ -0,0 +1,44 @@
+This is combined_fonts.info, produced from .
+
+
+File: combined_fonts.info,  Node: Top,  Next: chapter,  Up: (dir)
+
+top section
+***********
+
+* Menu:
+
+* chapter::
+
+
+File: combined_fonts.info,  Node: chapter,  Prev: Top,  Up: Top
+
+1 chapter
+*********
+
+‘code’, “dfn”, VAR, *strong*, ‘kbd’, ‘samp’.
+
+   ‘“dfn in code”’ ‘CODE IN VAR’ ‘VAR IN CODE’ *‘kbd in strong’*
+‘*strong in samp*’ *‘samp in strong’*
+
+   ‘cite’
+
+   ‘‘cite in code’’ ‘‘code in cite’’
+
+   ‘code’ slanted b ‘slanted in code’ ‘code in slanted’ slanted in b b
+in slanted
+
+     VAR IN EXAMPLE
+     ‘cite in example’
+
+
+Tag Table:
+Node: Top46
+Node: chapter162
+
+End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git 
a/tp/t/results/latex_tests/combined_fonts/res_latex/combined_fonts.tex 
b/tp/t/results/converters_tests/combined_fonts/res_latex/combined_fonts.tex
similarity index 99%
rename from tp/t/results/latex_tests/combined_fonts/res_latex/combined_fonts.tex
rename to 
tp/t/results/converters_tests/combined_fonts/res_latex/combined_fonts.tex
index 081f035a9c..388df03c70 100644
--- a/tp/t/results/latex_tests/combined_fonts/res_latex/combined_fonts.tex
+++ b/tp/t/results/converters_tests/combined_fonts/res_latex/combined_fonts.tex
@@ -68,7 +68,6 @@
 \GNUTexinfosetsingleheader{}%
 
 
-\begin{document}
 \label{anchor:Top}%
 \chapter{{chapter}}
 \label{anchor:chapter}%
diff --git 
a/tp/t/results/converters_tests/combined_fonts/res_xml/combined_fonts.xml 
b/tp/t/results/converters_tests/combined_fonts/res_xml/combined_fonts.xml
new file mode 100644
index 0000000000..a34b5dcec9
--- /dev/null
+++ b/tp/t/results/converters_tests/combined_fonts/res_xml/combined_fonts.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V5.0//EN" 
"http://www.gnu.org/software/texinfo/dtd/5.0/texinfo.dtd";>
+<texinfo>
+<filename file="combined_fonts.xml"></filename>
+<setfilename file="combined_fonts.info" spaces=" 
">combined_fonts.info</setfilename>
+
+<node name="Top" spaces=" "><nodename>Top</nodename><nodenext 
automatic="on">chapter</nodenext></node>
+<top spaces=" "><sectiontitle>top section</sectiontitle>
+
+</top>
+<node name="chapter" spaces=" "><nodename>chapter</nodename><nodeprev 
automatic="on">Top</nodeprev><nodeup automatic="on">Top</nodeup></node>
+<chapter spaces=" "><sectiontitle>chapter</sectiontitle>
+
+<para><code>code</code>, <dfn>dfn</dfn>, <var>var</var>, 
<strong>strong</strong>, <kbd>kbd</kbd>, <samp>samp</samp>.
+</para>
+<para><code><dfn>dfn in code</dfn></code>
+<var><code>code in var</code></var>
+<code><var>var in code</var></code>
+<strong><kbd>kbd in strong</kbd></strong>
+<samp><strong>strong in samp</strong></samp>
+<strong><samp>samp in strong</samp></strong>
+</para>
+<para><cite>cite</cite>
+</para>
+<para><code><cite>cite in code</cite></code>
+<cite><code>code in cite</code></cite>
+</para>
+<para><code>code</code> <slanted>slanted</slanted> <b>b</b>
+<code><slanted>slanted in code</slanted></code>
+<slanted><code>code in slanted</code></slanted>
+<b><slanted>slanted in b</slanted></b>
+<slanted><b>b in slanted</b></slanted>
+</para>
+<example endspaces=" ">
+<pre xml:space="preserve"><var>var in example</var>
+<cite>cite in example</cite>
+</pre></example>
+</chapter>
+</texinfo>
diff --git a/tp/t/results/converters_tests/definition_commands.pl 
b/tp/t/results/converters_tests/definition_commands.pl
index 8c31de6aad..a62814756e 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -3905,74 +3905,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' => 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' => [
                 {
@@ -4013,12 +3945,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' => {
@@ -4028,75 +3968,70 @@ $result_trees{'definition_commands'} = {
                       'text' => ' ',
                       'type' => 'spaces'
                     },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '['
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'var',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 32,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'code',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 32,
+                        'macro' => ''
+                      }
+                    },
                     {
                       'extra' => {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'default'
+                      'text' => 'from'
                     },
                     {
                       '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' => 15
-                },
-                'original_def_cmdname' => 'defspec'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 35,
-                'macro' => ''
-              },
-              'type' => 'def_line'
-            },
-            {
-              'args' => [
-                {
-                  'contents' => [
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
                     {
-                      'contents' => [
-                        {
-                          'parent' => {},
-                          'text' => 'Special Form'
-                        }
-                      ],
                       'extra' => {
-                        'def_role' => 'category'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'type' => 'bracketed_inserted'
+                      'text' => 'to'
                     },
                     {
                       'extra' => {
@@ -4104,37 +4039,90 @@ $result_trees{'definition_commands'} = {
                       },
                       'parent' => {},
                       'text' => ' ',
-                      'type' => 'spaces_inserted'
+                      'type' => 'spaces'
                     },
                     {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '['
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'var',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 32,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'code',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'name'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'foobar'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 32,
+                        'macro' => ''
+                      }
                     },
                     {
                       'extra' => {
-                        'def_role' => 'spaces'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
+                      'text' => 'inc'
                     },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ']]'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'var',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'va---riable'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 32,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 'code',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -4142,10 +4130,18 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 36,
+                        'line_nr' => 32,
                         'macro' => ''
                       }
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ')',
+                      'type' => 'delimiter'
+                    },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
@@ -4159,7 +4155,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'var'
+                      'text' => 'code:var'
                     },
                     {
                       'extra' => {
@@ -4196,7 +4192,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec',
                   'node' => {},
-                  'number' => 16
+                  'number' => 15
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -4204,7 +4200,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 36,
+                'line_nr' => 32,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -4249,20 +4245,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' => 'var',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'va---riable'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 33,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -4270,89 +4307,31 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 37,
+                        'line_nr' => 33,
                         'macro' => ''
                       }
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
                     {
                       'extra' => {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'r'
+                      'text' => 'from'
                     },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => '
-',
-                      'type' => 'spaces_at_end'
-                    }
-                  ],
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'defspecx',
-              'extra' => {
-                'def_command' => 'defspec',
-                'def_parsed_hash' => {
-                  'category' => {},
-                  'name' => {}
-                },
-                'index_entry' => {
-                  'command' => {},
-                  'content' => [
-                    {}
-                  ],
-                  'content_normalized' => [
-                    {}
-                  ],
-                  'in_code' => 1,
-                  'index_at_command' => 'defspecx',
-                  'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 17
-                },
-                'original_def_cmdname' => 'defspecx',
-                'spaces_before_argument' => ' '
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 37,
-                'macro' => ''
-              },
-              'type' => 'def_line'
-            },
-            {
-              'args' => [
-                {
-                  'contents' => [
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
                     {
-                      'contents' => [
-                        {
-                          'parent' => {},
-                          'text' => 'Special Form'
-                        }
-                      ],
                       'extra' => {
-                        'def_role' => 'category'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'type' => 'bracketed_inserted'
+                      'text' => 'to'
                     },
                     {
                       'extra' => {
@@ -4360,37 +4339,90 @@ $result_trees{'definition_commands'} = {
                       },
                       'parent' => {},
                       'text' => ' ',
-                      'type' => 'spaces_inserted'
+                      'type' => 'spaces'
                     },
                     {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '['
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'var',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 33,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 't',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'name'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'foobar'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 33,
+                        'macro' => ''
+                      }
                     },
                     {
                       'extra' => {
-                        'def_role' => 'spaces'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
+                      'text' => 'inc'
                     },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ']]'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'var',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'va---riable'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 33,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'slanted',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -4398,10 +4430,18 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 38,
+                        'line_nr' => 33,
                         'macro' => ''
                       }
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ')',
+                      'type' => 'delimiter'
+                    },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
@@ -4415,7 +4455,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'slanted'
+                      'text' => 't:var'
                     },
                     {
                       'extra' => {
@@ -4452,7 +4492,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec',
                   'node' => {},
-                  'number' => 18
+                  'number' => 16
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -4460,7 +4500,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 38,
+                'line_nr' => 33,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -4505,13 +4545,54 @@ $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' => 'slanted',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'va---riable'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 34,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
@@ -4526,10 +4607,17 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 39,
+                        'line_nr' => 34,
                         'macro' => ''
                       }
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'text' => 'from'
+                    },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
@@ -4543,110 +4631,98 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'code'
+                      'text' => 'to'
                     },
                     {
                       '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' => 19
-                },
-                'original_def_cmdname' => 'defspecx',
-                'spaces_before_argument' => ' '
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 39,
-                'macro' => ''
-              },
-              'type' => 'def_line'
-            },
-            {
-              'args' => [
-                {
-                  'contents' => [
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
                     {
-                      'contents' => [
+                      'args' => [
                         {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '['
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'slanted',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 34,
+                                'macro' => ''
+                              }
+                            }
+                          ],
                           'parent' => {},
-                          'text' => 'Special Form'
+                          'type' => 'brace_command_arg'
                         }
                       ],
+                      'cmdname' => 'code',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'category'
-                      },
-                      'parent' => {},
-                      'type' => 'bracketed_inserted'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces_inserted'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'name'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'foobar'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 34,
+                        'macro' => ''
+                      }
                     },
                     {
                       'extra' => {
-                        'def_role' => 'spaces'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
+                      'text' => 'inc'
                     },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ']]'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'slanted',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'va---riable'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 34,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 't',
+                      'cmdname' => 'code',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -4654,10 +4730,18 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 40,
+                        'line_nr' => 34,
                         'macro' => ''
                       }
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ')',
+                      'type' => 'delimiter'
+                    },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
@@ -4671,7 +4755,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 't'
+                      'text' => 'code:slanted'
                     },
                     {
                       'extra' => {
@@ -4708,7 +4792,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec',
                   'node' => {},
-                  'number' => 20
+                  'number' => 17
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -4716,7 +4800,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 40,
+                'line_nr' => 34,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -4761,6 +4845,29 @@ $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' => [
                         {
@@ -4771,19 +4878,19 @@ $result_trees{'definition_commands'} = {
                                   'contents' => [
                                     {
                                       'parent' => {},
-                                      'text' => 'va---riable'
+                                      'text' => '['
                                     }
                                   ],
                                   'parent' => {},
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 'b',
+                              'cmdname' => 'slanted',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 41,
+                                'line_nr' => 35,
                                 'macro' => ''
                               }
                             }
@@ -4800,89 +4907,16 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 41,
+                        'line_nr' => 35,
                         'macro' => ''
                       }
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
                     {
                       'extra' => {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 't:b'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => '
-',
-                      'type' => 'spaces_at_end'
-                    }
-                  ],
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'defspecx',
-              'extra' => {
-                'def_command' => 'defspec',
-                'def_parsed_hash' => {
-                  'category' => {},
-                  'name' => {}
-                },
-                'index_entry' => {
-                  'command' => {},
-                  'content' => [
-                    {}
-                  ],
-                  'content_normalized' => [
-                    {}
-                  ],
-                  'in_code' => 1,
-                  'index_at_command' => 'defspecx',
-                  'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 21
-                },
-                'original_def_cmdname' => 'defspecx',
-                'spaces_before_argument' => ' '
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 41,
-                'macro' => ''
-              },
-              'type' => 'def_line'
-            },
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'contents' => [
-                        {
-                          'parent' => {},
-                          'text' => 'Special Form'
-                        }
-                      ],
-                      'extra' => {
-                        'def_role' => 'category'
-                      },
-                      'parent' => {},
-                      'type' => 'bracketed_inserted'
+                      'text' => 'from'
                     },
                     {
                       'extra' => {
@@ -4890,14 +4924,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' => {
@@ -4917,19 +4951,19 @@ $result_trees{'definition_commands'} = {
                                   'contents' => [
                                     {
                                       'parent' => {},
-                                      'text' => 'va---riable'
+                                      'text' => '['
                                     }
                                   ],
                                   'parent' => {},
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 'var',
+                              'cmdname' => 'slanted',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 42,
+                                'line_nr' => 35,
                                 'macro' => ''
                               }
                             }
@@ -4938,7 +4972,7 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -4946,29 +4980,87 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 42,
+                        'line_nr' => 35,
                         'macro' => ''
                       }
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
                     {
                       'extra' => {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'r:var'
+                      'text' => 'inc'
                     },
                     {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ']]'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'slanted',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 35,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 't',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 35,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ')',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'text' => 't:slanted'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       'parent' => {},
                       'text' => '
 ',
@@ -5000,7 +5092,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec',
                   'node' => {},
-                  'number' => 22
+                  'number' => 18
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -5008,11 +5100,79 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 42,
+                'line_nr' => 35,
                 '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' => 37,
+                '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' => [
                 {
@@ -5054,47 +5214,11 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => 'va---riable'
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'slanted',
-                              'contents' => [],
-                              'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 43,
-                                'macro' => ''
-                              }
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'r',
-                      'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 43,
-                        'macro' => ''
-                      }
+                      'text' => 'va---riable'
                     },
                     {
                       'extra' => {
@@ -5109,7 +5233,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'r:slanted'
+                      'text' => 'default'
                     },
                     {
                       'extra' => {
@@ -5122,10 +5246,9 @@ $result_trees{'definition_commands'} = {
                     }
                   ],
                   'parent' => {},
-                  'type' => 'line_arg'
+                  'type' => 'block_line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
               'extra' => {
                 'def_command' => 'defspec',
                 'def_parsed_hash' => {
@@ -5141,20 +5264,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' => 23
+                  'number' => 19
                 },
-                'original_def_cmdname' => 'defspecx',
-                'spaces_before_argument' => ' '
+                'original_def_cmdname' => 'defspec'
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 43,
+                'line_nr' => 39,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -5204,33 +5326,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' => 44,
-                                'macro' => ''
-                              }
+                              'text' => 'va---riable'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 'var',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -5238,7 +5342,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 44,
+                        'line_nr' => 40,
                         'macro' => ''
                       }
                     },
@@ -5255,7 +5359,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'r:code'
+                      'text' => 'var'
                     },
                     {
                       'extra' => {
@@ -5292,7 +5396,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec',
                   'node' => {},
-                  'number' => 24
+                  'number' => 20
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -5300,7 +5404,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 44,
+                'line_nr' => 40,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -5350,26 +5454,8 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => 'va---riable'
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 't',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 45,
-                                'macro' => ''
-                              }
+                              'text' => 'va---riable'
                             }
                           ],
                           'parent' => {},
@@ -5384,7 +5470,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 45,
+                        'line_nr' => 41,
                         'macro' => ''
                       }
                     },
@@ -5401,7 +5487,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'r:t'
+                      'text' => 'r'
                     },
                     {
                       'extra' => {
@@ -5438,7 +5524,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'defspec',
                   'node' => {},
-                  'number' => 25
+                  'number' => 21
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -5446,89 +5532,42 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 45,
+                'line_nr' => 41,
                 'macro' => ''
               },
               'type' => 'def_line'
             },
             {
-              'contents' => [
+              'args' => [
                 {
                   'contents' => [
                     {
-                      'parent' => {},
-                      'text' => 'name
-'
-                    }
-                  ],
-                  'parent' => {},
-                  'type' => 'paragraph'
-                }
-              ],
-              'parent' => {},
-              'type' => 'def_item'
-            },
-            {
-              'args' => [
-                {
-                  'contents' => [
+                      'contents' => [
+                        {
+                          'parent' => {},
+                          'text' => 'Special Form'
+                        }
+                      ],
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
+                      'parent' => {},
+                      'type' => 'bracketed_inserted'
+                    },
                     {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       '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' => 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' => [
+                      'text' => ' ',
+                      'type' => 'spaces_inserted'
+                    },
                     {
                       'extra' => {
-                        'def_role' => 'category'
+                        'def_role' => 'name'
                       },
                       'parent' => {},
-                      'text' => 'Request'
+                      'text' => 'foobar'
                     },
                     {
                       'extra' => {
@@ -5544,22 +5583,22 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => '.ft'
+                              'text' => 'va---riable'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 't',
+                      'cmdname' => 'slanted',
                       'contents' => [],
                       'extra' => {
-                        'def_role' => 'name'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 49,
+                        'line_nr' => 42,
                         'macro' => ''
                       }
                     },
@@ -5573,44 +5612,113 @@ $result_trees{'definition_commands'} = {
                     },
                     {
                       'extra' => {
-                        'def_role' => 'delimiter'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => '[',
-                      'type' => 'delimiter'
+                      'text' => 'slanted'
+                    },
+                    {
+                      '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' => 22
+                },
+                'original_def_cmdname' => 'defspecx',
+                'spaces_before_argument' => ' '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 42,
+                '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'
                     },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => 'font'
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'slanted',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 49,
-                                'macro' => ''
-                              }
+                              'text' => 'va---riable'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 'code',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -5618,17 +5726,24 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 49,
+                        'line_nr' => 43,
                         'macro' => ''
                       }
                     },
                     {
                       'extra' => {
-                        'def_role' => 'delimiter'
+                        'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => ']',
-                      'type' => 'delimiter'
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'text' => 'code'
                     },
                     {
                       'extra' => {
@@ -5641,11 +5756,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' => {}
@@ -5659,19 +5775,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' => 26
+                  'number' => 23
                 },
-                'original_def_cmdname' => 'deffn'
+                'original_def_cmdname' => 'defspecx',
+                'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 49,
+                'line_nr' => 43,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -5684,35 +5801,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' => 50,
-                            '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' => {
@@ -5723,92 +5834,44 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
-                      'contents' => [
-                        {
-                          'args' => [
-                            {
-                              'contents' => [
-                                {
-                                  'parent' => {},
-                                  'text' => '\\f'
-                                }
-                              ],
-                              'parent' => {},
-                              'type' => 'brace_command_arg'
-                            }
-                          ],
-                          'cmdname' => 't',
-                          'contents' => [],
-                          'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 50,
-                            'macro' => ''
-                          }
-                        },
-                        {
-                          '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' => {},
-                              'type' => 'brace_command_arg'
-                            }
-                          ],
-                          'cmdname' => 'r',
-                          'contents' => [],
-                          'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 50,
-                            'macro' => ''
-                          }
-                        },
+                      'args' => [
                         {
-                          'args' => [
+                          'contents' => [
                             {
-                              'contents' => [],
                               'parent' => {},
-                              'type' => 'brace_command_arg'
+                              'text' => 'va---riable'
                             }
                           ],
-                          'cmdname' => 't',
-                          'contents' => [],
                           'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 50,
-                            'macro' => ''
-                          }
+                          'type' => 'brace_command_arg'
                         }
                       ],
+                      'cmdname' => 't',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'name'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'type' => 'def_aggregate'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 44,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'text' => 't'
                     },
                     {
                       'extra' => {
@@ -5824,9 +5887,9 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
+              'cmdname' => 'defspecx',
               'extra' => {
-                'def_command' => 'deffn',
+                'def_command' => 'defspec',
                 'def_parsed_hash' => {
                   'category' => {},
                   'name' => {}
@@ -5840,20 +5903,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' => 27
+                  'number' => 24
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 50,
+                'line_nr' => 44,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -5866,35 +5929,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' => 51,
-                            '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' => {
@@ -5905,110 +5962,80 @@ $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' => 51,
-                            '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' => 51,
-                                    'macro' => ''
-                                  }
+                                  'type' => 'brace_command_arg'
                                 }
                               ],
-                              'parent' => {},
-                              'type' => 'brace_command_arg'
-                            }
-                          ],
-                          'cmdname' => 'r',
-                          'contents' => [],
-                          'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 51,
-                            'macro' => ''
-                          }
-                        },
-                        {
-                          'args' => [
-                            {
+                              'cmdname' => 'b',
                               'contents' => [],
                               'parent' => {},
-                              'type' => 'brace_command_arg'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 45,
+                                'macro' => ''
+                              }
                             }
                           ],
-                          'cmdname' => 't',
-                          'contents' => [],
                           'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 51,
-                            'macro' => ''
-                          }
+                          'type' => 'brace_command_arg'
                         }
                       ],
+                      'cmdname' => 't',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'name'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'type' => 'def_aggregate'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 45,
+                        'macro' => ''
+                      }
                     },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => '
-',
-                      'type' => 'spaces_at_end'
-                    }
-                  ],
-                  'parent' => {},
-                  'type' => 'line_arg'
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'text' => 't:b'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
+              'cmdname' => 'defspecx',
               'extra' => {
-                'def_command' => 'deffn',
+                'def_command' => 'defspec',
                 'def_parsed_hash' => {
                   'category' => {},
                   'name' => {}
@@ -6022,20 +6049,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' => 28
+                  'number' => 25
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 51,
+                'line_nr' => 45,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -6048,35 +6075,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' => 52,
-                            'macro' => ''
-                          }
-                        },
-                        {
-                          'parent' => {},
-                          'text' => 'sequence'
+                          'text' => 'Special Form'
                         }
                       ],
                       'extra' => {
                         'def_role' => 'category'
                       },
                       'parent' => {},
-                      'type' => 'def_aggregate'
+                      'type' => 'bracketed_inserted'
                     },
                     {
                       'extra' => {
@@ -6084,100 +6090,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' => 52,
-                            'macro' => ''
-                          }
-                        },
-                        {
-                          'args' => [
-                            {
-                              'contents' => [
-                                {
-                                  'args' => [
-                                    {
-                                      'contents' => [
-                                        {
-                                          'parent' => {},
-                                          'text' => 'font'
-                                        }
-                                      ],
-                                      'parent' => {},
-                                      'type' => 'brace_command_arg'
-                                    }
-                                  ],
-                                  'cmdname' => 'slanted',
-                                  'contents' => [],
-                                  'parent' => {},
-                                  'source_info' => {
-                                    'file_name' => '',
-                                    'line_nr' => 52,
-                                    'macro' => ''
-                                  }
-                                }
-                              ],
-                              'parent' => {},
-                              'type' => 'brace_command_arg'
-                            }
-                          ],
-                          'cmdname' => 'r',
-                          'contents' => [],
-                          'parent' => {},
-                          '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' => ''
-                          }
-                        }
-                      ],
                       'extra' => {
                         'def_role' => 'name'
                       },
                       'parent' => {},
-                      'type' => 'def_aggregate'
+                      'text' => 'foobar'
                     },
                     {
                       'extra' => {
@@ -6187,31 +6107,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' => 52,
-                        'macro' => ''
-                      }
-                    },
                     {
                       'args' => [
                         {
@@ -6222,19 +6117,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' => 52,
+                                'line_nr' => 46,
                                 'macro' => ''
                               }
                             }
@@ -6251,34 +6146,24 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 52,
+                        'line_nr' => 46,
                         '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' => 52,
-                        'macro' => ''
-                      }
+                      'text' => 'r:var'
                     },
                     {
                       'extra' => {
@@ -6294,9 +6179,9 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deffnx',
+              'cmdname' => 'defspecx',
               'extra' => {
-                'def_command' => 'deffn',
+                'def_command' => 'defspec',
                 'def_parsed_hash' => {
                   'category' => {},
                   'name' => {}
@@ -6310,20 +6195,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' => 29
+                  'number' => 26
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 52,
+                'line_nr' => 46,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -6333,11 +6218,17 @@ $result_trees{'definition_commands'} = {
                 {
                   'contents' => [
                     {
+                      'contents' => [
+                        {
+                          'parent' => {},
+                          'text' => 'Special Form'
+                        }
+                      ],
                       'extra' => {
                         'def_role' => 'category'
                       },
                       'parent' => {},
-                      'text' => 'Register'
+                      'type' => 'bracketed_inserted'
                     },
                     {
                       'extra' => {
@@ -6345,50 +6236,98 @@ $result_trees{'definition_commands'} = {
                       },
                       'parent' => {},
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => '\\n[.sty]'
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 't',
-                      'contents' => [],
                       'extra' => {
                         'def_role' => 'name'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 53,
-                        'macro' => ''
-                      }
+                      'text' => 'foobar'
                     },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => '
-',
-                      'type' => 'spaces_at_end'
-                    }
-                  ],
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => 'va---riable'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'slanted',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 47,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 47,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'text' => 'r:slanted'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'line_arg'
+                }
               ],
-              'cmdname' => 'deffnx',
+              'cmdname' => 'defspecx',
               'extra' => {
-                'def_command' => 'deffn',
+                'def_command' => 'defspec',
                 'def_parsed_hash' => {
                   'category' => {},
                   'name' => {}
@@ -6402,245 +6341,170 @@ $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' => 30
+                  'number' => 27
                 },
-                'original_def_cmdname' => 'deffnx',
+                'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 53,
+                'line_nr' => 47,
                 'macro' => ''
               },
               'type' => 'def_line'
             },
             {
-              'contents' => [
+              'args' => [
                 {
                   'contents' => [
                     {
-                      'parent' => {},
-                      'text' => 'The '
-                    },
-                    {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => 'ft'
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'code',
-                      'contents' => [],
-                      'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 54,
-                        'macro' => ''
-                      }
-                    },
-                    {
-                      'parent' => {},
-                      'text' => ' request and the '
-                    },
-                    {
-                      'args' => [
+                      'contents' => [
                         {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => '\\f'
-                            }
-                          ],
                           'parent' => {},
-                          'type' => 'brace_command_arg'
+                          'text' => 'Special Form'
                         }
                       ],
-                      'cmdname' => 'code',
-                      'contents' => [],
-                      'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 54,
-                        'macro' => ''
-                      }
-                    },
-                    {
-                      'parent' => {},
-                      'text' => ' escape change the current font
-'
-                    },
-                    {
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
                       'parent' => {},
-                      'text' => 'to '
+                      'type' => 'bracketed_inserted'
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => 'font'
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'var',
-                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 55,
-                        'macro' => ''
-                      }
+                      'text' => ' ',
+                      'type' => 'spaces_inserted'
                     },
                     {
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
                       'parent' => {},
-                      'text' => ' (one-character name'
+                      'text' => 'foobar'
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'tie',
-                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 55,
-                        'macro' => ''
-                      }
+                      'text' => ' ',
+                      'type' => 'spaces'
                     },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => 'va---riable'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'code',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'f'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 48,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 'r',
                       'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 55,
+                        'line_nr' => 48,
                         'macro' => ''
                       }
                     },
                     {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       'parent' => {},
-                      'text' => ', two-character name
-'
+                      'text' => ' ',
+                      'type' => 'spaces'
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => 'fn'
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'var',
-                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 56,
-                        'macro' => ''
-                      }
+                      'text' => 'r:code'
                     },
                     {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       'parent' => {},
-                      'text' => ').
-'
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
                     }
                   ],
                   'parent' => {},
-                  'type' => 'paragraph'
+                  'type' => 'line_arg'
                 }
               ],
-              'parent' => {},
-              'type' => 'def_item'
-            },
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'deffn'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'end',
+              'cmdname' => 'defspecx',
               'extra' => {
-                'command_argument' => 'deffn',
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'deffn'
+                'def_command' => 'defspec',
+                'def_parsed_hash' => {
+                  'category' => {},
+                  'name' => {}
+                },
+                'index_entry' => {
+                  'command' => {},
+                  'content' => [
+                    {}
+                  ],
+                  'content_normalized' => [
+                    {}
+                  ],
+                  'in_code' => 1,
+                  'index_at_command' => 'defspecx',
+                  'index_ignore_chars' => {},
+                  'index_name' => 'fn',
+                  'index_type_command' => 'defspec',
+                  'node' => {},
+                  'number' => 28
+                },
+                'original_def_cmdname' => 'defspecx',
+                'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 57,
+                'line_nr' => 48,
                 'macro' => ''
-              }
-            }
-          ],
-          'extra' => {
-            'end_command' => {},
-            'spaces_before_argument' => ' '
-          },
-          'parent' => {},
-          'source_info' => {
-            'file_name' => '',
-            'line_nr' => 49,
-            'macro' => ''
-          }
-        },
-        {
-          'parent' => {},
-          'text' => '
-',
-          'type' => 'empty_line'
-        },
-        {
-          'cmdname' => 'defspec',
-          'contents' => [
+              },
+              'type' => 'def_line'
+            },
             {
               'args' => [
                 {
@@ -6681,29 +6545,31 @@ $result_trees{'definition_commands'} = {
                       'text' => ' ',
                       'type' => 'spaces'
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'delimiter'
-                      },
-                      'parent' => {},
-                      'text' => '[',
-                      'type' => 'delimiter'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => 'va---riable'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 't',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => '['
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 49,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
@@ -6718,7 +6584,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 59,
+                        'line_nr' => 49,
                         'macro' => ''
                       }
                     },
@@ -6731,62 +6597,76 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => '['
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'slanted',
-                      'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 59,
-                        'macro' => ''
-                      }
+                      'text' => 'r:t'
                     },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'defspecx',
+              'extra' => {
+                'def_command' => 'defspec',
+                'def_parsed_hash' => {
+                  'category' => {},
+                  'name' => {}
+                },
+                'index_entry' => {
+                  'command' => {},
+                  'content' => [
+                    {}
+                  ],
+                  'content_normalized' => [
+                    {}
+                  ],
+                  'in_code' => 1,
+                  'index_at_command' => 'defspecx',
+                  'index_ignore_chars' => {},
+                  'index_name' => 'fn',
+                  'index_type_command' => 'defspec',
+                  'node' => {},
+                  'number' => 29
+                },
+                'original_def_cmdname' => 'defspecx',
+                'spaces_before_argument' => ' '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 49,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
                     {
-                      'args' => [
+                      'contents' => [
                         {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => '['
-                            }
-                          ],
                           'parent' => {},
-                          'type' => 'brace_command_arg'
+                          'text' => 'Special Form'
                         }
                       ],
-                      'cmdname' => 'code',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'category'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 59,
-                        'macro' => ''
-                      }
+                      'type' => 'bracketed_inserted'
                     },
                     {
                       'extra' => {
@@ -6794,32 +6674,14 @@ $result_trees{'definition_commands'} = {
                       },
                       'parent' => {},
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => '['
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 't',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'name'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 59,
-                        'macro' => ''
-                      }
+                      'text' => 'foobar'
                     },
                     {
                       'extra' => {
@@ -6839,19 +6701,19 @@ $result_trees{'definition_commands'} = {
                                   'contents' => [
                                     {
                                       'parent' => {},
-                                      'text' => '['
+                                      'text' => 'va---riable'
                                     }
                                   ],
                                   'parent' => {},
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 'slanted',
+                              'cmdname' => 'var',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 59,
+                                'line_nr' => 50,
                                 'macro' => ''
                               }
                             }
@@ -6860,7 +6722,7 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 'code',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -6868,7 +6730,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 59,
+                        'line_nr' => 50,
                         'macro' => ''
                       }
                     },
@@ -6881,116 +6743,91 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => '['
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'code',
-                              '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' => ''
-                      }
+                      'text' => 'code:var'
                     },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'defspecx',
+              'extra' => {
+                'def_command' => 'defspec',
+                'def_parsed_hash' => {
+                  'category' => {},
+                  'name' => {}
+                },
+                'index_entry' => {
+                  'command' => {},
+                  'content' => [
+                    {}
+                  ],
+                  'content_normalized' => [
+                    {}
+                  ],
+                  'in_code' => 1,
+                  'index_at_command' => 'defspecx',
+                  'index_ignore_chars' => {},
+                  'index_name' => 'fn',
+                  'index_type_command' => 'defspec',
+                  'node' => {},
+                  'number' => 30
+                },
+                'original_def_cmdname' => 'defspecx',
+                'spaces_before_argument' => ' '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 50,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
                     {
-                      'args' => [
+                      'contents' => [
                         {
-                          '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' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 59,
-                                'macro' => ''
-                              }
-                            }
-                          ],
                           'parent' => {},
-                          'type' => 'brace_command_arg'
+                          'text' => 'Special Form'
                         }
                       ],
-                      'cmdname' => 'r',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'category'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 59,
-                        'macro' => ''
-                      }
+                      'type' => 'bracketed_inserted'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces_inserted'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
+                      'parent' => {},
+                      'text' => 'foobar'
                     },
                     {
                       'extra' => {
@@ -7010,19 +6847,19 @@ $result_trees{'definition_commands'} = {
                                   'contents' => [
                                     {
                                       'parent' => {},
-                                      'text' => '['
+                                      'text' => 'va---riable'
                                     }
                                   ],
                                   'parent' => {},
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 't',
+                              'cmdname' => 'var',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 59,
+                                'line_nr' => 51,
                                 'macro' => ''
                               }
                             }
@@ -7031,7 +6868,7 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -7039,7 +6876,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 59,
+                        'line_nr' => 51,
                         'macro' => ''
                       }
                     },
@@ -7053,44 +6890,75 @@ $result_trees{'definition_commands'} = {
                     },
                     {
                       'extra' => {
-                        'def_role' => 'delimiter'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => ',',
-                      'type' => 'delimiter'
+                      'text' => 't:var'
                     },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'defspecx',
+              'extra' => {
+                'def_command' => 'defspec',
+                'def_parsed_hash' => {
+                  'category' => {},
+                  'name' => {}
+                },
+                'index_entry' => {
+                  'command' => {},
+                  'content' => [
+                    {}
+                  ],
+                  'content_normalized' => [
+                    {}
+                  ],
+                  'in_code' => 1,
+                  'index_at_command' => 'defspecx',
+                  'index_ignore_chars' => {},
+                  'index_name' => 'fn',
+                  'index_type_command' => 'defspec',
+                  'node' => {},
+                  'number' => 31
+                },
+                'original_def_cmdname' => 'defspecx',
+                'spaces_before_argument' => ' '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 51,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
                     {
-                      'args' => [
+                      'contents' => [
                         {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => ','
-                            }
-                          ],
                           'parent' => {},
-                          'type' => 'brace_command_arg'
+                          'text' => 'Special Form'
                         }
                       ],
-                      'cmdname' => 'r',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'category'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 59,
-                        'macro' => ''
-                      }
+                      'type' => 'bracketed_inserted'
                     },
                     {
                       'extra' => {
@@ -7098,32 +6966,14 @@ $result_trees{'definition_commands'} = {
                       },
                       'parent' => {},
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => ','
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'slanted',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'name'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 59,
-                        'macro' => ''
-                      }
+                      'text' => 'foobar'
                     },
                     {
                       'extra' => {
@@ -7138,8 +6988,26 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => 'va---riable'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'slanted',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => ','
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 52,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
@@ -7154,7 +7022,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 59,
+                        'line_nr' => 52,
                         'macro' => ''
                       }
                     },
@@ -7167,80 +7035,76 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => ','
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 't',
-                      'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 59,
-                        'macro' => ''
-                      }
+                      'text' => 'code:slanted'
                     },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'defspecx',
+              'extra' => {
+                'def_command' => 'defspec',
+                'def_parsed_hash' => {
+                  'category' => {},
+                  'name' => {}
+                },
+                'index_entry' => {
+                  'command' => {},
+                  'content' => [
+                    {}
+                  ],
+                  'content_normalized' => [
+                    {}
+                  ],
+                  'in_code' => 1,
+                  'index_at_command' => 'defspecx',
+                  'index_ignore_chars' => {},
+                  'index_name' => 'fn',
+                  'index_type_command' => 'defspec',
+                  'node' => {},
+                  'number' => 32
+                },
+                'original_def_cmdname' => 'defspecx',
+                'spaces_before_argument' => ' '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 52,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
                     {
-                      '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'
+                          'text' => 'Special Form'
                         }
                       ],
-                      'cmdname' => 'r',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'category'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 59,
-                        'macro' => ''
-                      }
+                      'type' => 'bracketed_inserted'
                     },
                     {
                       'extra' => {
@@ -7248,50 +7112,14 @@ $result_trees{'definition_commands'} = {
                       },
                       'parent' => {},
                       'text' => ' ',
-                      'type' => 'spaces'
+                      'type' => 'spaces_inserted'
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => ','
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'code',
-                              'contents' => [],
-                              'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 59,
-                                'macro' => ''
-                              }
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'r',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'name'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 59,
-                        'macro' => ''
-                      }
+                      'text' => 'foobar'
                     },
                     {
                       'extra' => {
@@ -7310,38 +7138,20 @@ $result_trees{'definition_commands'} = {
                                 {
                                   'contents' => [
                                     {
-                                      'args' => [
-                                        {
-                                          'contents' => [
-                                            {
-                                              'parent' => {},
-                                              'text' => ','
-                                            }
-                                          ],
-                                          'parent' => {},
-                                          'type' => 'brace_command_arg'
-                                        }
-                                      ],
-                                      'cmdname' => 'slanted',
-                                      'contents' => [],
                                       'parent' => {},
-                                      'source_info' => {
-                                        'file_name' => '',
-                                        'line_nr' => 59,
-                                        'macro' => ''
-                                      }
+                                      'text' => 'va---riable'
                                     }
                                   ],
                                   'parent' => {},
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 'code',
+                              'cmdname' => 'slanted',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 59,
+                                'line_nr' => 53,
                                 'macro' => ''
                               }
                             }
@@ -7350,7 +7160,7 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -7358,7 +7168,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 59,
+                        'line_nr' => 53,
                         'macro' => ''
                       }
                     },
@@ -7371,129 +7181,138 @@ $result_trees{'definition_commands'} = {
                       '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' => ''
-                      }
+                      'text' => 't:slanted'
                     },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'delimiter'
-                      },
-                      'parent' => {},
-                      'text' => ']',
-                      'type' => 'delimiter'
-                    },
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => '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' => 33
+                },
+                'original_def_cmdname' => 'defspecx',
+                'spaces_before_argument' => ' '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 53,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'contents' => [
+                {
+                  'contents' => [
                     {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
-                    {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => ']'
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'r',
-                      'contents' => [],
-                      'extra' => {
-                        'def_role' => 'arg'
-                      },
-                      'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 59,
-                        'macro' => ''
-                      }
-                    },
+                      'text' => 'name
+'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'paragraph'
+                }
+              ],
+              'parent' => {},
+              'type' => 'def_item'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
                     {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
+                      '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' => 55,
+                'macro' => ''
+              }
+            }
+          ],
+          'extra' => {
+            'end_command' => {},
+            'spaces_before_argument' => ' '
+          },
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 39,
+            'macro' => ''
+          }
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'cmdname' => 'deffn',
+          'contents' => [
+            {
+              'args' => [
+                {
+                  'contents' => [
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => ']'
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'slanted',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'category'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 59,
-                        'macro' => ''
-                      }
+                      'text' => 'Request'
                     },
                     {
                       'extra' => {
@@ -7509,22 +7328,22 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => ']'
+                              'text' => '.ft'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'code',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'name'
                       },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 59,
+                        'line_nr' => 57,
                         'macro' => ''
                       }
                     },
@@ -7536,38 +7355,13 @@ $result_trees{'definition_commands'} = {
                       'text' => ' ',
                       'type' => 'spaces'
                     },
-                    {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => ']'
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 't',
-                      'contents' => [],
-                      'extra' => {
-                        'def_role' => 'arg'
-                      },
-                      'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 59,
-                        'macro' => ''
-                      }
-                    },
                     {
                       'extra' => {
-                        'def_role' => 'spaces'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
+                      'text' => '[',
+                      'type' => 'delimiter'
                     },
                     {
                       'args' => [
@@ -7579,7 +7373,7 @@ $result_trees{'definition_commands'} = {
                                   'contents' => [
                                     {
                                       'parent' => {},
-                                      'text' => ']'
+                                      'text' => 'font'
                                     }
                                   ],
                                   'parent' => {},
@@ -7591,7 +7385,7 @@ $result_trees{'definition_commands'} = {
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 59,
+                                'line_nr' => 57,
                                 'macro' => ''
                               }
                             }
@@ -7608,60 +7402,101 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 59,
+                        'line_nr' => 57,
                         'macro' => ''
                       }
                     },
                     {
                       'extra' => {
-                        'def_role' => 'spaces'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
+                      'text' => ']',
+                      'type' => 'delimiter'
                     },
                     {
-                      'args' => [
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'block_line_arg'
+                }
+              ],
+              'extra' => {
+                'def_command' => 'deffn',
+                'def_parsed_hash' => {
+                  'category' => {},
+                  'name' => {}
+                },
+                'index_entry' => {
+                  'command' => {},
+                  'content' => [
+                    {}
+                  ],
+                  'content_normalized' => [
+                    {}
+                  ],
+                  'in_code' => 1,
+                  'index_at_command' => 'deffn',
+                  'index_ignore_chars' => {},
+                  'index_name' => 'fn',
+                  'index_type_command' => 'deffn',
+                  'node' => {},
+                  'number' => 34
+                },
+                'original_def_cmdname' => 'deffn'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 57,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'contents' => [
                         {
-                          'contents' => [
+                          'parent' => {},
+                          'text' => 'Escape'
+                        },
+                        {
+                          'args' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => ']'
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'code',
                               'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 59,
-                                'macro' => ''
-                              }
+                              'type' => 'brace_command_arg'
                             }
                           ],
+                          'cmdname' => 'tie',
+                          'contents' => [],
                           'parent' => {},
-                          'type' => 'brace_command_arg'
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 58,
+                            'macro' => ''
+                          }
+                        },
+                        {
+                          'parent' => {},
+                          'text' => 'sequence'
                         }
                       ],
-                      'cmdname' => 'r',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'category'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 59,
-                        'macro' => ''
-                      }
+                      'type' => 'def_aggregate'
                     },
                     {
                       'extra' => {
@@ -7672,116 +7507,92 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
-                      'args' => [
+                      'contents' => [
                         {
-                          'contents' => [
+                          'args' => [
                             {
-                              'args' => [
+                              'contents' => [
                                 {
-                                  'contents' => [
-                                    {
-                                      'args' => [
-                                        {
-                                          'contents' => [
-                                            {
-                                              'parent' => {},
-                                              'text' => ']'
-                                            }
-                                          ],
-                                          'parent' => {},
-                                          'type' => 'brace_command_arg'
-                                        }
-                                      ],
-                                      'cmdname' => 'slanted',
-                                      'contents' => [],
-                                      'parent' => {},
-                                      'source_info' => {
-                                        'file_name' => '',
-                                        'line_nr' => 59,
-                                        'macro' => ''
-                                      }
-                                    }
-                                  ],
                                   'parent' => {},
-                                  'type' => 'brace_command_arg'
+                                  'text' => '\\f'
                                 }
                               ],
-                              'cmdname' => 'code',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 59,
-                                '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' => 59,
-                        'macro' => ''
-                      }
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
-                    {
-                      'args' => [
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 58,
+                            'macro' => ''
+                          }
+                        },
                         {
-                          'contents' => [
+                          'args' => [
                             {
-                              'args' => [
+                              'contents' => [
                                 {
-                                  'contents' => [
+                                  'args' => [
                                     {
+                                      'contents' => [
+                                        {
+                                          'parent' => {},
+                                          'text' => 'f'
+                                        }
+                                      ],
                                       'parent' => {},
-                                      'text' => ']'
+                                      'type' => 'brace_command_arg'
                                     }
                                   ],
+                                  'cmdname' => 'slanted',
+                                  'contents' => [],
                                   'parent' => {},
-                                  'type' => 'brace_command_arg'
+                                  'source_info' => {
+                                    'file_name' => '',
+                                    'line_nr' => 58,
+                                    'macro' => ''
+                                  }
                                 }
                               ],
-                              'cmdname' => 't',
+                              'parent' => {},
+                              'type' => 'brace_command_arg'
+                            }
+                          ],
+                          'cmdname' => 'r',
+                          'contents' => [],
+                          'parent' => {},
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 58,
+                            'macro' => ''
+                          }
+                        },
+                        {
+                          'args' => [
+                            {
                               'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 59,
-                                'macro' => ''
-                              }
+                              'type' => 'brace_command_arg'
                             }
                           ],
+                          'cmdname' => 't',
+                          'contents' => [],
                           'parent' => {},
-                          'type' => 'brace_command_arg'
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 58,
+                            'macro' => ''
+                          }
                         }
                       ],
-                      'cmdname' => 'r',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'name'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 59,
-                        'macro' => ''
-                      }
+                      'type' => 'def_aggregate'
                     },
                     {
                       'extra' => {
@@ -7794,11 +7605,12 @@ $result_trees{'definition_commands'} = {
                     }
                   ],
                   'parent' => {},
-                  'type' => 'block_line_arg'
+                  'type' => 'line_arg'
                 }
               ],
+              'cmdname' => 'deffnx',
               'extra' => {
-                'def_command' => 'defspec',
+                'def_command' => 'deffn',
                 'def_parsed_hash' => {
                   'category' => {},
                   'name' => {}
@@ -7812,19 +7624,20 @@ $result_trees{'definition_commands'} = {
                     {}
                   ],
                   'in_code' => 1,
-                  'index_at_command' => 'defspec',
+                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
+                  'index_type_command' => 'deffn',
                   'node' => {},
-                  'number' => 31
+                  'number' => 35
                 },
-                'original_def_cmdname' => 'defspec'
+                'original_def_cmdname' => 'deffnx',
+                'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 59,
+                'line_nr' => 58,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -7837,86 +7650,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' => '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' => 59,
+                            'macro' => ''
+                          }
+                        },
+                        {
+                          'parent' => {},
+                          'text' => 'sequence'
                         }
                       ],
-                      'cmdname' => 'r',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'category'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 60,
-                        'macro' => ''
-                      }
+                      'type' => 'def_aggregate'
                     },
                     {
                       'extra' => {
@@ -7927,31 +7689,180 @@ $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' => 60,
-                        'macro' => ''
-                      }
-                    },
-                    {
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 59,
+                            'macro' => ''
+                          }
+                        },
+                        {
+                          'args' => [
+                            {
+                              'contents' => [
+                                {
+                                  'args' => [
+                                    {
+                                      'contents' => [
+                                        {
+                                          'parent' => {},
+                                          'text' => 'fn'
+                                        }
+                                      ],
+                                      'parent' => {},
+                                      'type' => 'brace_command_arg'
+                                    }
+                                  ],
+                                  'cmdname' => 'slanted',
+                                  'contents' => [],
+                                  'parent' => {},
+                                  'source_info' => {
+                                    'file_name' => '',
+                                    'line_nr' => 59,
+                                    'macro' => ''
+                                  }
+                                }
+                              ],
+                              'parent' => {},
+                              'type' => 'brace_command_arg'
+                            }
+                          ],
+                          'cmdname' => 'r',
+                          'contents' => [],
+                          'parent' => {},
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 59,
+                            'macro' => ''
+                          }
+                        },
+                        {
+                          'args' => [
+                            {
+                              'contents' => [],
+                              'parent' => {},
+                              'type' => 'brace_command_arg'
+                            }
+                          ],
+                          'cmdname' => 't',
+                          'contents' => [],
+                          'parent' => {},
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 59,
+                            'macro' => ''
+                          }
+                        }
+                      ],
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
+                      'parent' => {},
+                      'type' => 'def_aggregate'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'deffnx',
+              'extra' => {
+                'def_command' => 'deffn',
+                'def_parsed_hash' => {
+                  'category' => {},
+                  'name' => {}
+                },
+                'index_entry' => {
+                  'command' => {},
+                  'content' => [
+                    {}
+                  ],
+                  'content_normalized' => [
+                    {}
+                  ],
+                  'in_code' => 1,
+                  'index_at_command' => 'deffnx',
+                  'index_ignore_chars' => {},
+                  'index_name' => 'fn',
+                  'index_type_command' => 'deffn',
+                  'node' => {},
+                  'number' => 36
+                },
+                'original_def_cmdname' => 'deffnx',
+                'spaces_before_argument' => ' '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 59,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'contents' => [
+                        {
+                          'parent' => {},
+                          'text' => 'Escape'
+                        },
+                        {
+                          'args' => [
+                            {
+                              'contents' => [],
+                              'parent' => {},
+                              'type' => 'brace_command_arg'
+                            }
+                          ],
+                          'cmdname' => 'tie',
+                          'contents' => [],
+                          'parent' => {},
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 60,
+                            'macro' => ''
+                          }
+                        },
+                        {
+                          'parent' => {},
+                          'text' => 'sequence'
+                        }
+                      ],
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
+                      'parent' => {},
+                      'type' => 'def_aggregate'
+                    },
+                    {
                       'extra' => {
                         'def_role' => 'spaces'
                       },
@@ -7960,29 +7871,97 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
-                      'args' => [
+                      'contents' => [
                         {
-                          'contents' => [
+                          'args' => [
                             {
+                              'contents' => [
+                                {
+                                  'parent' => {},
+                                  'text' => '\\f['
+                                }
+                              ],
                               'parent' => {},
-                              'text' => '[]'
+                              'type' => 'brace_command_arg'
                             }
                           ],
+                          'cmdname' => 't',
+                          'contents' => [],
                           'parent' => {},
-                          'type' => 'brace_command_arg'
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 60,
+                            'macro' => ''
+                          }
+                        },
+                        {
+                          'args' => [
+                            {
+                              'contents' => [
+                                {
+                                  'args' => [
+                                    {
+                                      'contents' => [
+                                        {
+                                          'parent' => {},
+                                          'text' => 'font'
+                                        }
+                                      ],
+                                      'parent' => {},
+                                      'type' => 'brace_command_arg'
+                                    }
+                                  ],
+                                  'cmdname' => 'slanted',
+                                  'contents' => [],
+                                  'parent' => {},
+                                  'source_info' => {
+                                    'file_name' => '',
+                                    'line_nr' => 60,
+                                    'macro' => ''
+                                  }
+                                }
+                              ],
+                              'parent' => {},
+                              'type' => 'brace_command_arg'
+                            }
+                          ],
+                          'cmdname' => 'r',
+                          'contents' => [],
+                          'parent' => {},
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 60,
+                            'macro' => ''
+                          }
+                        },
+                        {
+                          'args' => [
+                            {
+                              'contents' => [
+                                {
+                                  'parent' => {},
+                                  'text' => ']'
+                                }
+                              ],
+                              'parent' => {},
+                              'type' => 'brace_command_arg'
+                            }
+                          ],
+                          'cmdname' => 't',
+                          'contents' => [],
+                          'parent' => {},
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 60,
+                            'macro' => ''
+                          }
                         }
                       ],
-                      'cmdname' => 'code',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'name'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 60,
-                        'macro' => ''
-                      }
+                      'type' => 'def_aggregate'
                     },
                     {
                       'extra' => {
@@ -7998,7 +7977,7 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => '[]'
+                              'text' => '\\f['
                             }
                           ],
                           'parent' => {},
@@ -8017,14 +7996,6 @@ $result_trees{'definition_commands'} = {
                         'macro' => ''
                       }
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
                     {
                       'args' => [
                         {
@@ -8035,7 +8006,7 @@ $result_trees{'definition_commands'} = {
                                   'contents' => [
                                     {
                                       'parent' => {},
-                                      'text' => '[]'
+                                      'text' => 'font'
                                     }
                                   ],
                                   'parent' => {},
@@ -8068,46 +8039,20 @@ $result_trees{'definition_commands'} = {
                         'macro' => ''
                       }
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => '[]'
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'code',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 60,
-                                'macro' => ''
-                              }
+                              'text' => ']'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -8119,6 +8064,65 @@ $result_trees{'definition_commands'} = {
                         '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' => 37
+                },
+                'original_def_cmdname' => 'deffnx',
+                'spaces_before_argument' => ' '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 60,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
+                      'parent' => {},
+                      'text' => 'Register'
+                    },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
@@ -8132,59 +8136,23 @@ $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' => 60,
-                                        'macro' => ''
-                                      }
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'code',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 60,
-                                'macro' => ''
-                              }
+                              'text' => '\\n[.sty]'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'name'
                       },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 60,
+                        'line_nr' => 61,
                         'macro' => ''
                       }
                     },
@@ -8202,9 +8170,9 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'defspecx',
+              'cmdname' => 'deffnx',
               'extra' => {
-                'def_command' => 'defspec',
+                'def_command' => 'deffn',
                 'def_parsed_hash' => {
                   'category' => {},
                   'name' => {}
@@ -8218,20 +8186,20 @@ $result_trees{'definition_commands'} = {
                     {}
                   ],
                   'in_code' => 1,
-                  'index_at_command' => 'defspecx',
+                  'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
+                  'index_type_command' => 'deffn',
                   'node' => {},
-                  'number' => 32
+                  'number' => 38
                 },
-                'original_def_cmdname' => 'defspecx',
+                'original_def_cmdname' => 'deffnx',
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 60,
+                'line_nr' => 61,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -8242,206 +8210,64 @@ $result_trees{'definition_commands'} = {
                   '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' => 62,
-                'macro' => ''
-              }
-            }
-          ],
-          'extra' => {
-            'end_command' => {},
-            'spaces_before_argument' => ' '
-          },
-          'parent' => {},
-          'source_info' => {
-            'file_name' => '',
-            'line_nr' => 59,
-            'macro' => ''
-          }
-        },
-        {
-          'parent' => {},
-          'text' => '
-',
-          'type' => 'empty_line'
-        },
-        {
-          'cmdname' => 'deftypefn',
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'contents' => [
+                      'text' => 'The '
+                    },
                     {
-                      'contents' => [
+                      'args' => [
                         {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'ft'
+                            }
+                          ],
                           'parent' => {},
-                          'text' => 'Library Function'
+                          'type' => 'brace_command_arg'
                         }
                       ],
-                      'extra' => {
-                        'def_role' => 'category'
-                      },
+                      'cmdname' => 'code',
+                      'contents' => [],
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 64,
+                        'line_nr' => 62,
                         'macro' => ''
-                      },
-                      'type' => 'bracketed_def_content'
+                      }
                     },
                     {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
+                      'text' => ' request and the '
                     },
                     {
-                      'extra' => {
-                        'def_role' => 'type'
-                      },
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => '\\f'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'code',
+                      'contents' => [],
                       'parent' => {},
-                      'text' => 'int'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 62,
+                        'macro' => ''
+                      }
                     },
                     {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'name'
-                      },
-                      'parent' => {},
-                      'text' => 'foobar'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => '  ',
-                      'type' => 'spaces'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'delimiter'
-                      },
-                      'parent' => {},
-                      'text' => '(',
-                      'type' => 'delimiter'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'typearg'
-                      },
-                      'parent' => {},
-                      'text' => 'int'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
-                    {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => 'f---oo'
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'var',
-                      'contents' => [],
-                      'extra' => {
-                        'def_role' => 'arg'
-                      },
-                      'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 64,
-                        'macro' => ''
-                      }
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'delimiter'
-                      },
-                      'parent' => {},
-                      'text' => ',',
-                      'type' => 'delimiter'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'typearg'
-                      },
-                      'parent' => {},
-                      'text' => 'float'
+                      'text' => ' escape change the current font
+'
                     },
                     {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
+                      'text' => 'to '
                     },
                     {
                       'args' => [
@@ -8449,7 +8275,7 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'b--ar'
+                              'text' => 'font'
                             }
                           ],
                           'parent' => {},
@@ -8458,75 +8284,17 @@ $result_trees{'definition_commands'} = {
                       ],
                       'cmdname' => 'var',
                       'contents' => [],
-                      'extra' => {
-                        'def_role' => 'arg'
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 64,
+                        'line_nr' => 63,
                         'macro' => ''
                       }
                     },
                     {
-                      'extra' => {
-                        'def_role' => 'delimiter'
-                      },
                       'parent' => {},
-                      'text' => ')',
-                      'type' => 'delimiter'
+                      'text' => ' (one-character name'
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => '
-',
-                      'type' => 'spaces_at_end'
-                    }
-                  ],
-                  'parent' => {},
-                  'type' => 'block_line_arg'
-                }
-              ],
-              'extra' => {
-                'def_command' => 'deftypefn',
-                'def_parsed_hash' => {
-                  'category' => {},
-                  'name' => {},
-                  'type' => {}
-                },
-                'index_entry' => {
-                  'command' => {},
-                  'content' => [
-                    {}
-                  ],
-                  'content_normalized' => [
-                    {}
-                  ],
-                  'in_code' => 1,
-                  'index_at_command' => 'deftypefn',
-                  'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 33
-                },
-                'original_def_cmdname' => 'deftypefn'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 64,
-                'macro' => ''
-              },
-              'type' => 'def_line'
-            },
-            {
-              'contents' => [
-                {
-                  'contents' => [
                     {
                       'args' => [
                         {
@@ -8535,26 +8303,22 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'dots',
+                      'cmdname' => 'tie',
                       'contents' => [],
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
+                        'line_nr' => 63,
                         'macro' => ''
                       }
                     },
-                    {
-                      'parent' => {},
-                      'text' => ' with var for '
-                    },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'f---oo'
+                              'text' => 'f'
                             }
                           ],
                           'parent' => {},
@@ -8566,13 +8330,14 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
+                        'line_nr' => 63,
                         'macro' => ''
                       }
                     },
                     {
                       'parent' => {},
-                      'text' => ' and '
+                      'text' => ', two-character name
+'
                     },
                     {
                       'args' => [
@@ -8580,7 +8345,7 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'b--ar'
+                              'text' => 'fn'
                             }
                           ],
                           'parent' => {},
@@ -8592,13 +8357,13 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 65,
+                        'line_nr' => 64,
                         'macro' => ''
                       }
                     },
                     {
                       'parent' => {},
-                      'text' => '
+                      'text' => ').
 '
                     }
                   ],
@@ -8615,7 +8380,7 @@ $result_trees{'definition_commands'} = {
                   'contents' => [
                     {
                       'parent' => {},
-                      'text' => 'deftypefn'
+                      'text' => 'deffn'
                     }
                   ],
                   'extra' => {
@@ -8628,14 +8393,14 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefn',
+                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
-                'text_arg' => 'deftypefn'
+                'text_arg' => 'deffn'
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 66,
+                'line_nr' => 65,
                 'macro' => ''
               }
             }
@@ -8647,7 +8412,7 @@ $result_trees{'definition_commands'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 64,
+            'line_nr' => 57,
             'macro' => ''
           }
         },
@@ -8658,7 +8423,7 @@ $result_trees{'definition_commands'} = {
           'type' => 'empty_line'
         },
         {
-          'cmdname' => 'deftypefn',
+          'cmdname' => 'defspec',
           'contents' => [
             {
               'args' => [
@@ -8668,19 +8433,14 @@ $result_trees{'definition_commands'} = {
                       'contents' => [
                         {
                           'parent' => {},
-                          'text' => 'Library Function'
+                          'text' => 'Special Form'
                         }
                       ],
                       'extra' => {
                         'def_role' => 'category'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 68,
-                        'macro' => ''
-                      },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_inserted'
                     },
                     {
                       'extra' => {
@@ -8688,14 +8448,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' => {
@@ -8707,33 +8467,44 @@ $result_trees{'definition_commands'} = {
                     },
                     {
                       'extra' => {
-                        'def_role' => 'name'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'text' => 'foobar'
+                      'text' => '[',
+                      'type' => 'delimiter'
                     },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => '  ',
+                      'text' => ' ',
                       'type' => 'spaces'
                     },
                     {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => '['
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'delimiter'
-                      },
-                      'parent' => {},
-                      'text' => '(',
-                      'type' => 'delimiter'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'typearg'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'int'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 67,
+                        'macro' => ''
+                      }
                     },
                     {
                       'extra' => {
@@ -8748,33 +8519,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' => 68,
-                                'macro' => ''
-                              }
+                              'text' => '['
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 'slanted',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -8782,17 +8535,42 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 68,
+                        'line_nr' => 67,
                         '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' => 67,
+                        'macro' => ''
+                      }
                     },
                     {
                       'extra' => {
@@ -8803,11 +8581,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' => 67,
+                        'macro' => ''
+                      }
                     },
                     {
                       'extra' => {
@@ -8827,7 +8623,7 @@ $result_trees{'definition_commands'} = {
                                   'contents' => [
                                     {
                                       'parent' => {},
-                                      'text' => 'b--ar'
+                                      'text' => '['
                                     }
                                   ],
                                   'parent' => {},
@@ -8839,7 +8635,7 @@ $result_trees{'definition_commands'} = {
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 68,
+                                'line_nr' => 67,
                                 'macro' => ''
                               }
                             }
@@ -8856,115 +8652,204 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 68,
+                        'line_nr' => 67,
                         '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' => 67,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 67,
+                        'macro' => ''
+                      }
                     },
                     {
                       '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' => [
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
                     {
                       'args' => [
                         {
-                          'contents' => [],
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'args' => [
+                                        {
+                                          'contents' => [
+                                            {
+                                              'parent' => {},
+                                              'text' => '['
+                                            }
+                                          ],
+                                          'parent' => {},
+                                          'type' => 'brace_command_arg'
+                                        }
+                                      ],
+                                      'cmdname' => 'slanted',
+                                      'contents' => [],
+                                      'parent' => {},
+                                      'source_info' => {
+                                        'file_name' => '',
+                                        'line_nr' => 67,
+                                        'macro' => ''
+                                      }
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'code',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 67,
+                                'macro' => ''
+                              }
+                            }
+                          ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'dots',
+                      'cmdname' => 'r',
                       'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 69,
+                        'line_nr' => 67,
                         'macro' => ''
                       }
                     },
                     {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       'parent' => {},
-                      'text' => ' with r slanted for '
+                      'text' => ' ',
+                      'type' => 'spaces'
                     },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '['
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 't',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'f---oo'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 67,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 'r',
                       'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 69,
+                        'line_nr' => 67,
                         'macro' => ''
                       }
                     },
                     {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       'parent' => {},
-                      'text' => ' and '
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ',',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
                     },
                     {
                       'args' => [
@@ -8972,138 +8857,57 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'b--ar'
+                              'text' => ','
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 'r',
                       'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 69,
+                        'line_nr' => 67,
                         'macro' => ''
                       }
                     },
                     {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       'parent' => {},
-                      'text' => '
-'
-                    }
-                  ],
-                  'parent' => {},
-                  'type' => 'paragraph'
-                }
-              ],
-              'parent' => {},
-              'type' => 'def_item'
-            },
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'deftypefn'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
-                  'parent' => {},
-                  'type' => 'line_arg'
-                }
-              ],
-              'cmdname' => 'end',
-              'extra' => {
-                'command_argument' => 'deftypefn',
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'deftypefn'
-              },
-              'parent' => {},
-              'source_info' => {
-                'file_name' => '',
-                'line_nr' => 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' => [
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
                     {
-                      'contents' => [
+                      'args' => [
                         {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => ','
+                            }
+                          ],
                           'parent' => {},
-                          'text' => 'Class Option'
+                          'type' => 'brace_command_arg'
                         }
                       ],
+                      'cmdname' => 'slanted',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'category'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 73,
+                        'line_nr' => 67,
                         'macro' => ''
-                      },
-                      'type' => 'bracketed_def_content'
+                      }
                     },
                     {
                       'extra' => {
@@ -9114,11 +8918,29 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => ','
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'code',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'class'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'Window'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 67,
+                        'macro' => ''
+                      }
                     },
                     {
                       'extra' => {
@@ -9129,165 +8951,131 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => ','
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 't',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'name'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'border-pattern'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 67,
+                        'macro' => ''
+                      }
                     },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
                       },
                       'parent' => {},
-                      'text' => '
-',
-                      'type' => 'spaces_at_end'
-                    }
-                  ],
-                  'parent' => {},
-                  'type' => 'block_line_arg'
-                }
-              ],
-              'extra' => {
-                'def_command' => 'defcv',
-                'def_parsed_hash' => {
-                  'category' => {},
-                  'class' => {},
-                  'name' => {}
-                },
-                'index_entry' => {
-                  'command' => {},
-                  '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' => [
+                      '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' => 67,
+                                'macro' => ''
+                              }
+                            }
+                          ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'dots',
+                      'cmdname' => 'r',
                       'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 74,
+                        'line_nr' => 67,
                         'macro' => ''
                       }
                     },
                     {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       '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' => [
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
                     {
-                      'contents' => [
+                      'args' => [
                         {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ','
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'code',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 67,
+                                'macro' => ''
+                              }
+                            }
+                          ],
                           'parent' => {},
-                          'text' => 'Class Option'
+                          'type' => 'brace_command_arg'
                         }
                       ],
+                      'cmdname' => 'r',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'category'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 77,
+                        'line_nr' => 67,
                         'macro' => ''
-                      },
-                      'type' => 'bracketed_def_content'
+                      }
                     },
                     {
                       'extra' => {
@@ -9298,10 +9086,65 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'args' => [
+                                        {
+                                          'contents' => [
+                                            {
+                                              'parent' => {},
+                                              'text' => ','
+                                            }
+                                          ],
+                                          'parent' => {},
+                                          'type' => 'brace_command_arg'
+                                        }
+                                      ],
+                                      'cmdname' => 'slanted',
+                                      'contents' => [],
+                                      'parent' => {},
+                                      'source_info' => {
+                                        'file_name' => '',
+                                        'line_nr' => 67,
+                                        'macro' => ''
+                                      }
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'code',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 67,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'class'
+                        'def_role' => 'arg'
                       },
-                      'text' => 'Window'
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 67,
+                        'macro' => ''
+                      }
                     },
                     {
                       'extra' => {
@@ -9316,23 +9159,41 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ','
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 't',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'int'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 67,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'code',
+                      'cmdname' => 'r',
                       'contents' => [],
                       'extra' => {
-                        'def_role' => 'type'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 77,
+                        'line_nr' => 67,
                         'macro' => ''
                       }
                     },
@@ -9346,576 +9207,4773 @@ $result_trees{'definition_commands'} = {
                     },
                     {
                       'extra' => {
-                        'def_role' => 'name'
+                        'def_role' => 'delimiter'
                       },
-                      'text' => 'border-pattern'
+                      'parent' => {},
+                      'text' => ']',
+                      'type' => 'delimiter'
                     },
                     {
                       '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 '
+                      'text' => ' ',
+                      'type' => 'spaces'
                     },
-                    {}
-                  ],
-                  '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' => [],
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => ']'
+                            }
+                          ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'dots',
+                      'cmdname' => 'r',
                       'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 78,
+                        'line_nr' => 67,
                         'macro' => ''
                       }
                     },
                     {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       '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'
-            },
-            {
-              'cmdname' => 'deftypefn',
-              'contents' => [
-                {
-                  'args' => [
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
                     {
-                      'contents' => [
+                      'args' => [
                         {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'Library Function'
+                              'text' => ']'
                             }
                           ],
-                          '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'
-                        },
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'slanted',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 67,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
                         {
-                          'extra' => {
-                            'def_role' => 'typearg'
-                          },
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => ']'
+                            }
+                          ],
                           'parent' => {},
-                          'text' => 'int'
-                        },
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'code',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 67,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
                         {
-                          'extra' => {
-                            'def_role' => 'spaces'
-                          },
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => ']'
+                            }
+                          ],
                           'parent' => {},
-                          'text' => ' ',
-                          'type' => 'spaces'
-                        },
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 't',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 67,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
                         {
-                          'args' => [
+                          'contents' => [
                             {
-                              'contents' => [
+                              'args' => [
                                 {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ']'
+                                    }
+                                  ],
                                   'parent' => {},
-                                  'text' => 'foo'
+                                  'type' => 'brace_command_arg'
                                 }
                               ],
+                              'cmdname' => 'slanted',
+                              'contents' => [],
                               'parent' => {},
-                              'type' => 'brace_command_arg'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 67,
+                                'macro' => ''
+                              }
                             }
                           ],
-                          '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'
-                        },
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 67,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
                         {
-                          'args' => [
+                          'contents' => [
                             {
-                              'contents' => [
+                              'args' => [
                                 {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ']'
+                                    }
+                                  ],
                                   'parent' => {},
-                                  'text' => 'bar'
+                                  'type' => 'brace_command_arg'
                                 }
                               ],
+                              'cmdname' => 'code',
+                              'contents' => [],
                               'parent' => {},
-                              'type' => 'brace_command_arg'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 67,
+                                'macro' => ''
+                              }
                             }
                           ],
-                          'cmdname' => 'var',
-                          'contents' => [],
-                          'extra' => {
-                            'def_role' => 'arg'
-                          },
                           'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 82,
-                            'macro' => ''
-                          }
-                        },
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 67,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
                         {
-                          'extra' => {
-                            'def_role' => 'delimiter'
-                          },
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'args' => [
+                                        {
+                                          'contents' => [
+                                            {
+                                              'parent' => {},
+                                              'text' => ']'
+                                            }
+                                          ],
+                                          'parent' => {},
+                                          'type' => 'brace_command_arg'
+                                        }
+                                      ],
+                                      'cmdname' => 'slanted',
+                                      'contents' => [],
+                                      'parent' => {},
+                                      'source_info' => {
+                                        'file_name' => '',
+                                        'line_nr' => 67,
+                                        'macro' => ''
+                                      }
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'code',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 67,
+                                'macro' => ''
+                              }
+                            }
+                          ],
                           'parent' => {},
-                          'text' => ')',
-                          'type' => 'delimiter'
-                        },
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 67,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
                         {
-                          'extra' => {
-                            'def_role' => 'spaces'
-                          },
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ']'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 't',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 67,
+                                'macro' => ''
+                              }
+                            }
+                          ],
                           'parent' => {},
-                          'text' => '
-',
-                          'type' => 'spaces_at_end'
+                          'type' => 'brace_command_arg'
                         }
                       ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
-                      'type' => 'block_line_arg'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 67,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
                     }
                   ],
-                  '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'
+                  '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' => 39
+                },
+                'original_def_cmdname' => 'defspec'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 67,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'contents' => [
+                        {
+                          'parent' => {},
+                          'text' => 'Special Form'
+                        }
+                      ],
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
+                      'parent' => {},
+                      'type' => 'bracketed_inserted'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces_inserted'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
+                      'parent' => {},
+                      'text' => 'foobar'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '[',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ']',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => '[]'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 68,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => '[]'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'slanted',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 68,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => '[]'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'code',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 68,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => '[]'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 't',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 68,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '[]'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'slanted',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 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' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '[]'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'code',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 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' => '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' => 68,
+                                        'macro' => ''
+                                      }
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'code',
+                              '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' => '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' => 40
+                },
+                'original_def_cmdname' => 'defspecx',
+                'spaces_before_argument' => ' '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 68,
+                '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' => 70,
+                'macro' => ''
+              }
+            }
+          ],
+          'extra' => {
+            'end_command' => {},
+            'spaces_before_argument' => ' '
+          },
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 67,
+            'macro' => ''
+          }
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'cmdname' => 'deftypefn',
+          'contents' => [
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'contents' => [
+                        {
+                          'parent' => {},
+                          'text' => 'Library Function'
+                        }
+                      ],
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 72,
+                        'macro' => ''
+                      },
+                      'type' => 'bracketed_def_content'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'type'
+                      },
+                      'parent' => {},
+                      'text' => 'int'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
+                      'parent' => {},
+                      'text' => 'foobar'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '  ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '(',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'typearg'
+                      },
+                      'parent' => {},
+                      'text' => 'int'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'f---oo'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 72,
+                        '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' => 'b--ar'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 72,
+                        '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' => 41
+                },
+                'original_def_cmdname' => 'deftypefn'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 72,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'args' => [
+                        {
+                          'contents' => [],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'dots',
+                      'contents' => [],
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 73,
+                        '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' => 73,
+                        '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' => 73,
+                        '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' => 74,
+                'macro' => ''
+              }
+            }
+          ],
+          'extra' => {
+            'end_command' => {},
+            'spaces_before_argument' => ' '
+          },
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 72,
+            'macro' => ''
+          }
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'cmdname' => 'deftypefn',
+          'contents' => [
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'contents' => [
+                        {
+                          'parent' => {},
+                          'text' => 'Library Function'
+                        }
+                      ],
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 76,
+                        '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' => 76,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 76,
+                        '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' => 76,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 76,
+                        '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' => 42
+                },
+                'original_def_cmdname' => 'deftypefn'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 76,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'args' => [
+                        {
+                          'contents' => [],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'dots',
+                      'contents' => [],
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 77,
+                        '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' => 77,
+                        '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' => 77,
+                        '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' => 78,
+                'macro' => ''
+              }
+            }
+          ],
+          'extra' => {
+            'end_command' => {},
+            'spaces_before_argument' => ' '
+          },
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 76,
+            'macro' => ''
+          }
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'cmdname' => 'noindent',
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 80,
+            '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' => 81,
+                        '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' => 81,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'args' => [
+                        {
+                          'contents' => [],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'dots',
+                      'contents' => [],
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 82,
+                        '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' => 83,
+                'macro' => ''
+              }
+            }
+          ],
+          'extra' => {
+            'end_command' => {},
+            'spaces_before_argument' => ' '
+          },
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 81,
+            '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' => 85,
+                        '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' => 85,
+                        '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' => 85,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'args' => [
+                        {
+                          'contents' => [],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'dots',
+                      'contents' => [],
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 86,
+                        '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' => 87,
+                'macro' => ''
+              }
+            }
+          ],
+          'extra' => {
+            'end_command' => {},
+            'spaces_before_argument' => ' '
+          },
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 85,
+            'macro' => ''
+          }
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'cmdname' => 'quotation',
+          'contents' => [
+            {
+              'extra' => {
+                'command' => {}
+              },
+              'parent' => {},
+              'text' => '
+',
+              'type' => 'empty_line_after_command'
+            },
+            {
+              'cmdname' => 'deftypefn',
+              'contents' => [
+                {
+                  'args' => [
+                    {
+                      'contents' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'Library Function'
+                            }
+                          ],
+                          'extra' => {
+                            'def_role' => 'category'
+                          },
+                          'parent' => {},
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 90,
+                            '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' => 90,
+                            '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' => 90,
+                            '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' => 43
+                    },
+                    'original_def_cmdname' => 'deftypefn'
+                  },
+                  'parent' => {},
+                  'source_info' => {
+                    'file_name' => '',
+                    'line_nr' => 90,
+                    'macro' => ''
+                  },
+                  'type' => 'def_line'
+                },
+                {
+                  'contents' => [
+                    {
+                      'contents' => [
+                        {
+                          'args' => [
+                            {
+                              'contents' => [],
+                              'parent' => {},
+                              'type' => 'brace_command_arg'
+                            }
+                          ],
+                          'cmdname' => 'dots',
+                          'contents' => [],
+                          'parent' => {},
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 91,
+                            'macro' => ''
+                          }
+                        },
+                        {
+                          'parent' => {},
+                          'text' => ' for '
+                        },
+                        {
+                          'args' => [
+                            {
+                              'contents' => [
+                                {
+                                  'parent' => {},
+                                  'text' => 'foo'
+                                }
+                              ],
+                              'parent' => {},
+                              'type' => 'brace_command_arg'
+                            }
+                          ],
+                          'cmdname' => 'var',
+                          'contents' => [],
+                          'parent' => {},
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 91,
+                            'macro' => ''
+                          }
+                        },
+                        {
+                          'parent' => {},
+                          'text' => ' and '
+                        },
+                        {
+                          'args' => [
+                            {
+                              'contents' => [
+                                {
+                                  'parent' => {},
+                                  'text' => 'bar'
+                                }
+                              ],
+                              'parent' => {},
+                              'type' => 'brace_command_arg'
+                            }
+                          ],
+                          'cmdname' => 'var',
+                          'contents' => [],
+                          'parent' => {},
+                          'source_info' => {
+                            'file_name' => '',
+                            'line_nr' => 91,
+                            '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' => 92,
+                    'macro' => ''
+                  }
+                }
+              ],
+              'extra' => {
+                'end_command' => {},
+                'spaces_before_argument' => ' '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 90,
+                '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' => 93,
+                'macro' => ''
+              }
+            }
+          ],
+          'extra' => {
+            'end_command' => {}
+          },
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 89,
+            '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' => 44
+                },
+                'original_def_cmdname' => 'defun'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 95,
+                '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' => 96,
+                        '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' => 96,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'parent' => {},
+                      'text' => ' with '
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'arguments'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 96,
+                        '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' => 97,
+                'macro' => ''
+              }
+            }
+          ],
+          'extra' => {
+            'end_command' => {},
+            'spaces_before_argument' => ' '
+          },
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 95,
+            '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' => 99,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 99,
+                        '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' => 45
+                },
+                'original_def_cmdname' => 'defun'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 99,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'explicit keyword marking, no var '
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'function'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 100,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'parent' => {},
+                      'text' => ' with '
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'arguments'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 100,
+                        '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' => 101,
+                'macro' => ''
+              }
+            }
+          ],
+          'extra' => {
+            'end_command' => {},
+            'spaces_before_argument' => ' '
+          },
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 99,
+            'macro' => ''
+          }
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'cmdname' => 'deffn',
+          'contents' => [
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
+                      'parent' => {},
+                      'text' => 'Category'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
+                      'parent' => {},
+                      'text' => 'name'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'text' => 'argument'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'int'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'code',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 103,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'a--b'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'code',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 103,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'v--ar1'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 103,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ',',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'text' => 'word'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => '--'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'code',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 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'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'code',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 103,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ',',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'v---ar2'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 103,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '  ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '[',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'float'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'code',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 104,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '[',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'var4'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 104,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ']',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ']',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ')',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'block_line_arg'
+                }
+              ],
+              'extra' => {
+                'def_command' => 'deffn',
+                'def_parsed_hash' => {
+                  'category' => {},
+                  'name' => {}
+                },
+                'index_entry' => {
+                  'command' => {},
+                  'content' => [
+                    {}
+                  ],
+                  'content_normalized' => [
+                    {}
+                  ],
+                  'in_code' => 1,
+                  'index_at_command' => 'deffn',
+                  'index_ignore_chars' => {},
+                  'index_name' => 'fn',
+                  'index_type_command' => 'deffn',
+                  'node' => {},
+                  'number' => 46
+                },
+                'original_def_cmdname' => 'deffn'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                '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' => 106,
+                'macro' => ''
+              }
+            }
+          ],
+          'extra' => {
+            'end_command' => {},
+            'spaces_before_argument' => ' '
+          },
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 103,
+            'macro' => ''
+          }
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'cmdname' => 'deftypefn',
+          'contents' => [
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'contents' => [
+                        {
+                          'parent' => {},
+                          'text' => 'Library Function'
+                        }
+                      ],
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 108,
+                        'macro' => ''
+                      },
+                      'type' => 'bracketed_def_content'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'type'
+                      },
+                      'parent' => {},
+                      'text' => 'int'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
+                      'parent' => {},
+                      'text' => 'foobar'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '  ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '(',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'typearg'
+                      },
+                      'parent' => {},
+                      'text' => 'int'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'f---oo'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 108,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '[',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ',',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'typearg'
+                      },
+                      'parent' => {},
+                      'text' => 'float'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'b--ar'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 108,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ']',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ')',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'typearg'
+                      },
+                      'parent' => {},
+                      'text' => 'default'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'block_line_arg'
+                }
+              ],
+              'extra' => {
+                'def_command' => 'deftypefn',
+                'def_parsed_hash' => {
+                  'category' => {},
+                  'name' => {},
+                  'type' => {}
+                },
+                'index_entry' => {
+                  'command' => {},
+                  'content' => [
+                    {}
+                  ],
+                  'content_normalized' => [
+                    {}
+                  ],
+                  'in_code' => 1,
+                  'index_at_command' => 'deftypefn',
+                  'index_ignore_chars' => {},
+                  'index_name' => 'fn',
+                  'index_type_command' => 'deftypefn',
+                  'node' => {},
+                  'number' => 47
+                },
+                'original_def_cmdname' => 'deftypefn'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 108,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'contents' => [
+                        {
+                          'parent' => {},
+                          'text' => 'Library Function'
+                        }
+                      ],
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 109,
+                        'macro' => ''
+                      },
+                      'type' => 'bracketed_def_content'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'type'
+                      },
+                      'parent' => {},
+                      'text' => 'int'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
+                      'parent' => {},
+                      'text' => 'foobar'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '  ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '(',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'typearg'
+                      },
+                      'parent' => {},
+                      'text' => 'int'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'f---oo'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 109,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => '['
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 109,
+                        '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' => 'b--ar'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 109,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => ']'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 109,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ')',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'typearg'
+                      },
+                      'parent' => {},
+                      'text' => 'r'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
+                  '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' => 48
+                },
+                'original_def_cmdname' => 'deftypefnx',
+                'spaces_before_argument' => ' '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 109,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'contents' => [
+                        {
+                          'parent' => {},
+                          'text' => 'Library Function'
+                        }
+                      ],
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 110,
+                        'macro' => ''
+                      },
+                      'type' => 'bracketed_def_content'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'type'
+                      },
+                      'parent' => {},
+                      'text' => 'int'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
+                      'parent' => {},
+                      'text' => 'foobar'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '  ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '(',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'typearg'
+                      },
+                      'parent' => {},
+                      'text' => 'int'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'f---oo'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 110,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => '['
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 110,
+                        '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' => 'b--ar'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 110,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => ']'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 110,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ')',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      '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' => 49
+                },
+                'original_def_cmdname' => 'deftypefnx',
+                'spaces_before_argument' => ' '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 110,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'args' => [
                 {
                   'contents' => [
                     {
                       'contents' => [
                         {
-                          'args' => [
+                          'parent' => {},
+                          'text' => 'Library Function'
+                        }
+                      ],
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 111,
+                        'macro' => ''
+                      },
+                      'type' => 'bracketed_def_content'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'type'
+                      },
+                      'parent' => {},
+                      'text' => 'int'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
+                      'parent' => {},
+                      'text' => 'foobar'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '  ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '(',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'typearg'
+                      },
+                      'parent' => {},
+                      'text' => 'int'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'f---oo'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 111,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => '['
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'slanted',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 111,
+                        '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' => [
                             {
-                              'contents' => [],
                               'parent' => {},
-                              'type' => 'brace_command_arg'
+                              'text' => 'b--ar'
                             }
                           ],
-                          'cmdname' => 'dots',
-                          'contents' => [],
-                          'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 83,
-                            'macro' => ''
-                          }
-                        },
-                        {
                           'parent' => {},
-                          'text' => ' for '
-                        },
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 111,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'args' => [
                         {
-                          'args' => [
+                          'contents' => [
                             {
-                              'contents' => [
-                                {
-                                  'parent' => {},
-                                  'text' => 'foo'
-                                }
-                              ],
                               'parent' => {},
-                              'type' => 'brace_command_arg'
+                              'text' => ']'
                             }
                           ],
-                          'cmdname' => 'var',
-                          'contents' => [],
                           'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 83,
-                            'macro' => ''
-                          }
-                        },
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'slanted',
+                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 111,
+                        'macro' => ''
+                      }
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ')',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'typearg'
+                      },
+                      'parent' => {},
+                      'text' => 'slanted'
+                    },
+                    {
+                      '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' => 50
+                },
+                'original_def_cmdname' => 'deftypefnx',
+                'spaces_before_argument' => ' '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 111,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'contents' => [
                         {
                           'parent' => {},
-                          'text' => ' and '
-                        },
+                          'text' => 'Library Function'
+                        }
+                      ],
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 112,
+                        'macro' => ''
+                      },
+                      'type' => 'bracketed_def_content'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'type'
+                      },
+                      'parent' => {},
+                      'text' => 'int'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'name'
+                      },
+                      'parent' => {},
+                      'text' => 'foobar'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => '  ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '(',
+                      'type' => 'delimiter'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'typearg'
+                      },
+                      'parent' => {},
+                      'text' => 'int'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
+                    {
+                      'args' => [
                         {
-                          'args' => [
+                          'contents' => [
                             {
-                              'contents' => [
-                                {
-                                  'parent' => {},
-                                  'text' => 'bar'
-                                }
-                              ],
                               'parent' => {},
-                              'type' => 'brace_command_arg'
+                              'text' => 'f---oo'
                             }
                           ],
-                          'cmdname' => 'var',
-                          'contents' => [],
-                          'parent' => {},
-                          'source_info' => {
-                            'file_name' => '',
-                            'line_nr' => 83,
-                            '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' => 112,
+                        'macro' => ''
+                      }
+                    },
                     {
-                      'contents' => [
+                      'args' => [
                         {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => '['
+                            }
+                          ],
                           'parent' => {},
-                          'text' => 'deftypefn'
+                          'type' => 'brace_command_arg'
                         }
                       ],
+                      'cmdname' => 'code',
+                      'contents' => [],
                       'extra' => {
-                        'spaces_after_argument' => '
-'
+                        'def_role' => 'typearg'
                       },
                       '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' => [
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 112,
+                        'macro' => ''
+                      }
+                    },
                     {
-                      'contents' => [
-                        {
-                          'parent' => {},
-                          'text' => 'Function'
-                        }
-                      ],
                       'extra' => {
-                        'def_role' => 'category'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'type' => 'bracketed_inserted'
+                      'text' => ',',
+                      'type' => 'delimiter'
                     },
                     {
                       'extra' => {
@@ -9923,14 +13981,14 @@ $result_trees{'definition_commands'} = {
                       },
                       'parent' => {},
                       'text' => ' ',
-                      'type' => 'spaces_inserted'
+                      'type' => 'spaces'
                     },
                     {
                       'extra' => {
-                        'def_role' => 'name'
+                        'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'apply'
+                      'text' => 'float'
                     },
                     {
                       'extra' => {
@@ -9941,26 +13999,62 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'b--ar'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'function'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 112,
+                        'macro' => ''
+                      }
                     },
                     {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => ']'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'code',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'spaces'
+                        'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 112,
+                        'macro' => ''
+                      }
                     },
                     {
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'text' => '&rest'
+                      'text' => ')',
+                      'type' => 'delimiter'
                     },
                     {
                       'extra' => {
@@ -9972,10 +14066,10 @@ $result_trees{'definition_commands'} = {
                     },
                     {
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'arguments'
+                      'text' => 'code'
                     },
                     {
                       'extra' => {
@@ -9988,14 +14082,16 @@ $result_trees{'definition_commands'} = {
                     }
                   ],
                   'parent' => {},
-                  'type' => 'block_line_arg'
+                  'type' => 'line_arg'
                 }
               ],
+              'cmdname' => 'deftypefnx',
               'extra' => {
-                'def_command' => 'defun',
+                'def_command' => 'deftypefn',
                 'def_parsed_hash' => {
                   'category' => {},
-                  'name' => {}
+                  'name' => {},
+                  'type' => {}
                 },
                 'index_entry' => {
                   'command' => {},
@@ -10006,52 +14102,106 @@ $result_trees{'definition_commands'} = {
                     {}
                   ],
                   'in_code' => 1,
-                  'index_at_command' => 'defun',
+                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defun',
+                  'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 36
+                  'number' => 51
                 },
-                'original_def_cmdname' => 'defun'
+                'original_def_cmdname' => 'deftypefnx',
+                'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 87,
+                'line_nr' => 112,
                 'macro' => ''
               },
               'type' => 'def_line'
             },
             {
-              'contents' => [
+              'args' => [
                 {
                   'contents' => [
                     {
-                      'args' => [
+                      'contents' => [
                         {
-                          'contents' => [
-                            {
-                              'parent' => {},
-                              'text' => 'apply'
-                            }
-                          ],
                           'parent' => {},
-                          'type' => 'brace_command_arg'
+                          'text' => 'Library Function'
                         }
                       ],
-                      'cmdname' => 'code',
-                      'contents' => [],
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 113,
+                        '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' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 88,
-                        'macro' => ''
-                      }
+                      'text' => 'int'
                     },
                     {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
                       'parent' => {},
-                      'text' => ' calls no var '
+                      'text' => ' ',
+                      'type' => 'spaces'
                     },
                     {
                       'args' => [
@@ -10059,7 +14209,7 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'function'
+                              'text' => 'f---oo'
                             }
                           ],
                           'parent' => {},
@@ -10068,119 +14218,48 @@ $result_trees{'definition_commands'} = {
                       ],
                       'cmdname' => 'var',
                       'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 88,
+                        'line_nr' => 113,
                         'macro' => ''
                       }
                     },
-                    {
-                      'parent' => {},
-                      'text' => ' with '
-                    },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'arguments'
+                              'text' => '['
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 't',
                       'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 88,
+                        'line_nr' => 113,
                         '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'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'type' => 'bracketed_inserted'
+                      'text' => ',',
+                      'type' => 'delimiter'
                     },
                     {
                       'extra' => {
@@ -10188,14 +14267,14 @@ $result_trees{'definition_commands'} = {
                       },
                       'parent' => {},
                       'text' => ' ',
-                      'type' => 'spaces_inserted'
+                      'type' => 'spaces'
                     },
                     {
                       'extra' => {
-                        'def_role' => 'name'
+                        'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'apply'
+                      'text' => 'float'
                     },
                     {
                       'extra' => {
@@ -10206,52 +14285,44 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'b--ar'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'function'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 113,
+                        'macro' => ''
+                      }
                     },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => '&rest'
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'b',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 91,
-                                'macro' => ''
-                              }
+                              'text' => ']'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -10259,10 +14330,18 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 91,
+                        'line_nr' => 113,
                         'macro' => ''
                       }
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ')',
+                      'type' => 'delimiter'
+                    },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
@@ -10273,10 +14352,10 @@ $result_trees{'definition_commands'} = {
                     },
                     {
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'argument'
+                      'text' => 't'
                     },
                     {
                       'extra' => {
@@ -10289,14 +14368,16 @@ $result_trees{'definition_commands'} = {
                     }
                   ],
                   'parent' => {},
-                  'type' => 'block_line_arg'
+                  'type' => 'line_arg'
                 }
               ],
+              'cmdname' => 'deftypefnx',
               'extra' => {
-                'def_command' => 'defun',
+                'def_command' => 'deftypefn',
                 'def_parsed_hash' => {
                   'category' => {},
-                  'name' => {}
+                  'name' => {},
+                  'type' => {}
                 },
                 'index_entry' => {
                   'command' => {},
@@ -10307,30 +14388,106 @@ $result_trees{'definition_commands'} = {
                     {}
                   ],
                   'in_code' => 1,
-                  'index_at_command' => 'defun',
+                  'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defun',
+                  'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 37
+                  'number' => 52
                 },
-                'original_def_cmdname' => 'defun'
+                'original_def_cmdname' => 'deftypefnx',
+                'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 91,
+                'line_nr' => 113,
                 'macro' => ''
               },
               'type' => 'def_line'
             },
             {
-              'contents' => [
+              'args' => [
                 {
                   'contents' => [
                     {
+                      'contents' => [
+                        {
+                          'parent' => {},
+                          'text' => 'Library Function'
+                        }
+                      ],
+                      'extra' => {
+                        'def_role' => 'category'
+                      },
+                      'parent' => {},
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 114,
+                        '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' => 'explicit keyword marking, no var '
+                      'text' => 'int'
+                    },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
                     },
                     {
                       'args' => [
@@ -10338,7 +14495,7 @@ $result_trees{'definition_commands'} = {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'function'
+                              'text' => 'f---oo'
                             }
                           ],
                           'parent' => {},
@@ -10347,113 +14504,66 @@ $result_trees{'definition_commands'} = {
                       ],
                       'cmdname' => 'var',
                       'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 92,
+                        'line_nr' => 114,
                         'macro' => ''
                       }
                     },
-                    {
-                      'parent' => {},
-                      'text' => ' with '
-                    },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '['
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'b',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'arguments'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 114,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 't',
                       'contents' => [],
+                      'extra' => {
+                        'def_role' => 'arg'
+                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 92,
+                        'line_nr' => 114,
                         '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'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'text' => 'Category'
+                      'text' => ',',
+                      'type' => 'delimiter'
                     },
                     {
                       'extra' => {
@@ -10465,10 +14575,10 @@ $result_trees{'definition_commands'} = {
                     },
                     {
                       'extra' => {
-                        'def_role' => 'name'
+                        'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'name'
+                      'text' => 'float'
                     },
                     {
                       'extra' => {
@@ -10479,34 +14589,62 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'b--ar'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'var',
+                      'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => 'argument'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 114,
+                        'macro' => ''
+                      }
                     },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ']'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'b',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'int'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 114,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'code',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -10514,10 +14652,18 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 95,
+                        'line_nr' => 114,
                         'macro' => ''
                       }
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => ')',
+                      'type' => 'delimiter'
+                    },
                     {
                       'extra' => {
                         'def_role' => 'spaces'
@@ -10527,29 +14673,82 @@ $result_trees{'definition_commands'} = {
                       'type' => 'spaces'
                     },
                     {
-                      'args' => [
+                      'extra' => {
+                        'def_role' => 'typearg'
+                      },
+                      'parent' => {},
+                      'text' => 't:b'
+                    },
+                    {
+                      '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' => 53
+                },
+                'original_def_cmdname' => 'deftypefnx',
+                'spaces_before_argument' => ' '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 114,
+                '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' => 95,
+                        'line_nr' => 115,
                         'macro' => ''
-                      }
+                      },
+                      'type' => 'bracketed_def_content'
                     },
                     {
                       'extra' => {
@@ -10560,52 +14759,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' => 95,
-                        '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' => {
@@ -10621,14 +14817,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'
@@ -10636,40 +14832,42 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 95,
+                        'line_nr' => 115,
                         'macro' => ''
                       }
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'delimiter'
-                      },
-                      'parent' => {},
-                      'text' => '(',
-                      'type' => 'delimiter'
-                    },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '['
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'var',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'type o--ther'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 115,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'code',
+                      'cmdname' => 'r',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -10677,7 +14875,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 95,
+                        'line_nr' => 115,
                         'macro' => ''
                       }
                     },
@@ -10698,60 +14896,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' => 95,
-                        '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'
@@ -10759,40 +14931,42 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 96,
+                        'line_nr' => 115,
                         'macro' => ''
                       }
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'delimiter'
-                      },
-                      'parent' => {},
-                      'text' => '[',
-                      'type' => 'delimiter'
-                    },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ']'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'var',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'var4'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 115,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 'r',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -10800,7 +14974,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 96,
+                        'line_nr' => 115,
                         'macro' => ''
                       }
                     },
@@ -10809,24 +14983,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' => 'r:var'
                     },
                     {
                       'extra' => {
@@ -10835,113 +15008,48 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'spaces_at_end'
-                    }
-                  ],
-                  'parent' => {},
-                  'type' => 'block_line_arg'
-                }
-              ],
-              'extra' => {
-                'def_command' => 'deffn',
-                'def_parsed_hash' => {
-                  'category' => {},
-                  'name' => {}
-                },
-                'index_entry' => {
-                  'command' => {},
-                  'content' => [
-                    {}
-                  ],
-                  'content_normalized' => [
-                    {}
-                  ],
-                  'in_code' => 1,
-                  'index_at_command' => 'deffn',
-                  'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'node' => {},
-                  'number' => 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' => {},
-              'type' => 'def_item'
-            },
-            {
-              'args' => [
-                {
-                  'contents' => [
-                    {
-                      'parent' => {},
-                      'text' => 'deffn'
-                    }
-                  ],
-                  'extra' => {
-                    'spaces_after_argument' => '
-'
-                  },
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
                   'parent' => {},
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'end',
+              'cmdname' => 'deftypefnx',
               'extra' => {
-                'command_argument' => 'deffn',
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'deffn'
+                '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' => 54
+                },
+                'original_def_cmdname' => 'deftypefnx',
+                'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 98,
+                'line_nr' => 115,
                 'macro' => ''
-              }
-            }
-          ],
-          'extra' => {
-            'end_command' => {},
-            'spaces_before_argument' => ' '
-          },
-          'parent' => {},
-          'source_info' => {
-            'file_name' => '',
-            'line_nr' => 95,
-            'macro' => ''
-          }
-        },
-        {
-          'parent' => {},
-          'text' => '
-',
-          'type' => 'empty_line'
-        },
-        {
-          'cmdname' => 'deftypefn',
-          'contents' => [
+              },
+              'type' => 'def_line'
+            },
             {
               'args' => [
                 {
@@ -10959,7 +15067,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 100,
+                        'line_nr' => 116,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -11046,17 +15154,52 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 100,
+                        'line_nr' => 116,
                         'macro' => ''
                       }
                     },
                     {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '['
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'slanted',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 116,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'delimiter'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => '[',
-                      'type' => 'delimiter'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 116,
+                        'macro' => ''
+                      }
                     },
                     {
                       'extra' => {
@@ -11110,17 +15253,52 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 100,
+                        'line_nr' => 116,
                         'macro' => ''
                       }
                     },
                     {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ']'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'slanted',
+                              'contents' => [],
+                              'parent' => {},
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 116,
+                                'macro' => ''
+                              }
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'r',
+                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'delimiter'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
-                      'text' => ']',
-                      'type' => 'delimiter'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 116,
+                        'macro' => ''
+                      }
                     },
                     {
                       'extra' => {
@@ -11143,7 +15321,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'default'
+                      'text' => 'r:slanted'
                     },
                     {
                       'extra' => {
@@ -11156,9 +15334,10 @@ $result_trees{'definition_commands'} = {
                     }
                   ],
                   'parent' => {},
-                  'type' => 'block_line_arg'
+                  'type' => 'line_arg'
                 }
               ],
+              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_parsed_hash' => {
@@ -11175,19 +15354,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' => 39
+                  'number' => 55
                 },
-                'original_def_cmdname' => 'deftypefn'
+                'original_def_cmdname' => 'deftypefnx',
+                'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 100,
+                'line_nr' => 116,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -11209,7 +15389,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 101,
+                        'line_nr' => 117,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -11296,7 +15476,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 101,
+                        'line_nr' => 117,
                         'macro' => ''
                       }
                     },
@@ -11305,8 +15485,26 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '['
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'code',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => '['
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 117,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
@@ -11321,7 +15519,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 101,
+                        'line_nr' => 117,
                         'macro' => ''
                       }
                     },
@@ -11377,7 +15575,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 101,
+                        'line_nr' => 117,
                         'macro' => ''
                       }
                     },
@@ -11386,8 +15584,26 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ']'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'code',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => ']'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 117,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
@@ -11402,7 +15618,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 101,
+                        'line_nr' => 117,
                         'macro' => ''
                       }
                     },
@@ -11427,7 +15643,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'r'
+                      'text' => 'r:code'
                     },
                     {
                       'extra' => {
@@ -11465,7 +15681,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 40
+                  'number' => 56
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -11473,7 +15689,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 101,
+                'line_nr' => 117,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -11495,7 +15711,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 102,
+                        'line_nr' => 118,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -11582,7 +15798,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 102,
+                        'line_nr' => 118,
                         'macro' => ''
                       }
                     },
@@ -11591,15 +15807,33 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '['
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 't',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => '['
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 118,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 'r',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -11607,7 +15841,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 102,
+                        'line_nr' => 118,
                         'macro' => ''
                       }
                     },
@@ -11663,7 +15897,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 102,
+                        'line_nr' => 118,
                         'macro' => ''
                       }
                     },
@@ -11672,15 +15906,33 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => ']'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 't',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => ']'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 118,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 'r',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -11688,7 +15940,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 102,
+                        'line_nr' => 118,
                         'macro' => ''
                       }
                     },
@@ -11713,7 +15965,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'var'
+                      'text' => 'r:t'
                     },
                     {
                       'extra' => {
@@ -11751,7 +16003,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 41
+                  'number' => 57
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -11759,7 +16011,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 102,
+                'line_nr' => 118,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -11781,7 +16033,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 103,
+                        'line_nr' => 119,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -11868,7 +16120,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 103,
+                        'line_nr' => 119,
                         'macro' => ''
                       }
                     },
@@ -11877,23 +16129,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' => 119,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'slanted',
+                      'cmdname' => 'code',
                       'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'typearg'
                       },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 103,
+                        'line_nr' => 119,
                         'macro' => ''
                       }
                     },
@@ -11949,7 +16219,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 103,
+                        'line_nr' => 119,
                         'macro' => ''
                       }
                     },
@@ -11958,23 +16228,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' => 119,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'slanted',
+                      'cmdname' => 'code',
                       'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'typearg'
                       },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 103,
+                        'line_nr' => 119,
                         'macro' => ''
                       }
                     },
@@ -11999,7 +16287,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'slanted'
+                      'text' => 'code:var'
                     },
                     {
                       'extra' => {
@@ -12037,7 +16325,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 42
+                  'number' => 58
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -12045,7 +16333,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 103,
+                'line_nr' => 119,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -12067,7 +16355,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 104,
+                        'line_nr' => 120,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -12154,7 +16442,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 104,
+                        'line_nr' => 120,
                         'macro' => ''
                       }
                     },
@@ -12163,23 +16451,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' => 120,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'code',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
-                        'def_role' => 'typearg'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 104,
+                        'line_nr' => 120,
                         'macro' => ''
                       }
                     },
@@ -12235,7 +16541,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 104,
+                        'line_nr' => 120,
                         'macro' => ''
                       }
                     },
@@ -12244,23 +16550,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' => 120,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'code',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
-                        'def_role' => 'typearg'
+                        'def_role' => 'arg'
                       },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 104,
+                        'line_nr' => 120,
                         'macro' => ''
                       }
                     },
@@ -12285,7 +16609,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'code'
+                      'text' => 't:var'
                     },
                     {
                       'extra' => {
@@ -12323,7 +16647,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 43
+                  'number' => 59
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -12331,7 +16655,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 104,
+                'line_nr' => 120,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -12353,7 +16677,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 105,
+                        'line_nr' => 121,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -12440,7 +16764,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 105,
+                        'line_nr' => 121,
                         'macro' => ''
                       }
                     },
@@ -12449,23 +16773,41 @@ $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' => 121,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 't',
+                      'cmdname' => 'code',
                       'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'typearg'
                       },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 105,
+                        'line_nr' => 121,
                         'macro' => ''
                       }
                     },
@@ -12521,7 +16863,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 105,
+                        'line_nr' => 121,
                         'macro' => ''
                       }
                     },
@@ -12530,23 +16872,41 @@ $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' => 121,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 't',
+                      'cmdname' => 'code',
                       'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'typearg'
                       },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 105,
+                        'line_nr' => 121,
                         'macro' => ''
                       }
                     },
@@ -12571,7 +16931,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 't'
+                      'text' => 'code:slanted'
                     },
                     {
                       'extra' => {
@@ -12609,7 +16969,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 44
+                  'number' => 60
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -12617,7 +16977,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 105,
+                'line_nr' => 121,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -12639,7 +16999,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 106,
+                        'line_nr' => 122,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -12726,7 +17086,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 106,
+                        'line_nr' => 122,
                         'macro' => ''
                       }
                     },
@@ -12747,12 +17107,12 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 'b',
+                              'cmdname' => 'slanted',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 106,
+                                'line_nr' => 122,
                                 'macro' => ''
                               }
                             }
@@ -12769,7 +17129,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 106,
+                        'line_nr' => 122,
                         'macro' => ''
                       }
                     },
@@ -12825,7 +17185,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 106,
+                        'line_nr' => 122,
                         'macro' => ''
                       }
                     },
@@ -12846,12 +17206,12 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 'b',
+                              'cmdname' => 'slanted',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 106,
+                                'line_nr' => 122,
                                 'macro' => ''
                               }
                             }
@@ -12868,7 +17228,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 106,
+                        'line_nr' => 122,
                         'macro' => ''
                       }
                     },
@@ -12893,7 +17253,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 't:b'
+                      'text' => 't:slanted'
                     },
                     {
                       'extra' => {
@@ -12909,41 +17269,109 @@ $result_trees{'definition_commands'} = {
                   'type' => 'line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
+              'cmdname' => 'deftypefnx',
+              'extra' => {
+                'def_command' => 'deftypefn',
+                'def_parsed_hash' => {
+                  'category' => {},
+                  'name' => {},
+                  'type' => {}
+                },
+                'index_entry' => {
+                  'command' => {},
+                  'content' => [
+                    {}
+                  ],
+                  'content_normalized' => [
+                    {}
+                  ],
+                  'in_code' => 1,
+                  'index_at_command' => 'deftypefnx',
+                  'index_ignore_chars' => {},
+                  'index_name' => 'fn',
+                  'index_type_command' => 'deftypefn',
+                  'node' => {},
+                  'number' => 61
+                },
+                'original_def_cmdname' => 'deftypefnx',
+                'spaces_before_argument' => ' '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 122,
+                'macro' => ''
+              },
+              'type' => 'def_line'
+            },
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'separators
+'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'paragraph'
+                }
+              ],
+              'parent' => {},
+              'type' => 'def_item'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'deftypefn'
+                    }
+                  ],
+                  'extra' => {
+                    'spaces_after_argument' => '
+'
+                  },
+                  'parent' => {},
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'end',
               'extra' => {
-                'def_command' => 'deftypefn',
-                'def_parsed_hash' => {
-                  'category' => {},
-                  'name' => {},
-                  'type' => {}
-                },
-                'index_entry' => {
-                  'command' => {},
-                  'content' => [
-                    {}
-                  ],
-                  'content_normalized' => [
-                    {}
-                  ],
-                  'in_code' => 1,
-                  'index_at_command' => 'deftypefnx',
-                  'index_ignore_chars' => {},
-                  'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 45
-                },
-                'original_def_cmdname' => 'deftypefnx',
-                'spaces_before_argument' => ' '
+                'command_argument' => 'deftypefn',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'deftypefn'
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 106,
+                'line_nr' => 124,
                 'macro' => ''
-              },
-              'type' => 'def_line'
-            },
+              }
+            }
+          ],
+          'extra' => {
+            'end_command' => {},
+            'spaces_before_argument' => ' '
+          },
+          'parent' => {},
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 108,
+            'macro' => ''
+          }
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'cmdname' => 'deftypefn',
+          'contents' => [
             {
               'args' => [
                 {
@@ -12961,7 +17389,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 107,
+                        'line_nr' => 126,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -13017,7 +17445,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'int'
+                      'text' => 'i--nt'
                     },
                     {
                       'extra' => {
@@ -13048,52 +17476,17 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 107,
+                        'line_nr' => 126,
                         'macro' => ''
                       }
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => '['
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'var',
-                              'contents' => [],
-                              'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 107,
-                                'macro' => ''
-                              }
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'r',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 107,
-                        'macro' => ''
-                      }
+                      'text' => '[',
+                      'type' => 'delimiter'
                     },
                     {
                       'extra' => {
@@ -13147,52 +17540,17 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 107,
+                        'line_nr' => 126,
                         'macro' => ''
                       }
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => ']'
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'var',
-                              'contents' => [],
-                              'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 107,
-                                'macro' => ''
-                              }
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'r',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 107,
-                        'macro' => ''
-                      }
+                      'text' => ']',
+                      'type' => 'delimiter'
                     },
                     {
                       'extra' => {
@@ -13215,7 +17573,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'r:var'
+                      'text' => 'default'
                     },
                     {
                       'extra' => {
@@ -13228,10 +17586,9 @@ $result_trees{'definition_commands'} = {
                     }
                   ],
                   'parent' => {},
-                  'type' => 'line_arg'
+                  'type' => 'block_line_arg'
                 }
               ],
-              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_parsed_hash' => {
@@ -13248,20 +17605,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' => 46
+                  'number' => 62
                 },
-                'original_def_cmdname' => 'deftypefnx',
-                'spaces_before_argument' => ' '
+                'original_def_cmdname' => 'deftypefn'
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 107,
+                'line_nr' => 126,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -13283,7 +17639,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 108,
+                        'line_nr' => 127,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -13334,35 +17690,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'
@@ -13370,42 +17711,32 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 108,
+                        'line_nr' => 127,
                         'macro' => ''
                       }
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => '['
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'slanted',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 108,
-                                'macro' => ''
-                              }
+                              'text' => 'f---oo'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 'var',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -13413,10 +17744,18 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 108,
+                        'line_nr' => 127,
                         'macro' => ''
                       }
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '[',
+                      'type' => 'delimiter'
+                    },
                     {
                       'extra' => {
                         'def_role' => 'delimiter'
@@ -13469,52 +17808,17 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 108,
+                        'line_nr' => 127,
                         'macro' => ''
                       }
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => ']'
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'slanted',
-                              'contents' => [],
-                              'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 108,
-                                'macro' => ''
-                              }
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'r',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 108,
-                        'macro' => ''
-                      }
+                      'text' => ']',
+                      'type' => 'delimiter'
                     },
                     {
                       'extra' => {
@@ -13537,7 +17841,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'r:slanted'
+                      'text' => 'r'
                     },
                     {
                       'extra' => {
@@ -13575,7 +17879,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 47
+                  'number' => 63
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -13583,7 +17887,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 108,
+                'line_nr' => 127,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -13605,7 +17909,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 109,
+                        'line_nr' => 128,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -13656,28 +17960,13 @@ $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' => {},
@@ -13692,42 +17981,32 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 109,
+                        'line_nr' => 128,
                         'macro' => ''
                       }
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'spaces'
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => '['
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'code',
-                              'contents' => [],
                               'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 109,
-                                'macro' => ''
-                              }
+                              'text' => 'f---oo'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 'var',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -13735,10 +18014,18 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 109,
+                        'line_nr' => 128,
                         'macro' => ''
                       }
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '[',
+                      'type' => 'delimiter'
+                    },
                     {
                       'extra' => {
                         'def_role' => 'delimiter'
@@ -13791,52 +18078,17 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 109,
+                        'line_nr' => 128,
                         'macro' => ''
                       }
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => ']'
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 'code',
-                              'contents' => [],
-                              'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 109,
-                                'macro' => ''
-                              }
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'r',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 109,
-                        'macro' => ''
-                      }
+                      'text' => ']',
+                      'type' => 'delimiter'
                     },
                     {
                       'extra' => {
@@ -13859,7 +18111,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'r:code'
+                      'text' => 'var'
                     },
                     {
                       'extra' => {
@@ -13897,7 +18149,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 48
+                  'number' => 64
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -13905,7 +18157,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 109,
+                'line_nr' => 128,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -13927,7 +18179,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 110,
+                        'line_nr' => 129,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -13978,35 +18230,20 @@ $result_trees{'definition_commands'} = {
                       'text' => '(',
                       'type' => 'delimiter'
                     },
-                    {
-                      'extra' => {
-                        'def_role' => 'typearg'
-                      },
-                      'parent' => {},
-                      'text' => 'int'
-                    },
-                    {
-                      'extra' => {
-                        'def_role' => 'spaces'
-                      },
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces'
-                    },
                     {
                       'args' => [
                         {
                           'contents' => [
                             {
                               'parent' => {},
-                              'text' => 'f---oo'
+                              'text' => 'i--nt'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 'slanted',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -14014,42 +18251,32 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 110,
+                        'line_nr' => 129,
                         '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' => 110,
-                                'macro' => ''
-                              }
+                              'text' => 'f---oo'
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 'var',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -14057,10 +18284,18 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 110,
+                        'line_nr' => 129,
                         'macro' => ''
                       }
                     },
+                    {
+                      'extra' => {
+                        'def_role' => 'delimiter'
+                      },
+                      'parent' => {},
+                      'text' => '[',
+                      'type' => 'delimiter'
+                    },
                     {
                       'extra' => {
                         'def_role' => 'delimiter'
@@ -14113,52 +18348,17 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 110,
+                        'line_nr' => 129,
                         'macro' => ''
                       }
                     },
                     {
-                      'args' => [
-                        {
-                          'contents' => [
-                            {
-                              'args' => [
-                                {
-                                  'contents' => [
-                                    {
-                                      'parent' => {},
-                                      'text' => ']'
-                                    }
-                                  ],
-                                  'parent' => {},
-                                  'type' => 'brace_command_arg'
-                                }
-                              ],
-                              'cmdname' => 't',
-                              'contents' => [],
-                              'parent' => {},
-                              'source_info' => {
-                                'file_name' => '',
-                                'line_nr' => 110,
-                                'macro' => ''
-                              }
-                            }
-                          ],
-                          'parent' => {},
-                          'type' => 'brace_command_arg'
-                        }
-                      ],
-                      'cmdname' => 'r',
-                      'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'delimiter'
                       },
                       'parent' => {},
-                      'source_info' => {
-                        'file_name' => '',
-                        'line_nr' => 110,
-                        'macro' => ''
-                      }
+                      'text' => ']',
+                      'type' => 'delimiter'
                     },
                     {
                       'extra' => {
@@ -14181,7 +18381,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'r:t'
+                      'text' => 'slanted'
                     },
                     {
                       'extra' => {
@@ -14219,7 +18419,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 49
+                  'number' => 65
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -14227,79 +18427,11 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                '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,
+                'line_nr' => 129,
                 'macro' => ''
-              }
-            }
-          ],
-          'extra' => {
-            'end_command' => {},
-            'spaces_before_argument' => ' '
-          },
-          'parent' => {},
-          'source_info' => {
-            'file_name' => '',
-            'line_nr' => 100,
-            'macro' => ''
-          }
-        },
-        {
-          'parent' => {},
-          'text' => '
-',
-          'type' => 'empty_line'
-        },
-        {
-          'cmdname' => 'deftypefn',
-          'contents' => [
+              },
+              'type' => 'def_line'
+            },
             {
               'args' => [
                 {
@@ -14317,7 +18449,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 114,
+                        'line_nr' => 130,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -14369,11 +18501,29 @@ $result_trees{'definition_commands'} = {
                       'type' => 'delimiter'
                     },
                     {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'parent' => {},
+                              'text' => 'i--nt'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'brace_command_arg'
+                        }
+                      ],
+                      'cmdname' => 'code',
+                      'contents' => [],
                       'extra' => {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'i--nt'
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 130,
+                        'macro' => ''
+                      }
                     },
                     {
                       'extra' => {
@@ -14404,7 +18554,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 114,
+                        'line_nr' => 130,
                         'macro' => ''
                       }
                     },
@@ -14468,7 +18618,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 114,
+                        'line_nr' => 130,
                         'macro' => ''
                       }
                     },
@@ -14501,7 +18651,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'default'
+                      'text' => 'code'
                     },
                     {
                       'extra' => {
@@ -14514,9 +18664,10 @@ $result_trees{'definition_commands'} = {
                     }
                   ],
                   'parent' => {},
-                  'type' => 'block_line_arg'
+                  'type' => 'line_arg'
                 }
               ],
+              'cmdname' => 'deftypefnx',
               'extra' => {
                 'def_command' => 'deftypefn',
                 'def_parsed_hash' => {
@@ -14533,19 +18684,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' => 50
+                  'number' => 66
                 },
-                'original_def_cmdname' => 'deftypefn'
+                'original_def_cmdname' => 'deftypefnx',
+                'spaces_before_argument' => ' '
               },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 114,
+                'line_nr' => 130,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -14567,7 +18719,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 115,
+                        'line_nr' => 131,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -14631,7 +18783,7 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -14639,7 +18791,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 115,
+                        'line_nr' => 131,
                         'macro' => ''
                       }
                     },
@@ -14672,7 +18824,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 115,
+                        'line_nr' => 131,
                         'macro' => ''
                       }
                     },
@@ -14736,7 +18888,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 115,
+                        'line_nr' => 131,
                         'macro' => ''
                       }
                     },
@@ -14769,7 +18921,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'r'
+                      'text' => 't'
                     },
                     {
                       'extra' => {
@@ -14807,7 +18959,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 51
+                  'number' => 67
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -14815,7 +18967,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 115,
+                'line_nr' => 131,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -14837,7 +18989,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 116,
+                        'line_nr' => 132,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -14893,15 +19045,33 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => 'i--nt'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'b',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'i--nt'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 132,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'var',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -14909,7 +19079,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 116,
+                        'line_nr' => 132,
                         'macro' => ''
                       }
                     },
@@ -14942,7 +19112,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 116,
+                        'line_nr' => 132,
                         'macro' => ''
                       }
                     },
@@ -15006,7 +19176,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 116,
+                        'line_nr' => 132,
                         'macro' => ''
                       }
                     },
@@ -15039,7 +19209,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'var'
+                      'text' => 't:b'
                     },
                     {
                       'extra' => {
@@ -15077,7 +19247,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 52
+                  'number' => 68
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -15085,7 +19255,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 116,
+                'line_nr' => 132,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -15107,7 +19277,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 117,
+                        'line_nr' => 133,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -15163,15 +19333,33 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => 'i--nt'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'var',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'i--nt'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 133,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'slanted',
+                      'cmdname' => 'r',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -15179,7 +19367,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 117,
+                        'line_nr' => 133,
                         'macro' => ''
                       }
                     },
@@ -15212,7 +19400,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 117,
+                        'line_nr' => 133,
                         'macro' => ''
                       }
                     },
@@ -15276,7 +19464,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 117,
+                        'line_nr' => 133,
                         'macro' => ''
                       }
                     },
@@ -15309,7 +19497,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'slanted'
+                      'text' => 'r:var'
                     },
                     {
                       'extra' => {
@@ -15347,7 +19535,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 53
+                  'number' => 69
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -15355,7 +19543,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 117,
+                'line_nr' => 133,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -15377,7 +19565,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 118,
+                        'line_nr' => 134,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -15433,23 +19621,41 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => 'i--nt'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'slanted',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'i--nt'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 134,
+                                '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' => 118,
+                        'line_nr' => 134,
                         'macro' => ''
                       }
                     },
@@ -15482,7 +19688,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 118,
+                        'line_nr' => 134,
                         'macro' => ''
                       }
                     },
@@ -15546,7 +19752,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 118,
+                        'line_nr' => 134,
                         'macro' => ''
                       }
                     },
@@ -15579,7 +19785,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'code'
+                      'text' => 'r:slanted'
                     },
                     {
                       'extra' => {
@@ -15617,7 +19823,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 54
+                  'number' => 70
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -15625,7 +19831,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 118,
+                'line_nr' => 134,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -15647,7 +19853,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 119,
+                        'line_nr' => 135,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -15703,15 +19909,33 @@ $result_trees{'definition_commands'} = {
                         {
                           'contents' => [
                             {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => 'i--nt'
+                                    }
+                                  ],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'code',
+                              'contents' => [],
                               'parent' => {},
-                              'text' => 'i--nt'
+                              'source_info' => {
+                                'file_name' => '',
+                                'line_nr' => 135,
+                                'macro' => ''
+                              }
                             }
                           ],
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 't',
+                      'cmdname' => 'r',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -15719,7 +19943,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 119,
+                        'line_nr' => 135,
                         'macro' => ''
                       }
                     },
@@ -15752,7 +19976,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 119,
+                        'line_nr' => 135,
                         'macro' => ''
                       }
                     },
@@ -15816,7 +20040,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 119,
+                        'line_nr' => 135,
                         'macro' => ''
                       }
                     },
@@ -15849,7 +20073,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 't'
+                      'text' => 'r:code'
                     },
                     {
                       'extra' => {
@@ -15887,7 +20111,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 55
+                  'number' => 71
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -15895,7 +20119,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 119,
+                'line_nr' => 135,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -15917,7 +20141,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 120,
+                        'line_nr' => 136,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -15985,12 +20209,12 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 'b',
+                              'cmdname' => 't',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 120,
+                                'line_nr' => 136,
                                 'macro' => ''
                               }
                             }
@@ -15999,7 +20223,7 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 't',
+                      'cmdname' => 'r',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -16007,7 +20231,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 120,
+                        'line_nr' => 136,
                         'macro' => ''
                       }
                     },
@@ -16040,7 +20264,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 120,
+                        'line_nr' => 136,
                         'macro' => ''
                       }
                     },
@@ -16104,7 +20328,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 120,
+                        'line_nr' => 136,
                         'macro' => ''
                       }
                     },
@@ -16137,7 +20361,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 't:b'
+                      'text' => 'r:t'
                     },
                     {
                       'extra' => {
@@ -16175,7 +20399,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 56
+                  'number' => 72
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -16183,7 +20407,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 120,
+                'line_nr' => 136,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -16205,7 +20429,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 121,
+                        'line_nr' => 137,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -16278,7 +20502,7 @@ $result_trees{'definition_commands'} = {
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 121,
+                                'line_nr' => 137,
                                 'macro' => ''
                               }
                             }
@@ -16287,15 +20511,15 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 'code',
                       'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'typearg'
                       },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 121,
+                        'line_nr' => 137,
                         'macro' => ''
                       }
                     },
@@ -16328,7 +20552,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 121,
+                        'line_nr' => 137,
                         'macro' => ''
                       }
                     },
@@ -16392,7 +20616,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 121,
+                        'line_nr' => 137,
                         'macro' => ''
                       }
                     },
@@ -16425,7 +20649,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'r:var'
+                      'text' => 'code:var'
                     },
                     {
                       'extra' => {
@@ -16463,7 +20687,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 57
+                  'number' => 73
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -16471,7 +20695,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 121,
+                'line_nr' => 137,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -16493,7 +20717,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 122,
+                        'line_nr' => 138,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -16561,12 +20785,12 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 'slanted',
+                              'cmdname' => 'var',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 122,
+                                'line_nr' => 138,
                                 'macro' => ''
                               }
                             }
@@ -16575,7 +20799,7 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -16583,7 +20807,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 122,
+                        'line_nr' => 138,
                         'macro' => ''
                       }
                     },
@@ -16616,7 +20840,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 122,
+                        'line_nr' => 138,
                         'macro' => ''
                       }
                     },
@@ -16680,7 +20904,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 122,
+                        'line_nr' => 138,
                         'macro' => ''
                       }
                     },
@@ -16713,7 +20937,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'r:slanted'
+                      'text' => 't:var'
                     },
                     {
                       'extra' => {
@@ -16751,7 +20975,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 58
+                  'number' => 74
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -16759,7 +20983,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 122,
+                'line_nr' => 138,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -16781,7 +21005,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 123,
+                        'line_nr' => 139,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -16849,12 +21073,12 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 'code',
+                              'cmdname' => 'slanted',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 123,
+                                'line_nr' => 139,
                                 'macro' => ''
                               }
                             }
@@ -16863,15 +21087,15 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 'code',
                       'contents' => [],
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'typearg'
                       },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 123,
+                        'line_nr' => 139,
                         'macro' => ''
                       }
                     },
@@ -16904,7 +21128,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 123,
+                        'line_nr' => 139,
                         'macro' => ''
                       }
                     },
@@ -16968,7 +21192,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 123,
+                        'line_nr' => 139,
                         'macro' => ''
                       }
                     },
@@ -17001,7 +21225,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'r:code'
+                      'text' => 'code:slanted'
                     },
                     {
                       'extra' => {
@@ -17039,7 +21263,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 59
+                  'number' => 75
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -17047,7 +21271,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 123,
+                'line_nr' => 139,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -17069,7 +21293,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 124,
+                        'line_nr' => 140,
                         'macro' => ''
                       },
                       'type' => 'bracketed_def_content'
@@ -17137,12 +21361,12 @@ $result_trees{'definition_commands'} = {
                                   'type' => 'brace_command_arg'
                                 }
                               ],
-                              'cmdname' => 't',
+                              'cmdname' => 'slanted',
                               'contents' => [],
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
-                                'line_nr' => 124,
+                                'line_nr' => 140,
                                 'macro' => ''
                               }
                             }
@@ -17151,7 +21375,7 @@ $result_trees{'definition_commands'} = {
                           'type' => 'brace_command_arg'
                         }
                       ],
-                      'cmdname' => 'r',
+                      'cmdname' => 't',
                       'contents' => [],
                       'extra' => {
                         'def_role' => 'arg'
@@ -17159,7 +21383,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 124,
+                        'line_nr' => 140,
                         'macro' => ''
                       }
                     },
@@ -17192,7 +21416,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 124,
+                        'line_nr' => 140,
                         'macro' => ''
                       }
                     },
@@ -17256,7 +21480,7 @@ $result_trees{'definition_commands'} = {
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 124,
+                        'line_nr' => 140,
                         'macro' => ''
                       }
                     },
@@ -17289,7 +21513,7 @@ $result_trees{'definition_commands'} = {
                         'def_role' => 'typearg'
                       },
                       'parent' => {},
-                      'text' => 'r:t'
+                      'text' => 't:slanted'
                     },
                     {
                       'extra' => {
@@ -17327,7 +21551,7 @@ $result_trees{'definition_commands'} = {
                   'index_name' => 'fn',
                   'index_type_command' => 'deftypefn',
                   'node' => {},
-                  'number' => 60
+                  'number' => 76
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -17335,7 +21559,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 124,
+                'line_nr' => 140,
                 'macro' => ''
               },
               'type' => 'def_line'
@@ -17383,7 +21607,7 @@ $result_trees{'definition_commands'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 126,
+                'line_nr' => 142,
                 'macro' => ''
               }
             }
@@ -17395,7 +21619,7 @@ $result_trees{'definition_commands'} = {
           'parent' => {},
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 114,
+            'line_nr' => 126,
             'macro' => ''
           }
         },
@@ -17952,13 +22176,173 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1
 
$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]{'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]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[12]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[12];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[12]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[13]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[14];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[14]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[15]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[16]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[17]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[18]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0];
 
$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]{'contents'}[1]{'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]{'contents'}[2]{'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]{'contents'}[3]{'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]{'contents'}[4]{'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]{'contents'}[5]{'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]{'contents'}[6]{'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]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[7]{'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]{'contents'}[8]{'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]{'contents'}[9]{'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]{'contents'}[10]{'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]{'contents'}[11]{'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]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[12]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[12];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[12]{'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]{'contents'}[13]{'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]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[14];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[14]{'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]{'contents'}[15]{'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]{'contents'}[16]{'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]{'contents'}[17]{'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]{'contents'}[18]{'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]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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]{'contents'}[13]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[12]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[12];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[12]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[13]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[14];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[14]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[15]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[16]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[17]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[18]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[12]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[12];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[12]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[13]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[14];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[14]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[15]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[16]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[17]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[18]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[15]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[15]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[15];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[15]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[16]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[16]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[16];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[16]{'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'}[16];
 $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];
@@ -18178,13 +22562,97 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'contents'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'extra'}{'end_command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[15]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[15]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[15];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[15]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[16]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[16]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[16];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[16]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'extra'}{'end_command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[16];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'parent'} = 
$result_trees{'definition_commands'}{'contents'}[4];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'args'}[0];
@@ -19366,13 +23834,185 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[
 
$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]{'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]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[10]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[10];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[12]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[13]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[14]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[15]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[15]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[15];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[15]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[16]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[16]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[16];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[16]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[17]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[18]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[19]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[20]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[0];
 
$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]{'contents'}[1]{'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]{'contents'}[2]{'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]{'contents'}[3]{'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]{'contents'}[4]{'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]{'contents'}[5]{'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]{'contents'}[6]{'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]{'contents'}[7]{'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]{'contents'}[8]{'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]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[9]{'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]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[10]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[10];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[10]{'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]{'contents'}[11]{'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]{'contents'}[12]{'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]{'contents'}[13]{'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]{'contents'}[14]{'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]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[15]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[15]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[15];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[15]{'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]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[16]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[16]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[16];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[16]{'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]{'contents'}[17]{'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]{'contents'}[18]{'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]{'contents'}[19]{'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]{'contents'}[20]{'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]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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]{'contents'}[13]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[10]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[10];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[12]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[13]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[14]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[15]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[15]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[15];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[15]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[16]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[16]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[16];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[16]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[17]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[18]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[19]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[20]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[10]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[10];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[12]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[13]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[14]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[15]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[15]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[15];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[15]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[16]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[16]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[16];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[16]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[17]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[18]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[19]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[20]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[15]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[15]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[15];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[15]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[16]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[16]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[16];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[16]{'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'}[16];
 $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];
@@ -19790,13 +24430,169 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[
 
$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]{'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]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[12]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[13]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[14]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[15]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[15]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[15];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[15]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[16]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[17]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[18]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[19]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[20]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'contents'}[0];
 
$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]{'contents'}[1]{'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]{'contents'}[2]{'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]{'contents'}[3]{'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]{'contents'}[4]{'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]{'contents'}[5]{'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]{'contents'}[6]{'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]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'contents'}[7]{'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]{'contents'}[8]{'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]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'contents'}[9]{'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]{'contents'}[10]{'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]{'contents'}[11]{'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]{'contents'}[12]{'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]{'contents'}[13]{'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]{'contents'}[14]{'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]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'contents'}[15]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'contents'}[15]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'contents'}[15];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'contents'}[15]{'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]{'contents'}[16]{'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]{'contents'}[17]{'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]{'contents'}[18]{'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]{'contents'}[19]{'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]{'contents'}[20]{'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]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$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]{'contents'}[13]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[12]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[13]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[14]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[15]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[15]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[15];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[15]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[16]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[17]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[18]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[19]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[20]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[7]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[9]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[12]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[13]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[14]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[15]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[15]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[15];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[15]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[16]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[17]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[18]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[19]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[20]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[15]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[15]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[15];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[15]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[16]{'args'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[16]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[16];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[16]{'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'}[16];
 $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'};
@@ -19832,6 +24628,10 @@ deffn r slanted for @var{a---rg1} and @var{a--rg2}
 @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
+@defspecx foobar (var @code{@var{[}}from to @code{@var{[}}inc@code{@var{]]}}) 
code:var
+@defspecx foobar (var @t{@var{[}}from to @t{@var{[}}inc@t{@var{]]}}) t:var
+@defspecx foobar (var @code{@slanted{[}}from to 
@code{@slanted{[}}inc@code{@slanted{]]}}) code:slanted
+@defspecx foobar (var @t{@slanted{[}}from to 
@t{@slanted{[}}inc@t{@slanted{]]}}) t:slanted
 separators
 @end defspec
 
@@ -19846,6 +24646,10 @@ separators
 @defspecx foobar @r{@slanted{va---riable}} r:slanted
 @defspecx foobar @r{@code{va---riable}} r:code
 @defspecx foobar @r{@t{va---riable}} r:t
+@defspecx foobar @code{@var{va---riable}} code:var
+@defspecx foobar @t{@var{va---riable}} t:var
+@defspecx foobar @code{@slanted{va---riable}} code:slanted
+@defspecx foobar @t{@slanted{va---riable}} t:slanted
 name
 @end defspec
 
@@ -19910,6 +24714,10 @@ In deffn with code and var used
 @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
+@deftypefnx {Library Function} int foobar  (int @var{f---oo}@code{@var{[}}, 
float @var{b--ar}@code{@var{]}}) code:var
+@deftypefnx {Library Function} int foobar  (int @var{f---oo}@t{@var{[}}, float 
@var{b--ar}@t{@var{]}}) t:var
+@deftypefnx {Library Function} int foobar  (int 
@var{f---oo}@code{@slanted{[}}, float @var{b--ar}@code{@slanted{]}}) 
code:slanted
+@deftypefnx {Library Function} int foobar  (int @var{f---oo}@t{@slanted{[}}, 
float @var{b--ar}@t{@slanted{]}}) t:slanted
 separators
 @end deftypefn
 
@@ -19924,6 +24732,10 @@ separators
 @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
+@deftypefnx {Library Function} int foobar  (@code{@var{i--nt}} @var{f---oo}[, 
float @var{b--ar}]) code:var
+@deftypefnx {Library Function} int foobar  (@t{@var{i--nt}} @var{f---oo}[, 
float @var{b--ar}]) t:var
+@deftypefnx {Library Function} int foobar  (@code{@slanted{i--nt}} 
@var{f---oo}[, float @var{b--ar}]) code:slanted
+@deftypefnx {Library Function} int foobar  (@t{@slanted{i--nt}} @var{f---oo}[, 
float @var{b--ar}]) t:slanted
 name
 @end deftypefn
 
@@ -19957,6 +24769,10 @@ 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
+Special Form: foobar (var [from to [inc]]) code:var
+Special Form: foobar (var [from to [inc]]) t:var
+Special Form: foobar (var [from to [inc]]) code:slanted
+Special Form: foobar (var [from to [inc]]) t:slanted
 separators
 
 Special Form: foobar va---riable default
@@ -19970,6 +24786,10 @@ Special Form: foobar va---riable r:var
 Special Form: foobar va---riable r:slanted
 Special Form: foobar va---riable r:code
 Special Form: foobar va---riable r:t
+Special Form: foobar va---riable code:var
+Special Form: foobar va---riable t:var
+Special Form: foobar va---riable code:slanted
+Special Form: foobar va---riable t:slanted
 name
 
 Request: .ft [font]
@@ -20021,6 +24841,10 @@ 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
+Library Function: int foobar (int f---oo[, float b--ar]) code:var
+Library Function: int foobar (int f---oo[, float b--ar]) t:var
+Library Function: int foobar (int f---oo[, float b--ar]) code:slanted
+Library Function: int foobar (int f---oo[, float b--ar]) t:slanted
 separators
 
 Library Function: int foobar (i--nt f---oo[, float b--ar]) default
@@ -20034,6 +24858,10 @@ 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
+Library Function: int foobar (i--nt f---oo[, float b--ar]) code:var
+Library Function: int foobar (i--nt f---oo[, float b--ar]) t:var
+Library Function: int foobar (i--nt f---oo[, float b--ar]) code:slanted
+Library Function: int foobar (i--nt f---oo[, float b--ar]) t:slanted
 name
 
 ';
@@ -20195,6 +25023,22 @@ $result_indices_sort_strings{'definition_commands'} = {
     'foobar',
     'foobar',
     'foobar',
+    'foobar',
+    'foobar',
+    'foobar',
+    'foobar',
+    'foobar',
+    'foobar',
+    'foobar',
+    'foobar',
+    'foobar',
+    'foobar',
+    'foobar',
+    'foobar',
+    'foobar',
+    'foobar',
+    'foobar',
+    'foobar',
     'name'
   ],
   'vr' => [
@@ -20231,6 +25075,10 @@ 
$result_converted{'plaintext'}->{'definition_commands'} = 'top section
  -- 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
+ -- Special Form: foobar (var [from to [inc]]) code:var
+ -- Special Form: foobar (var [from to [inc]]) t:var
+ -- Special Form: foobar (var [from to [inc]]) code:slanted
+ -- Special Form: foobar (var [from to [inc]]) t:slanted
      separators
 
  -- Special Form: foobar va---riable default
@@ -20244,6 +25092,10 @@ 
$result_converted{'plaintext'}->{'definition_commands'} = 'top section
  -- Special Form: foobar va—riable r:slanted
  -- Special Form: foobar va---riable r:code
  -- Special Form: foobar va---riable r:t
+ -- Special Form: foobar VA---RIABLE code:var
+ -- Special Form: foobar VA---RIABLE t:var
+ -- Special Form: foobar va—riable code:slanted
+ -- Special Form: foobar va—riable t:slanted
      name
 
  -- Request: .ft [font]
@@ -20296,6 +25148,11 @@ produces:
  -- 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
+ -- Library Function: int foobar (int F---OO[, float B--AR]) code:var
+ -- Library Function: int foobar (int F---OO[, float B--AR]) t:var
+ -- Library Function: int foobar (int F---OO[, float B--AR])
+          code:slanted
+ -- Library Function: int foobar (int F---OO[, float B--AR]) t:slanted
      separators
 
  -- Library Function: int foobar (i--nt F---OO[, float B--AR]) default
@@ -20309,6 +25166,11 @@ produces:
  -- 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
+ -- Library Function: int foobar (I--NT F---OO[, float B--AR]) code:var
+ -- Library Function: int foobar (I--NT F---OO[, float B--AR]) t:var
+ -- Library Function: int foobar (i–nt F---OO[, float B--AR])
+          code:slanted
+ -- Library Function: int foobar (i–nt F---OO[, float B--AR]) t:slanted
      name
 
 ';
@@ -20360,21 +25222,29 @@ 
$result_converted{'html_text'}->{'definition_commands'} = '
 <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>
+<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">(var <code class="code"><var 
class="var">[</var></code>from to <code class="code"><var 
class="var">[</var></code>inc<code class="code"><var 
class="var">]]</var></code>) code:var</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 <code class="t"><var 
class="var">[</var></code>from to <code class="t"><var 
class="var">[</var></code>inc<code class="t"><var class="var">]]</var></code>) 
t: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">(var <code class="code"><i 
class="slanted">[</i></code>from to <code class="code"><i 
class="slanted">[</i></code>inc<code class="code"><i 
class="slanted">]]</i></code>) code:slanted</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">(var <code class="t"><i 
class="slanted">[</i></code>from to <code class="t"><i 
class="slanted">[</i></code>inc<code class="t"><i 
class="slanted">]]</i></code>) t:slanted</var><a class="copiable-link" 
href=\'#index-foobar-14\'> &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-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>
+<dt class="deffn defspec-alias-deffn" id="index-foobar-15"><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-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"><var class="var">va&mdash;riable</var> 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">va&mdash;riable</span> r</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"><i class="slanted">va&mdash;riable</i> 
slanted</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"><code class="code">va---riable</code> code</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"><code class="t">va---riable</code> t</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"><code class="t"><b 
class="b">va&mdash;riable</b></code> t:b</var><a class="copiable-link" 
href=\'#index-foobar-21\'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-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"><var 
class="var">va&mdash;riable</var></span> r:var</var><a class="copiable-link" 
href=\'#index-foobar-22\'> &para;</a></span></dt>
+<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"><i 
class="slanted">va&mdash;riable</i></span> r:slanted</var><a 
class="copiable-link" href=\'#index-foobar-23\'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-24"><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-24\'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-25"><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-25\'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-26"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="code"><var 
class="var">va---riable</var></code> code:var</var><a class="copiable-link" 
href=\'#index-foobar-26\'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-27"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="t"><var 
class="var">va---riable</var></code> t:var</var><a class="copiable-link" 
href=\'#index-foobar-27\'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-28"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="code"><i 
class="slanted">va&mdash;riable</i></code> code:slanted</var><a 
class="copiable-link" href=\'#index-foobar-28\'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-29"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="t"><i 
class="slanted">va&mdash;riable</i></code> t:slanted</var><a 
class="copiable-link" href=\'#index-foobar-29\'> &para;</a></span></dt>
 <dd><p>name
 </p></dd></dl>
 
@@ -20390,18 +25260,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-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 [...]
+<dt class="deffn defspec-alias-deffn" id="index-foobar-30"><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-31"><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-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>
+<dt class="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>, float <var class="var">b--ar</var>)</code><a 
class="copiable-link" href=\'#index-foobar-32\'> &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-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>
+<dt class="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 <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-33\'> &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>
 
@@ -20418,7 +25288,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-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>
+<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">(int <var 
class="var">foo</var>, float <var class="var">bar</var>)</code><a 
class="copiable-link" href=\'#index-foobar-34\'> &para;</a></span></dt>
 <dd><p>&hellip; for <var class="var">foo</var> and <var class="var">bar</var>
 </p></dd></dl>
 </blockquote>
@@ -20439,32 +25309,40 @@ 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-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>
+<dt class="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>[, float <var class="var">b--ar</var>]) 
default</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">[</span>, float <var class="var">b--ar</var><span class="r">]</span>) 
r</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><var 
class="var">[</var>, float <var class="var">b--ar</var><var 
class="var">]</var>) var</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">(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-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">(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-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">(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-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">(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-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">(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-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">(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-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">(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-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">(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-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">(int <var class="var">f---oo</var><code 
class="code"><var class="var">[</var></code>, float <var 
class="var">b--ar</var><code class="code"><var class="var">]</var></code>) 
code:var</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">(int <var class="var">f---oo</var><code 
class="t"><var class="var">[</var></code>, float <var 
class="var">b--ar</var><code class="t"><var class="var">]</var></code>) 
t:var</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">(int <var class="var">f---oo</var><code 
class="code"><i class="slanted">[</i></code>, float <var 
class="var">b--ar</var><code class="code"><i class="slanted">]</i></code>) 
code:slanted</code><a class="copiable-link" href=\'#index-foobar-48\'> 
&para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-49"><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"><i 
class="slanted">[</i></code>, float <var class="var">b--ar</var><code 
class="t"><i class="slanted">]</i></code>) t:slanted</code><a 
class="copiable-link" href=\'#index-foobar-49\'> &para;</a></span></dt>
 <dd><p>separators
 </p></dd></dl>
 
 <dl class="first-deftypefn">
-<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>
+<dt class="deftypefn" id="index-foobar-50"><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-50\'> 
&para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-51"><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-51\'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-52"><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-52\'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-53"><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-53\'> 
&para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-54"><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-54\'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-55"><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-55\'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-56"><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-56\'> 
&para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-57"><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-57\'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-58"><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-58\'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-59"><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-59\'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-60"><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-60\'> 
&para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-61"><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"><var 
class="var">i--nt</var></code> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) code:var</code><a class="copiable-link" 
href=\'#index-foobar-61\'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-62"><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"><var class="var">i--nt</var></code> 
<var class="var">f---oo</var>[, float <var class="var">b--ar</var>]) 
t:var</code><a class="copiable-link" href=\'#index-foobar-62\'> 
&para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-63"><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 
class="slanted">i&ndash;nt</i></code> <var class="var">f---oo</var>[, float 
<var class="var">b--ar</var>]) code:slanted</code><a class="copiable-link" 
href=\'#index-foobar-63\'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-64"><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 
class="slanted">i&ndash;nt</i></code> <var class="var">f---oo</var>[, float 
<var class="var">b--ar</var>]) t:slanted</code><a class="copiable-link" 
href=\'#index-foobar-64\'> &para;</a></span></dt>
 <dd><p>name
 </p></dd></dl>
 
@@ -20505,43 +25383,51 @@ $result_converted{'xml'}->{'definition_commands'} = 
'<setfilename file="definiti
 <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 [...]
+<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="15">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defdelimiter>(</defdelimiter><defparam>var</defparam> 
<defparam><code><var>[</var></code></defparam><defparam>from</defparam> 
<defparam>to</defparam> 
<defparam><code><var>[</var></code></defparam><defparam>inc</defparam><defparam><code><var>]]</var></code></defparam><defdelimiter>)</defdelimiter>
  [...]
+<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="16">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defdelimiter>(</defdelimiter><defparam>var</defparam> 
<defparam><t><var>[</var></t></defparam><defparam>from</defparam> 
<defparam>to</defparam> 
<defparam><t><var>[</var></t></defparam><defparam>inc</defparam><defparam><t><var>]]</var></t></defparam><defdelimiter>)</defdelimiter>
 <defparam>t:var</d [...]
+<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="17">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defdelimiter>(</defdelimiter><defparam>var</defparam> 
<defparam><code><slanted>[</slanted></code></defparam><defparam>from</defparam> 
<defparam>to</defparam> 
<defparam><code><slanted>[</slanted></code></defparam><defparam>inc</defparam><defparam><code><slanted>]]</slanted></code></defparam><defdel
 [...]
+<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="18">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defdelimiter>(</defdelimiter><defparam>var</defparam> 
<defparam><t><slanted>[</slanted></t></defparam><defparam>from</defparam> 
<defparam>to</defparam> 
<defparam><t><slanted>[</slanted></t></defparam><defparam>inc</defparam><defparam><t><slanted>]]</slanted></t></defparam><defdelimiter>)</defdelim
 [...]
 <definitionitem><para>separators
 </para></definitionitem></defspec>
 
-<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>
+<defspec spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="19">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="20">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="21">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="22">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="23">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="24">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="25">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="26">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="27">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="28">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="29">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>
+<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="30">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><code><var>va---riable</var></code></defparam> 
<defparam>code:var</defparam></definitionterm></defspecx>
+<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="31">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><t><var>va---riable</var></t></defparam> 
<defparam>t:var</defparam></definitionterm></defspecx>
+<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="32">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><code><slanted>va&textmdash;riable</slanted></code></defparam> 
<defparam>code:slanted</defparam></definitionterm></defspecx>
+<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="33">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><t><slanted>va&textmdash;riable</slanted></t></defparam> 
<defparam>t:slanted</defparam></definitionterm></defspecx>
 <definitionitem><para>name
 </para></definitionitem></defspec>
 
-<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>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="34"><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="35"><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="36"><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="37"><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="38"><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="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 [...]
+<defspec spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="39">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="40">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="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>
+<deftypefn spaces=" " endspaces=" "><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><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="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
 [...]
+<deftypefn spaces=" " endspaces=" "><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><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>
 
@@ -20555,48 +25441,56 @@ 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="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>
+<deftypefn spaces=" " endspaces=" "><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>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="36">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="44">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="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>
+<defun spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="45">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="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 [...]
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="46">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="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
 [...]
+<deftypefn spaces=" " endspaces=" "><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><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimiter><defdel [...]
+<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>[</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="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><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="50">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="51">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="52">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="53">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="54">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="55">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="56">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="57">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
 [...]
+<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="58">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><var>[</var></code></defparamtype><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defparamtype><code><var>] [...]
+<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="59">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><var>[</var></t></defparam><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defparam><t><var>]</var></t></defparam> 
[...]
+<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="60">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><slanted>[</slanted></code></defparamtype><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defparamtype><cod [...]
+<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="61">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><slanted>[</slanted></t></defparam><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defparam><t><slanted>]</slanted [...]
 <definitionitem><para>separators
 </para></definitionitem></deftypefn>
 
-<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 
[...]
+<deftypefn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="62">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="63">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="64">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="65">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="66">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="67">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="68">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="69">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="70">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="71">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="72">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 
[...]
+<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="73">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 
<defdelimiter>(</defdelimiter><defparamtype><code><var>i--nt</var></code></defparamtype>
 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdeli [...]
+<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="74">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparam><t><var>i--nt</var></t></defparam> 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimiter><defdeli 
[...]
+<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="75">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 
<defdelimiter>(</defdelimiter><defparamtype><code><slanted>i&textndash;nt</slanted></code></defparamtype>
 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdel [...]
+<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="76">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 
<defdelimiter>(</defdelimiter><defparam><t><slanted>i&textndash;nt</slanted></t></defparam>
 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defd [...]
 <definitionitem><para>name
 </para></definitionitem></deftypefn>
 
@@ -20627,6 +25521,10 @@ $result_converted{'docbook'}->{'definition_commands'} 
= '<chapter label="1" id="
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> (<emphasis role="arg">var</emphasis> <emphasis 
role="arg">[</emphasis><emphasis role="arg">from</emphasis> <emphasis 
role="arg">to</emphasis> <emphasis role="arg">[</emphasis><emphasis 
role="arg">inc</emphasis><emphasis role="arg">]]</emphasis>) <emphasis 
role="arg">r: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>
+<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"><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">code: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">t:slanted</emphasis></synopsis>
 <blockquote><para>separators
 </para></blockquote>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis role="arg">va---riable</emphasis> 
<emphasis role="arg">default</emphasis></synopsis>
@@ -20640,6 +25538,10 @@ $result_converted{'docbook'}->{'definition_commands'} 
= '<chapter label="1" id="
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis role="arg">va&#8212;riable</emphasis> 
<emphasis role="arg">r:slanted</emphasis></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis role="arg">va---riable</emphasis> 
<emphasis role="arg">r:code</emphasis></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis role="arg">va---riable</emphasis> 
<emphasis role="arg">r:t</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis 
role="arg"><replaceable>va---riable</replaceable></emphasis> <emphasis 
role="arg">code:var</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis 
role="arg"><replaceable>va---riable</replaceable></emphasis> <emphasis 
role="arg">t:var</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis role="arg">va&#8212;riable</emphasis> 
<emphasis role="arg">code:slanted</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis role="arg">va&#8212;riable</emphasis> 
<emphasis role="arg">t:slanted</emphasis></synopsis>
 <blockquote><para>name
 </para></blockquote>
 <synopsis><indexterm 
role="fn"><primary><literal>.ft</literal></primary></indexterm><phrase 
role="category"><emphasis role="bold">Request</emphasis>:</phrase> 
<function>.ft</function> [<emphasis role="arg">font</emphasis>]</synopsis>
@@ -20691,6 +25593,10 @@ to <replaceable>font</replaceable> (one-character 
name&#160;<replaceable>f</repl
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<type>int</type> 
<emphasis role="arg"><replaceable>f---oo</replaceable></emphasis><emphasis 
role="arg">[</emphasis>, <type>float</type> <emphasis 
role="arg"><replaceable>b--ar</replaceable></emphasis><emphasis 
role="arg">]</emphasis>) <type>r: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>
+<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><replaceable>[</replaceable></type>,
 <type>float</type> <emphasis 
role="arg"><replaceable>b--ar</replaceable></emphasis><type><replaceable>]</replaceable></type>)
 <type>code: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>  (<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><type>[</type>, 
<type>float</type> <emphasis 
role="arg"><replaceable>b--ar</replaceable></emphasis><type>]</type>) 
<type>code: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>t:slanted</type></synopsis>
 <blockquote><para>separators
 </para></blockquote>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<type>i--nt</type> 
<emphasis role="arg"><replaceable>f---oo</replaceable></emphasis>[, 
<type>float</type> <emphasis 
role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>default</type></synopsis>
@@ -20704,6 +25610,10 @@ to <replaceable>font</replaceable> (one-character 
name&#160;<replaceable>f</repl
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<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>
+<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><replaceable>i--nt</replaceable></type> <emphasis 
role="arg"><replaceable>f---oo</replaceable></emphasis>[, <type>float</type> 
<emphasis role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>code: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"><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>t: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>  
(<type>i&#8211;nt</type> <emphasis 
role="arg"><replaceable>f---oo</replaceable></emphasis>[, <type>float</type> 
<emphasis role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>code: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&#8211;nt</emphasis> <emphasis 
role="arg"><replaceable>f---oo</replaceable></emphasis>[, <type>float</type> 
<emphasis role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>t:slanted</type></synopsis>
 <blockquote><para>name
 </para></blockquote>
 </chapter>
diff --git 
a/tp/t/results/converters_tests/definition_commands/res_html/chapter.html 
b/tp/t/results/converters_tests/definition_commands/res_html/chapter.html
index c91501dbef..36caef546b 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
@@ -62,21 +62,29 @@ Previous: <a href="index.html" accesskey="p" rel="prev">top 
section</a>, Up: <a
 <dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-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>
+<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">(var <code class="code"><var 
class="var">[</var></code>from to <code class="code"><var 
class="var">[</var></code>inc<code class="code"><var 
class="var">]]</var></code>) code:var</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 <code class="t"><var 
class="var">[</var></code>from to <code class="t"><var 
class="var">[</var></code>inc<code class="t"><var class="var">]]</var></code>) 
t: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">(var <code class="code"><i 
class="slanted">[</i></code>from to <code class="code"><i 
class="slanted">[</i></code>inc<code class="code"><i 
class="slanted">]]</i></code>) code:slanted</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">(var <code class="t"><i 
class="slanted">[</i></code>from to <code class="t"><i 
class="slanted">[</i></code>inc<code class="t"><i 
class="slanted">]]</i></code>) t:slanted</var><a class="copiable-link" 
href='#index-foobar-14'> &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-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>
+<dt class="deffn defspec-alias-deffn" id="index-foobar-15"><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-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"><var class="var">va&mdash;riable</var> 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">va&mdash;riable</span> r</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"><i class="slanted">va&mdash;riable</i> 
slanted</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"><code class="code">va---riable</code> code</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"><code class="t">va---riable</code> t</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"><code class="t"><b 
class="b">va&mdash;riable</b></code> t:b</var><a class="copiable-link" 
href='#index-foobar-21'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-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"><var 
class="var">va&mdash;riable</var></span> r:var</var><a class="copiable-link" 
href='#index-foobar-22'> &para;</a></span></dt>
+<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"><i 
class="slanted">va&mdash;riable</i></span> r:slanted</var><a 
class="copiable-link" href='#index-foobar-23'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-24"><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-24'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-25"><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-25'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-26"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="code"><var 
class="var">va---riable</var></code> code:var</var><a class="copiable-link" 
href='#index-foobar-26'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-27"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="t"><var 
class="var">va---riable</var></code> t:var</var><a class="copiable-link" 
href='#index-foobar-27'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-28"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="code"><i 
class="slanted">va&mdash;riable</i></code> code:slanted</var><a 
class="copiable-link" href='#index-foobar-28'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-29"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="t"><i 
class="slanted">va&mdash;riable</i></code> t:slanted</var><a 
class="copiable-link" href='#index-foobar-29'> &para;</a></span></dt>
 <dd><p>name
 </p></dd></dl>
 
@@ -92,18 +100,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-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 [...]
+<dt class="deffn defspec-alias-deffn" id="index-foobar-30"><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-31"><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-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>
+<dt class="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>, float <var class="var">b--ar</var>)</code><a 
class="copiable-link" href='#index-foobar-32'> &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-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>
+<dt class="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 <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-33'> &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>
 
@@ -120,7 +128,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-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>
+<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">(int <var 
class="var">foo</var>, float <var class="var">bar</var>)</code><a 
class="copiable-link" href='#index-foobar-34'> &para;</a></span></dt>
 <dd><p>&hellip; for <var class="var">foo</var> and <var class="var">bar</var>
 </p></dd></dl>
 </blockquote>
@@ -141,32 +149,40 @@ 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-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>
+<dt class="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>[, float <var class="var">b--ar</var>]) 
default</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">[</span>, float <var class="var">b--ar</var><span class="r">]</span>) 
r</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><var 
class="var">[</var>, float <var class="var">b--ar</var><var 
class="var">]</var>) var</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">(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-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">(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-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">(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-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">(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-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">(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-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">(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-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">(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-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">(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-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">(int <var class="var">f---oo</var><code 
class="code"><var class="var">[</var></code>, float <var 
class="var">b--ar</var><code class="code"><var class="var">]</var></code>) 
code:var</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">(int <var class="var">f---oo</var><code 
class="t"><var class="var">[</var></code>, float <var 
class="var">b--ar</var><code class="t"><var class="var">]</var></code>) 
t:var</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">(int <var class="var">f---oo</var><code 
class="code"><i class="slanted">[</i></code>, float <var 
class="var">b--ar</var><code class="code"><i class="slanted">]</i></code>) 
code:slanted</code><a class="copiable-link" href='#index-foobar-48'> 
&para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-49"><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"><i 
class="slanted">[</i></code>, float <var class="var">b--ar</var><code 
class="t"><i class="slanted">]</i></code>) t:slanted</code><a 
class="copiable-link" href='#index-foobar-49'> &para;</a></span></dt>
 <dd><p>separators
 </p></dd></dl>
 
 <dl class="first-deftypefn">
-<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>
+<dt class="deftypefn" id="index-foobar-50"><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-50'> 
&para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-51"><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-51'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-52"><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-52'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-53"><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-53'> 
&para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-54"><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-54'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-55"><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-55'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-56"><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-56'> 
&para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-57"><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-57'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-58"><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-58'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-59"><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-59'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-60"><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-60'> 
&para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-61"><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"><var 
class="var">i--nt</var></code> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) code:var</code><a class="copiable-link" 
href='#index-foobar-61'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-62"><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"><var class="var">i--nt</var></code> 
<var class="var">f---oo</var>[, float <var class="var">b--ar</var>]) 
t:var</code><a class="copiable-link" href='#index-foobar-62'> 
&para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-63"><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 
class="slanted">i&ndash;nt</i></code> <var class="var">f---oo</var>[, float 
<var class="var">b--ar</var>]) code:slanted</code><a class="copiable-link" 
href='#index-foobar-63'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-64"><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 
class="slanted">i&ndash;nt</i></code> <var class="var">f---oo</var>[, float 
<var class="var">b--ar</var>]) t:slanted</code><a class="copiable-link" 
href='#index-foobar-64'> &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 b01026cab1..4fdf6767c9 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
@@ -204,6 +204,38 @@ deffn r slanted for 
\GNUTexinfocommandstyletextvar{a---rg1} and \GNUTexinfocomma
 \noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{}from to 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{}inc\EmbracOff{}\textnormal{\texttt{]]}}\EmbracOn{})
 r:t}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
+\index[fn]{foobar@\texttt{foobar}}%
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\texttt{\GNUTexinfocommandstyletextvar{[}}from to 
\texttt{\GNUTexinfocommandstyletextvar{[}}inc\texttt{\GNUTexinfocommandstyletextvar{]]}})
 code:var}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
+
+\index[fn]{foobar@\texttt{foobar}}%
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\texttt{\GNUTexinfocommandstyletextvar{[}}from to 
\texttt{\GNUTexinfocommandstyletextvar{[}}inc\texttt{\GNUTexinfocommandstyletextvar{]]}})
 t:var}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
+
+\index[fn]{foobar@\texttt{foobar}}%
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\texttt{\textsl{[}}from to \texttt{\textsl{[}}inc\texttt{\textsl{]]}}) 
code:slanted}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
+
+\index[fn]{foobar@\texttt{foobar}}%
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\texttt{\textsl{[}}from to \texttt{\textsl{[}}inc\texttt{\textsl{]]}}) 
t:slanted}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
+
 \index[fn]{foobar@\texttt{foobar}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
@@ -297,6 +329,38 @@ separators
 \noindent\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\EmbracOff{}\textnormal{\texttt{va{-}{-}{-}riable}}\EmbracOn{}
 r:t}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
+\index[fn]{foobar@\texttt{foobar}}%
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\texttt{\GNUTexinfocommandstyletextvar{va---riable}}
 code:var}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
+
+\index[fn]{foobar@\texttt{foobar}}%
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\texttt{\GNUTexinfocommandstyletextvar{va---riable}}
 t:var}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
+
+\index[fn]{foobar@\texttt{foobar}}%
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\texttt{\textsl{va{-}{-}{-}riable}} 
code:slanted}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
+
+\index[fn]{foobar@\texttt{foobar}}%
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\texttt{\textsl{va{-}{-}{-}riable}} 
t:slanted}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
+
 \index[fn]{foobar@\texttt{foobar}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
@@ -565,6 +629,38 @@ In deffn with code and var used
 \noindent\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\textnormal{\texttt{[}},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}\textnormal{\texttt{]}})\ r:t}& [Library 
Function]
 \end{tabularx}
 
+\index[fn]{foobar@\texttt{foobar}}%
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\texttt{\GNUTexinfocommandstyletextvar{[}},\
 float\ 
\GNUTexinfocommandstyletextvar{b--ar}\texttt{\GNUTexinfocommandstyletextvar{]}})\
 code:var}& [Library Function]
+\end{tabularx}
+
+\index[fn]{foobar@\texttt{foobar}}%
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\texttt{\GNUTexinfocommandstyletextvar{[}},\
 float\ 
\GNUTexinfocommandstyletextvar{b--ar}\texttt{\GNUTexinfocommandstyletextvar{]}})\
 t:var}& [Library Function]
+\end{tabularx}
+
+\index[fn]{foobar@\texttt{foobar}}%
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\texttt{\textsl{[}},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}\texttt{\textsl{]}})\ code:slanted}& 
[Library Function]
+\end{tabularx}
+
+\index[fn]{foobar@\texttt{foobar}}%
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\texttt{\textsl{[}},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}\texttt{\textsl{]}})\ t:slanted}& [Library 
Function]
+\end{tabularx}
+
 \index[fn]{foobar@\texttt{foobar}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
@@ -658,6 +754,38 @@ separators
 \noindent\texttt{int foobar (\textnormal{\texttt{i{-}{-}nt}}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ r:t}& [Library Function]
 \end{tabularx}
 
+\index[fn]{foobar@\texttt{foobar}}%
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar (\texttt{\GNUTexinfocommandstyletextvar{i--nt}}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ code:var}& [Library Function]
+\end{tabularx}
+
+\index[fn]{foobar@\texttt{foobar}}%
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar (\texttt{\GNUTexinfocommandstyletextvar{i--nt}}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ t:var}& [Library Function]
+\end{tabularx}
+
+\index[fn]{foobar@\texttt{foobar}}%
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar (\texttt{\textsl{i{-}{-}nt}}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ code:slanted}& [Library Function]
+\end{tabularx}
+
+\index[fn]{foobar@\texttt{foobar}}%
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar (\texttt{\textsl{i{-}{-}nt}}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ t:slanted}& [Library Function]
+\end{tabularx}
+
 \index[fn]{foobar@\texttt{foobar}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%



reply via email to

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