texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: * tp/Texinfo/Convert/LaTeX.pm (_convert) <deftype


From: Gavin D. Smith
Subject: branch master updated: * tp/Texinfo/Convert/LaTeX.pm (_convert) <deftypefnnewline>: Remove extra @* command at beginning of line. <@def*>: Use { and } for font change instead of \bgroup and \egroup. Reformat some code.
Date: Wed, 27 Jul 2022 09:41:10 -0400

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

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 522ad11567 * tp/Texinfo/Convert/LaTeX.pm (_convert) 
<deftypefnnewline>: Remove extra @* command at beginning of line. <@def*>: Use 
{ and } for font change instead of \bgroup and \egroup. Reformat some code.
522ad11567 is described below

commit 522ad115673d520064d0864f2435183e48bc5a85
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Wed Jul 27 14:40:59 2022 +0100

    * tp/Texinfo/Convert/LaTeX.pm (_convert) <deftypefnnewline>:
    Remove extra @* command at beginning of line.
    <@def*>: Use { and } for font change instead of \bgroup and \egroup.
    Reformat some code.
---
 ChangeLog                                          |   7 +
 tp/Texinfo/Convert/LaTeX.pm                        |  57 +-
 .../res_latex/multiple_lang_chapters.tex           |   6 +-
 tp/t/results/latex_tests/definition_commands.pl    |  10 +-
 .../res_latex/combined_fonts.tex                   |  10 +-
 .../res_parser/formatting_latex/formatting.tex     | 690 ++++++++++-----------
 6 files changed, 382 insertions(+), 398 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ae1c1f0fc7..6db9e060ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2022-07-27  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       * tp/Texinfo/Convert/LaTeX.pm (_convert) <deftypefnnewline>:
+       Remove extra @* command at beginning of line.
+       <@def*>: Use { and } for font change instead of \bgroup and \egroup.
+       Reformat some code.
+
 2022-07-26  Gavin Smith  <gavinsmith0123@gmail.com>
 
        @clear txidefnamespace
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index fb1289bd63..76b20ff5b4 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -3426,7 +3426,7 @@ sub _convert($$)
         } else {
           $name = '';
         }
-        $result .= '\noindent\texttt\bgroup{}';
+        $result .= '\noindent\texttt{';
 
         my $category = $element->{'extra'}->{'def_parsed_hash'}->{'category'};
         
@@ -3441,8 +3441,7 @@ sub _convert($$)
                 'name' => $name,
                 'arguments' => _only_slanted_no_code_contents($arguments)});
           } else {
-            $tree = $self->gdt("{name}", {
-                    'name' => $name});
+            $tree = $self->gdt("{name}", { 'name' => $name});
           }
         } elsif ($command eq 'deftypefn'
                  or $command eq 'deftypevr') {
@@ -3452,22 +3451,18 @@ sub _convert($$)
                   'type' => $element->{'extra'}->{'def_parsed_hash'}->{'type'},
                   'arguments' => _only_slanted_no_code_contents($arguments)};
             if ($self->get_conf('deftypefnnewline') eq 'on') {
-              $tree = $self->gdt("\@*{type}\@*{name} {arguments}",
-                                 $strings);
+              $tree = $self->gdt("{type}\@*{name} {arguments}", $strings);
             } else {
-              $tree = $self->gdt('{type} {name} {arguments}',
-                                 $strings);
+              $tree = $self->gdt('{type} {name} {arguments}', $strings);
             }
           } else {
             my $strings = {
                     'type' => 
$element->{'extra'}->{'def_parsed_hash'}->{'type'},
                     'name' => $name};
             if ($self->get_conf('deftypefnnewline') eq 'on') {
-              $tree = $self->gdt('@*{type}@*{name}',
-                                 $strings);
+              $tree = $self->gdt('{type}@*{name}', $strings);
             } else {
-              $tree = $self->gdt('{type} {name}',
-                                 $strings);
+              $tree = $self->gdt('{type} {name}', $strings);
             }
           }
         } elsif ($command eq 'defcv'
@@ -3482,8 +3477,7 @@ sub _convert($$)
                     'name' => $name,
                     'arguments' => 
_only_slanted_no_code_contents($arguments)});
           } else {
-            $tree = $self->gdt("{name}", {
-                    'name' => $name});
+            $tree = $self->gdt("{name}", { 'name' => $name});
           }
         } elsif ($command eq 'defop'
                  or ($command eq 'deftypeop'
@@ -3496,8 +3490,7 @@ sub _convert($$)
                     'name' => $name,
                     'arguments' => 
_only_slanted_no_code_contents($arguments)});
           } else {
-            $tree = $self->gdt('{name}', {
-                    'name' => $name});
+            $tree = $self->gdt('{name}', { 'name' => $name});
           }
         } elsif ($command eq 'deftypeop') {
           $category =  $self->gdt('{category} on @code{{class}}',
@@ -3510,26 +3503,18 @@ sub _convert($$)
                     'arguments' => _only_slanted_no_code_contents($arguments)};
 
             if ($self->get_conf('deftypefnnewline') eq 'on') {
-              $tree
-                = $self->gdt('{type}@*{name} {arguments}',
-                             $strings);
+              $tree = $self->gdt('{type}@*{name} {arguments}', $strings);
             } else {
-              $tree
-                = $self->gdt('{type} {name} {arguments}',
-                             $strings);
+              $tree = $self->gdt('{type} {name} {arguments}', $strings);
             }
           } else {
             my $strings = {
                     'type' => 
$element->{'extra'}->{'def_parsed_hash'}->{'type'},
                     'name' => $name};
             if ($self->get_conf('deftypefnnewline') eq 'on') {
-              $tree
-                = $self->gdt('{type}@*{name}',
-                             $strings);
+              $tree = $self->gdt('{type}@*{name}', $strings);
             } else {
-              $tree
-                = $self->gdt('{type} {name}',
-                             $strings);
+              $tree = $self->gdt('{type} {name}', $strings);
             }
           }
         } elsif ($command eq 'deftypecv') {
@@ -3542,26 +3527,18 @@ sub _convert($$)
                     'type' => 
$element->{'extra'}->{'def_parsed_hash'}->{'type'},
                     'arguments' => _only_slanted_no_code_contents($arguments)};
             if ($self->get_conf('deftypefnnewline') eq 'on') {
-              $tree
-                = $self->gdt('{type}@*{name} {arguments}',
-                             $strings);
+              $tree = $self->gdt('{type}@*{name} {arguments}', $strings);
             } else {
-              $tree
-                = $self->gdt('{type} {name} {arguments}',
-                             $strings);
+              $tree = $self->gdt('{type} {name} {arguments}', $strings);
             }
           } else {
             my $strings = {
                     'type' => 
$element->{'extra'}->{'def_parsed_hash'}->{'type'},
                     'name' => $name};
             if ($self->get_conf('deftypefnnewline') eq 'on') {
-              $tree
-                = $self->gdt('{type}@*{name}',
-                             $strings);
+              $tree = $self->gdt('{type}@*{name}', $strings);
             } else {
-              $tree
-                = $self->gdt('{type} {name}',
-                             $strings);
+              $tree = $self->gdt('{type} {name}', $strings);
             }
           }
         }
@@ -3569,7 +3546,7 @@ sub _convert($$)
         $self->{'formatting_context'}->[-1]->{'code'} += 1;
         $result .= _convert($self, {'contents' => [$tree]});
         $self->{'formatting_context'}->[-1]->{'code'} -= 1;
-        $result .= '\egroup{}'; # \texttt
+        $result .= '}'; # \texttt
         if (defined($category)) {
           # category is converted in normal text context
           my $converted = _convert($self, $category);
diff --git 
a/tp/t/results/languages/multiple_lang_chapters_latex/res_latex/multiple_lang_chapters.tex
 
b/tp/t/results/languages/multiple_lang_chapters_latex/res_latex/multiple_lang_chapters.tex
index aed081737d..d9e1a6ab80 100644
--- 
a/tp/t/results/languages/multiple_lang_chapters_latex/res_latex/multiple_lang_chapters.tex
+++ 
b/tp/t/results/languages/multiple_lang_chapters_latex/res_latex/multiple_lang_chapters.tex
@@ -75,7 +75,7 @@
 \label{anchor:chapter-ja}%
 
 In japanese. See 
\hyperref[anchor:chapter-ja]{\chaptername~\ref*{anchor:chapter-ja} [chapter 
ja], page~\pageref*{anchor:chapter-ja}}.
-\noindent\texttt\bgroup{}BBB 
\bgroup{}\normalfont{}\textsl{CCC}\egroup{}\egroup{}\hfill[Instance Variable of 
\texttt{AAA}]
+\noindent\texttt{BBB 
\bgroup{}\normalfont{}\textsl{CCC}\egroup{}}\hfill[Instance Variable of 
\texttt{AAA}]
 
 
 
@@ -86,7 +86,7 @@ In japanese. See 
\hyperref[anchor:chapter-ja]{\chaptername~\ref*{anchor:chapter-
 \label{anchor:chapter-en}%
 
 In english. See 
\hyperref[anchor:chapter-ja]{\chaptername~\ref*{anchor:chapter-ja} [chapter 
ja], page~\pageref*{anchor:chapter-ja}}.
-\noindent\texttt\bgroup{}BBB 
\bgroup{}\normalfont{}\textsl{CCC}\egroup{}\egroup{}\hfill[Instance Variable of 
\texttt{AAA}]
+\noindent\texttt{BBB 
\bgroup{}\normalfont{}\textsl{CCC}\egroup{}}\hfill[Instance Variable of 
\texttt{AAA}]
 
 
 
@@ -96,7 +96,7 @@ In english. See 
\hyperref[anchor:chapter-ja]{\chaptername~\ref*{anchor:chapter-j
 \chapter{fr\_FR}
 \label{anchor:chapter-fr_005fFR}%
 
-\noindent\texttt\bgroup{}BBB 
\bgroup{}\normalfont{}\textsl{CCC}\egroup{}\egroup{}\hfill[Variable d'instance 
of \texttt{AAA}]
+\noindent\texttt{BBB 
\bgroup{}\normalfont{}\textsl{CCC}\egroup{}}\hfill[Variable d'instance of 
\texttt{AAA}]
 
 
 
diff --git a/tp/t/results/latex_tests/definition_commands.pl 
b/tp/t/results/latex_tests/definition_commands.pl
index 233d0658f0..c1ff73458b 100644
--- a/tp/t/results/latex_tests/definition_commands.pl
+++ b/tp/t/results/latex_tests/definition_commands.pl
@@ -2258,7 +2258,7 @@ $result_converted{'latex'}->{'definition_commands'} = '
 \\chapter{chapter}
 \\label{anchor:chapter}%
 
-\\noindent\\texttt\\bgroup{}int foobar \\bgroup{}\\normalfont{}\\textsl{(int 
\\textsl{foo}, float \\textsl{bar})}\\egroup{}\\egroup{}\\hfill[Library 
Function]
+\\noindent\\texttt{int foobar \\bgroup{}\\normalfont{}\\textsl{(int 
\\textsl{foo}, float \\textsl{bar})}\\egroup{}}\\hfill[Library Function]
 
 
 
@@ -2266,7 +2266,7 @@ $result_converted{'latex'}->{'definition_commands'} = '
 \\dots{}\\@
 
 \\noindent{}produces:
-\\noindent\\texttt\\bgroup{}border-pattern\\egroup{}\\hfill[Class Option of 
\\texttt{Window}]
+\\noindent\\texttt{border-pattern}\\hfill[Class Option of \\texttt{Window}]
 
 
 
@@ -2274,7 +2274,7 @@ $result_converted{'latex'}->{'definition_commands'} = '
 \\dots{}\\@
 
 \\begin{quote}
-\\noindent\\texttt\\bgroup{}int foobar \\bgroup{}\\normalfont{}\\textsl{(int 
\\textsl{foo}, float \\textsl{bar})}\\egroup{}\\egroup{}\\hfill[Library 
Function]
+\\noindent\\texttt{int foobar \\bgroup{}\\normalfont{}\\textsl{(int 
\\textsl{foo}, float \\textsl{bar})}\\egroup{}}\\hfill[Library Function]
 
 
 
@@ -2282,14 +2282,14 @@ $result_converted{'latex'}->{'definition_commands'} = '
 \\dots{}\\@
 \\end{quote}
 
-\\noindent\\texttt\\bgroup{}apply \\bgroup{}\\normalfont{}\\textsl{function 
\\&rest arguments}\\egroup{}\\egroup{}\\hfill[Function]
+\\noindent\\texttt{apply \\bgroup{}\\normalfont{}\\textsl{function \\&rest 
arguments}\\egroup{}}\\hfill[Function]
 
 
 
 \\index[fn]{apply@\\texttt{apply}}%
 \\texttt{apply} calls \\textsl{function} with \\textsl{arguments}
 
-\\noindent\\texttt\\bgroup{}name \\bgroup{}\\normalfont{}\\textsl{argument 
\\texttt{int} \\texttt{a{-}{-}b} \\textsl{var1}, word \\texttt{{-}{-}} 
(\\texttt{type other}, \\textsl{var2}  {[}\\texttt{float} 
{[}\\textsl{var4})}\\egroup{}\\egroup{}\\hfill[Category]
+\\noindent\\texttt{name \\bgroup{}\\normalfont{}\\textsl{argument 
\\texttt{int} \\texttt{a{-}{-}b} \\textsl{var1}, word \\texttt{{-}{-}} 
(\\texttt{type other}, \\textsl{var2}  {[}\\texttt{float} 
{[}\\textsl{var4})}\\egroup{}}\\hfill[Category]
 
 
 
diff --git 
a/tp/t/results/latex_tests/definition_commands/res_latex/combined_fonts.tex 
b/tp/t/results/latex_tests/definition_commands/res_latex/combined_fonts.tex
index 656563cdb9..426e257ba3 100644
--- a/tp/t/results/latex_tests/definition_commands/res_latex/combined_fonts.tex
+++ b/tp/t/results/latex_tests/definition_commands/res_latex/combined_fonts.tex
@@ -64,7 +64,7 @@
 \chapter{chapter}
 \label{anchor:chapter}%
 
-\noindent\texttt\bgroup{}int foobar \bgroup{}\normalfont{}\textsl{(int 
\textsl{foo}, float \textsl{bar})}\egroup{}\egroup{}\hfill[Library Function]
+\noindent\texttt{int foobar \bgroup{}\normalfont{}\textsl{(int \textsl{foo}, 
float \textsl{bar})}\egroup{}}\hfill[Library Function]
 
 
 
@@ -72,7 +72,7 @@
 \dots{}\@
 
 \noindent{}produces:
-\noindent\texttt\bgroup{}border-pattern\egroup{}\hfill[Class Option of 
\texttt{Window}]
+\noindent\texttt{border-pattern}\hfill[Class Option of \texttt{Window}]
 
 
 
@@ -80,7 +80,7 @@
 \dots{}\@
 
 \begin{quote}
-\noindent\texttt\bgroup{}int foobar \bgroup{}\normalfont{}\textsl{(int 
\textsl{foo}, float \textsl{bar})}\egroup{}\egroup{}\hfill[Library Function]
+\noindent\texttt{int foobar \bgroup{}\normalfont{}\textsl{(int \textsl{foo}, 
float \textsl{bar})}\egroup{}}\hfill[Library Function]
 
 
 
@@ -88,14 +88,14 @@
 \dots{}\@
 \end{quote}
 
-\noindent\texttt\bgroup{}apply \bgroup{}\normalfont{}\textsl{function \&rest 
arguments}\egroup{}\egroup{}\hfill[Function]
+\noindent\texttt{apply \bgroup{}\normalfont{}\textsl{function \&rest 
arguments}\egroup{}}\hfill[Function]
 
 
 
 \index[fn]{apply@\texttt{apply}}%
 \texttt{apply} calls \textsl{function} with \textsl{arguments}
 
-\noindent\texttt\bgroup{}name \bgroup{}\normalfont{}\textsl{argument 
\texttt{int} \texttt{a{-}{-}b} \textsl{var1}, word \texttt{{-}{-}} 
(\texttt{type other}, \textsl{var2}  {[}\texttt{float} 
{[}\textsl{var4})}\egroup{}\egroup{}\hfill[Category]
+\noindent\texttt{name \bgroup{}\normalfont{}\textsl{argument \texttt{int} 
\texttt{a{-}{-}b} \textsl{var1}, word \texttt{{-}{-}} (\texttt{type other}, 
\textsl{var2}  {[}\texttt{float} {[}\textsl{var4})}\egroup{}}\hfill[Category]
 
 
 
diff --git a/tp/tests/layout/res_parser/formatting_latex/formatting.tex 
b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
index a0607a5113..9f448a739a 100644
--- a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
+++ b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
@@ -700,123 +700,123 @@ f--ormat
 s--mallformat
 \endgroup{}%
 
-\noindent\texttt\bgroup{}d{-}{-}effn\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory]
+\noindent\texttt{d{-}{-}effn\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory]
 
 
 
 \index[fn]{d--effn\_name@\texttt{d{-}{-}effn\_name}}%
 d--effn
 
-\noindent\texttt\bgroup{}de{-}{-}ffn\_name 
\bgroup{}\normalfont{}\textsl{ar--guments    more args \leavevmode{}\\ even 
more so}\egroup{}\egroup{}\hfill[cate--gory]
+\noindent\texttt{de{-}{-}ffn\_name \bgroup{}\normalfont{}\textsl{ar--guments   
 more args \leavevmode{}\\ even more so}\egroup{}}\hfill[cate--gory]
 
 
 
 \index[fn]{de--ffn\_name@\texttt{de{-}{-}ffn\_name}}%
 def--fn
 
-\noindent\texttt\bgroup{}\textsl{i} \bgroup{}\normalfont{}\textsl{a 
g}\egroup{}\egroup{}\hfill[fset]
+\noindent\texttt{\textsl{i} \bgroup{}\normalfont{}\textsl{a 
g}\egroup{}}\hfill[fset]
 
 
 
 \index[fn]{i@\texttt{\textsl{i}}}%
 \index[cp]{index entry within deffn}%
-\noindent\texttt\bgroup{}truc 
\bgroup{}\normalfont{}\textsl{}\egroup{}\egroup{}\hfill[cmde]
+\noindent\texttt{truc \bgroup{}\normalfont{}\textsl{}\egroup{}}\hfill[cmde]
 
 
 
 \index[fn]{truc@\texttt{truc}}%
-\noindent\texttt\bgroup{}log trap 
\bgroup{}\normalfont{}\textsl{}\egroup{}\egroup{}\hfill[Command]
+\noindent\texttt{log trap 
\bgroup{}\normalfont{}\textsl{}\egroup{}}\hfill[Command]
 
 
 
 \index[fn]{log trap@\texttt{log trap}}%
-\noindent\texttt\bgroup{}log trap1 
\bgroup{}\normalfont{}\textsl{}\egroup{}\egroup{}\hfill[Command]
+\noindent\texttt{log trap1 
\bgroup{}\normalfont{}\textsl{}\egroup{}}\hfill[Command]
 
 
 
 \index[fn]{log trap1@\texttt{log trap1}}%
-\noindent\texttt\bgroup{}log trap2 
\bgroup{}\normalfont{}\textsl{}\egroup{}\egroup{}\hfill[Command]
+\noindent\texttt{log trap2 
\bgroup{}\normalfont{}\textsl{}\egroup{}}\hfill[Command]
 
 
 
 \index[fn]{log trap2@\texttt{log trap2}}%
-\noindent\texttt\bgroup{}\textbf{id ule} 
\bgroup{}\normalfont{}\textsl{truc}\egroup{}\egroup{}\hfill[cmde]
+\noindent\texttt{\textbf{id ule} 
\bgroup{}\normalfont{}\textsl{truc}\egroup{}}\hfill[cmde]
 
 
 
 \index[fn]{id ule@\texttt{\textbf{id ule}}}%
-\noindent\texttt\bgroup{}\textbf{id `\texttt{i}' ule} 
\bgroup{}\normalfont{}\textsl{truc}\egroup{}\egroup{}\hfill[cmde2]
+\noindent\texttt{\textbf{id `\texttt{i}' ule} 
\bgroup{}\normalfont{}\textsl{truc}\egroup{}}\hfill[cmde2]
 
 
 
 \index[fn]{id i ule@\texttt{\textbf{id `\texttt{i}' ule}}}%
-\noindent\texttt\bgroup{}\egroup{}\hfill[]
+\noindent\texttt{}\hfill[]
 
 
 
-\noindent\texttt\bgroup{}machin\egroup{}\hfill[]
+\noindent\texttt{machin}\hfill[]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt\bgroup{}bidule machin\egroup{}\hfill[]
+\noindent\texttt{bidule machin}\hfill[]
 
 
 
 \index[fn]{bidule machin@\texttt{bidule machin}}%
-\noindent\texttt\bgroup{}machin\egroup{}\hfill[truc]
+\noindent\texttt{machin}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt\bgroup{}\egroup{}\hfill[truc]
+\noindent\texttt{}\hfill[truc]
 
 
 
-\noindent\texttt\bgroup{}followed \bgroup{}\normalfont{}\textsl{by a 
comment}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{followed \bgroup{}\normalfont{}\textsl{by a 
comment}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{followed@\texttt{followed}}%
-\noindent\texttt\bgroup{}\egroup{}\hfill[]
+\noindent\texttt{}\hfill[]
 
 
 
-\noindent\texttt\bgroup{}a \bgroup{}\normalfont{}\textsl{b c d e \textbf{f g} 
h i}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{a \bgroup{}\normalfont{}\textsl{b c d e \textbf{f g} h 
i}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{a@\texttt{a}}%
-\noindent\texttt\bgroup{}deffnx \bgroup{}\normalfont{}\textsl{before end 
deffn}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{deffnx \bgroup{}\normalfont{}\textsl{before end 
deffn}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{deffnx@\texttt{deffnx}}%
 
 
-\noindent\texttt\bgroup{}deffn\egroup{}\hfill[empty]
+\noindent\texttt{deffn}\hfill[empty]
 
 
 
 \index[fn]{deffn@\texttt{deffn}}%
 
-\noindent\texttt\bgroup{}deffn \bgroup{}\normalfont{}\textsl{with 
deffnx}\egroup{}\egroup{}\hfill[empty]
+\noindent\texttt{deffn \bgroup{}\normalfont{}\textsl{with 
deffnx}\egroup{}}\hfill[empty]
 
 
 
 \index[fn]{deffn@\texttt{deffn}}%
-\noindent\texttt\bgroup{}deffnx\egroup{}\hfill[empty]
+\noindent\texttt{deffnx}\hfill[empty]
 
 
 
 \index[fn]{deffnx@\texttt{deffnx}}%
 
-\noindent\texttt\bgroup{}\textsl{i} \bgroup{}\normalfont{}\textsl{a 
g}\egroup{}\egroup{}\hfill[fset]
+\noindent\texttt{\textsl{i} \bgroup{}\normalfont{}\textsl{a 
g}\egroup{}}\hfill[fset]
 
 
 
 \index[fn]{i@\texttt{\textsl{i}}}%
-\noindent\texttt\bgroup{}truc 
\bgroup{}\normalfont{}\textsl{}\egroup{}\egroup{}\hfill[cmde]
+\noindent\texttt{truc \bgroup{}\normalfont{}\textsl{}\egroup{}}\hfill[cmde]
 
 
 
@@ -824,189 +824,189 @@ def--fn
 text in def item for second def item
 
 
-\noindent\texttt\bgroup{}d{-}{-}efvr\_name\egroup{}\hfill[c--ategory]
+\noindent\texttt{d{-}{-}efvr\_name}\hfill[c--ategory]
 
 
 
 \index[cp]{d--efvr\_name@\texttt{d{-}{-}efvr\_name}}%
 d--efvr
 
-\noindent\texttt\bgroup{}n{-}{-}ame 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory]
+\noindent\texttt{n{-}{-}ame 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory]
 
 
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
 d--effn
 
-\noindent\texttt\bgroup{}n{-}{-}ame\egroup{}\hfill[c--ategory]
+\noindent\texttt{n{-}{-}ame}\hfill[c--ategory]
 
 
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
 d--effn no arg
 
-\noindent\texttt\bgroup{}t{-}{-}ype d{-}{-}eftypefn\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory]
 
 
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
 d--eftypefn
 
-\noindent\texttt\bgroup{}t{-}{-}ype 
d{-}{-}eftypefn\_name\egroup{}\hfill[c--ategory]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name}\hfill[c--ategory]
 
 
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
 d--eftypefn no arg
 
-\noindent\texttt\bgroup{}t{-}{-}ype d{-}{-}eftypeop\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory
 on \texttt{c{-}{-}lass}]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypeop\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
 
 
 
 \index[fn]{d--eftypeop\_name on c--lass@\texttt{d{-}{-}eftypeop\_name on 
c{-}{-}lass}}%
 d--eftypeop
 
-\noindent\texttt\bgroup{}t{-}{-}ype 
d{-}{-}eftypeop\_name\egroup{}\hfill[c--ategory on \texttt{c{-}{-}lass}]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypeop\_name}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
 
 
 
 \index[fn]{d--eftypeop\_name on c--lass@\texttt{d{-}{-}eftypeop\_name on 
c{-}{-}lass}}%
 d--eftypeop no arg
 
-\noindent\texttt\bgroup{}t{-}{-}ype 
d{-}{-}eftypevr\_name\egroup{}\hfill[c--ategory]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypevr\_name}\hfill[c--ategory]
 
 
 
 \index[cp]{d--eftypevr\_name@\texttt{d{-}{-}eftypevr\_name}}%
 d--eftypevr
 
-\noindent\texttt\bgroup{}d{-}{-}efcv\_name\egroup{}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efcv\_name}\hfill[c--ategory of \texttt{c{-}{-}lass}]
 
 
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
 d--efcv
 
-\noindent\texttt\bgroup{}d{-}{-}efcv\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory
 of \texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efcv\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
 
 
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
 d--efcv with arguments
 
-\noindent\texttt\bgroup{}t{-}{-}ype 
d{-}{-}eftypecv\_name\egroup{}\hfill[c--ategory of \texttt{c{-}{-}lass}]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypecv\_name}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
 
 
 
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name of 
c{-}{-}lass}}%
 d--eftypecv
 
-\noindent\texttt\bgroup{}t{-}{-}ype d{-}{-}eftypecv\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory
 of \texttt{c{-}{-}lass}]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypecv\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
 
 
 
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name of 
c{-}{-}lass}}%
 d--eftypecv with arguments
 
-\noindent\texttt\bgroup{}d{-}{-}efop\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory
 on \texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efop\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
 
 
 
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name on c{-}{-}lass}}%
 d--efop
 
-\noindent\texttt\bgroup{}d{-}{-}efop\_name\egroup{}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efop\_name}\hfill[c--ategory on \texttt{c{-}{-}lass}]
 
 
 
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name on c{-}{-}lass}}%
 d--efop no arg
 
-\noindent\texttt\bgroup{}d{-}{-}eftp\_name 
\bgroup{}\normalfont{}\textsl{a--ttributes...}\egroup{}\egroup{}\hfill[c--ategory]
+\noindent\texttt{d{-}{-}eftp\_name 
\bgroup{}\normalfont{}\textsl{a--ttributes...}\egroup{}}\hfill[c--ategory]
 
 
 
 \index[tp]{d--eftp\_name@\texttt{d{-}{-}eftp\_name}}%
 d--eftp
 
-\noindent\texttt\bgroup{}d{-}{-}efun\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[Function]
+\noindent\texttt{d{-}{-}efun\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[Function]
 
 
 
 \index[fn]{d--efun\_name@\texttt{d{-}{-}efun\_name}}%
 d--efun
 
-\noindent\texttt\bgroup{}d{-}{-}efmac\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[Macro]
+\noindent\texttt{d{-}{-}efmac\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[Macro]
 
 
 
 \index[fn]{d--efmac\_name@\texttt{d{-}{-}efmac\_name}}%
 d--efmac
 
-\noindent\texttt\bgroup{}d{-}{-}efspec\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[Special 
Form]
+\noindent\texttt{d{-}{-}efspec\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[Special Form]
 
 
 
 \index[fn]{d--efspec\_name@\texttt{d{-}{-}efspec\_name}}%
 d--efspec
 
-\noindent\texttt\bgroup{}d{-}{-}efvar\_name\egroup{}\hfill[Variable]
+\noindent\texttt{d{-}{-}efvar\_name}\hfill[Variable]
 
 
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
 d--efvar
 
-\noindent\texttt\bgroup{}d{-}{-}efvar\_name 
\bgroup{}\normalfont{}\textsl{arg--var 
arg--var1}\egroup{}\egroup{}\hfill[Variable]
+\noindent\texttt{d{-}{-}efvar\_name \bgroup{}\normalfont{}\textsl{arg--var 
arg--var1}\egroup{}}\hfill[Variable]
 
 
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
 d--efvar with args
 
-\noindent\texttt\bgroup{}d{-}{-}efopt\_name\egroup{}\hfill[User Option]
+\noindent\texttt{d{-}{-}efopt\_name}\hfill[User Option]
 
 
 
 \index[cp]{d--efopt\_name@\texttt{d{-}{-}efopt\_name}}%
 d--efopt
 
-\noindent\texttt\bgroup{}t{-}{-}ype d{-}{-}eftypefun\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[Function]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypefun\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[Function]
 
 
 
 \index[fn]{d--eftypefun\_name@\texttt{d{-}{-}eftypefun\_name}}%
 d--eftypefun
 
-\noindent\texttt\bgroup{}t{-}{-}ype 
d{-}{-}eftypevar\_name\egroup{}\hfill[Variable]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypevar\_name}\hfill[Variable]
 
 
 
 \index[cp]{d--eftypevar\_name@\texttt{d{-}{-}eftypevar\_name}}%
 d--eftypevar
 
-\noindent\texttt\bgroup{}d{-}{-}efivar\_name\egroup{}\hfill[Instance Variable 
of \texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efivar\_name}\hfill[Instance Variable of 
\texttt{c{-}{-}lass}]
 
 
 
 \index[cp]{d--efivar\_name of c--lass@\texttt{d{-}{-}efivar\_name of 
c{-}{-}lass}}%
 d--efivar
 
-\noindent\texttt\bgroup{}t{-}{-}ype 
d{-}{-}eftypeivar\_name\egroup{}\hfill[Instance Variable of 
\texttt{c{-}{-}lass}]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypeivar\_name}\hfill[Instance Variable 
of \texttt{c{-}{-}lass}]
 
 
 
 \index[cp]{d--eftypeivar\_name of c--lass@\texttt{d{-}{-}eftypeivar\_name of 
c{-}{-}lass}}%
 d--eftypeivar
 
-\noindent\texttt\bgroup{}d{-}{-}efmethod\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[Method on 
\texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efmethod\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[Method on 
\texttt{c{-}{-}lass}]
 
 
 
 \index[fn]{d--efmethod\_name on c--lass@\texttt{d{-}{-}efmethod\_name on 
c{-}{-}lass}}%
 d--efmethod
 
-\noindent\texttt\bgroup{}t{-}{-}ype d{-}{-}eftypemethod\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[Method on 
\texttt{c{-}{-}lass}]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypemethod\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[Method on 
\texttt{c{-}{-}lass}]
 
 
 
@@ -1014,49 +1014,49 @@ d--efmethod
 d--eftypemethod
 
 
-\noindent\texttt\bgroup{}\leavevmode{}\\data-type2\leavevmode{}\\name2 
\bgroup{}\normalfont{}\textsl{arguments2...}\egroup{}\egroup{}\hfill[Function]
+\noindent\texttt{data-type2\leavevmode{}\\name2 
\bgroup{}\normalfont{}\textsl{arguments2...}\egroup{}}\hfill[Function]
 
 
 
 \index[fn]{name2@\texttt{name2}}%
 aaa2
 
-\noindent\texttt\bgroup{}\leavevmode{}\\t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypefn\_name2\egroup{}\hfill[c--ategory2]
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypefn\_name2}\hfill[c--ategory2]
 
 
 
 \index[fn]{d--eftypefn\_name2@\texttt{d{-}{-}eftypefn\_name2}}%
 d--eftypefn no arg2
 
-\noindent\texttt\bgroup{}t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2 
\bgroup{}\normalfont{}\textsl{a--rguments2...}\egroup{}\egroup{}\hfill[c--ategory2
 on \texttt{c{-}{-}lass2}]
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2 
\bgroup{}\normalfont{}\textsl{a--rguments2...}\egroup{}}\hfill[c--ategory2 on 
\texttt{c{-}{-}lass2}]
 
 
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2 on 
c{-}{-}lass2}}%
 d--eftypeop2
 
-\noindent\texttt\bgroup{}t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2\egroup{}\hfill[c--ategory2
 on \texttt{c{-}{-}lass2}]
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2}\hfill[c--ategory2
 on \texttt{c{-}{-}lass2}]
 
 
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2 on 
c{-}{-}lass2}}%
 d--eftypeop no arg2
 
-\noindent\texttt\bgroup{}t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypecv\_name2\egroup{}\hfill[c--ategory2
 of \texttt{c{-}{-}lass2}]
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypecv\_name2}\hfill[c--ategory2
 of \texttt{c{-}{-}lass2}]
 
 
 
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2 of 
c{-}{-}lass2}}%
 d--eftypecv2
 
-\noindent\texttt\bgroup{}t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypecv\_name2 
\bgroup{}\normalfont{}\textsl{a--rguments2...}\egroup{}\egroup{}\hfill[c--ategory2
 of \texttt{c{-}{-}lass2}]
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypecv\_name2 
\bgroup{}\normalfont{}\textsl{a--rguments2...}\egroup{}}\hfill[c--ategory2 of 
\texttt{c{-}{-}lass2}]
 
 
 
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2 of 
c{-}{-}lass2}}%
 d--eftypecv with arguments2
 
-\noindent\texttt\bgroup{}arg2\egroup{}\hfill[fun2]
+\noindent\texttt{arg2}\hfill[fun2]
 
 
 
@@ -1337,61 +1337,61 @@ b
 l--ine
 \end{description}
 
-\noindent\texttt\bgroup{}\egroup{}\hfill[fun]
+\noindent\texttt{}\hfill[fun]
 
 
 
-\noindent\texttt\bgroup{}machin \bgroup{}\normalfont{}\textsl{bidule chose 
and}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{machin \bgroup{}\normalfont{}\textsl{bidule chose 
and}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt\bgroup{}machin \bgroup{}\normalfont{}\textsl{bidule chose and 
 after}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{machin \bgroup{}\normalfont{}\textsl{bidule chose and  
after}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt\bgroup{}machin \bgroup{}\normalfont{}\textsl{bidule chose and 
}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{machin \bgroup{}\normalfont{}\textsl{bidule chose and 
}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt\bgroup{}machin \bgroup{}\normalfont{}\textsl{bidule chose and 
and after}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{machin \bgroup{}\normalfont{}\textsl{bidule chose and and 
after}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt\bgroup{}followed \bgroup{}\normalfont{}\textsl{by a 
comment}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{followed \bgroup{}\normalfont{}\textsl{by a 
comment}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{followed@\texttt{followed}}%
 Various deff lines
-\noindent\texttt\bgroup{}after \bgroup{}\normalfont{}\textsl{a deff 
item}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{after \bgroup{}\normalfont{}\textsl{a deff 
item}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{after@\texttt{after}}%
 
-\noindent\texttt\bgroup{}\textsl{invalid} \bgroup{}\normalfont{}\textsl{a 
g}\egroup{}\egroup{}\hfill[fsetinv]
+\noindent\texttt{\textsl{invalid} \bgroup{}\normalfont{}\textsl{a 
g}\egroup{}}\hfill[fsetinv]
 
 
 
 \index[fn]{invalid@\texttt{\textsl{invalid}}}%
-\noindent\texttt\bgroup{}\egroup{}\hfill[\textbf{id `\texttt{i}' ule}]
+\noindent\texttt{}\hfill[\textbf{id `\texttt{i}' ule}]
 
 
 
 
-\noindent\texttt\bgroup{}\egroup{}\hfill[aaa]
+\noindent\texttt{}\hfill[aaa]
 
 
 
-\noindent\texttt\bgroup{}\egroup{}\hfill[]
+\noindent\texttt{}\hfill[]
 
 
 
-\noindent\texttt\bgroup{}\egroup{}\hfill[truc]
+\noindent\texttt{}\hfill[truc]
 
 
 
@@ -2026,123 +2026,123 @@ f--ormat
 s--mallformat
 \endgroup{}%
 
-\noindent\texttt\bgroup{}d{-}{-}effn\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory]
+\noindent\texttt{d{-}{-}effn\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory]
 
 
 
 \index[fn]{d--effn\_name@\texttt{d{-}{-}effn\_name}}%
 d--effn
 
-\noindent\texttt\bgroup{}de{-}{-}ffn\_name 
\bgroup{}\normalfont{}\textsl{ar--guments    more args \leavevmode{}\\ even 
more so}\egroup{}\egroup{}\hfill[cate--gory]
+\noindent\texttt{de{-}{-}ffn\_name \bgroup{}\normalfont{}\textsl{ar--guments   
 more args \leavevmode{}\\ even more so}\egroup{}}\hfill[cate--gory]
 
 
 
 \index[fn]{de--ffn\_name@\texttt{de{-}{-}ffn\_name}}%
 def--fn
 
-\noindent\texttt\bgroup{}\textsl{i} \bgroup{}\normalfont{}\textsl{a 
g}\egroup{}\egroup{}\hfill[fset]
+\noindent\texttt{\textsl{i} \bgroup{}\normalfont{}\textsl{a 
g}\egroup{}}\hfill[fset]
 
 
 
 \index[fn]{i@\texttt{\textsl{i}}}%
 \index[cp]{index entry within deffn}%
-\noindent\texttt\bgroup{}truc 
\bgroup{}\normalfont{}\textsl{}\egroup{}\egroup{}\hfill[cmde]
+\noindent\texttt{truc \bgroup{}\normalfont{}\textsl{}\egroup{}}\hfill[cmde]
 
 
 
 \index[fn]{truc@\texttt{truc}}%
-\noindent\texttt\bgroup{}log trap 
\bgroup{}\normalfont{}\textsl{}\egroup{}\egroup{}\hfill[Command]
+\noindent\texttt{log trap 
\bgroup{}\normalfont{}\textsl{}\egroup{}}\hfill[Command]
 
 
 
 \index[fn]{log trap@\texttt{log trap}}%
-\noindent\texttt\bgroup{}log trap1 
\bgroup{}\normalfont{}\textsl{}\egroup{}\egroup{}\hfill[Command]
+\noindent\texttt{log trap1 
\bgroup{}\normalfont{}\textsl{}\egroup{}}\hfill[Command]
 
 
 
 \index[fn]{log trap1@\texttt{log trap1}}%
-\noindent\texttt\bgroup{}log trap2 
\bgroup{}\normalfont{}\textsl{}\egroup{}\egroup{}\hfill[Command]
+\noindent\texttt{log trap2 
\bgroup{}\normalfont{}\textsl{}\egroup{}}\hfill[Command]
 
 
 
 \index[fn]{log trap2@\texttt{log trap2}}%
-\noindent\texttt\bgroup{}\textbf{id ule} 
\bgroup{}\normalfont{}\textsl{truc}\egroup{}\egroup{}\hfill[cmde]
+\noindent\texttt{\textbf{id ule} 
\bgroup{}\normalfont{}\textsl{truc}\egroup{}}\hfill[cmde]
 
 
 
 \index[fn]{id ule@\texttt{\textbf{id ule}}}%
-\noindent\texttt\bgroup{}\textbf{id `\texttt{i}' ule} 
\bgroup{}\normalfont{}\textsl{truc}\egroup{}\egroup{}\hfill[cmde2]
+\noindent\texttt{\textbf{id `\texttt{i}' ule} 
\bgroup{}\normalfont{}\textsl{truc}\egroup{}}\hfill[cmde2]
 
 
 
 \index[fn]{id i ule@\texttt{\textbf{id `\texttt{i}' ule}}}%
-\noindent\texttt\bgroup{}\egroup{}\hfill[]
+\noindent\texttt{}\hfill[]
 
 
 
-\noindent\texttt\bgroup{}machin\egroup{}\hfill[]
+\noindent\texttt{machin}\hfill[]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt\bgroup{}bidule machin\egroup{}\hfill[]
+\noindent\texttt{bidule machin}\hfill[]
 
 
 
 \index[fn]{bidule machin@\texttt{bidule machin}}%
-\noindent\texttt\bgroup{}machin\egroup{}\hfill[truc]
+\noindent\texttt{machin}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt\bgroup{}\egroup{}\hfill[truc]
+\noindent\texttt{}\hfill[truc]
 
 
 
-\noindent\texttt\bgroup{}followed \bgroup{}\normalfont{}\textsl{by a 
comment}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{followed \bgroup{}\normalfont{}\textsl{by a 
comment}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{followed@\texttt{followed}}%
-\noindent\texttt\bgroup{}\egroup{}\hfill[]
+\noindent\texttt{}\hfill[]
 
 
 
-\noindent\texttt\bgroup{}a \bgroup{}\normalfont{}\textsl{b c d e \textbf{f g} 
h i}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{a \bgroup{}\normalfont{}\textsl{b c d e \textbf{f g} h 
i}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{a@\texttt{a}}%
-\noindent\texttt\bgroup{}deffnx \bgroup{}\normalfont{}\textsl{before end 
deffn}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{deffnx \bgroup{}\normalfont{}\textsl{before end 
deffn}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{deffnx@\texttt{deffnx}}%
 
 
-\noindent\texttt\bgroup{}deffn\egroup{}\hfill[empty]
+\noindent\texttt{deffn}\hfill[empty]
 
 
 
 \index[fn]{deffn@\texttt{deffn}}%
 
-\noindent\texttt\bgroup{}deffn \bgroup{}\normalfont{}\textsl{with 
deffnx}\egroup{}\egroup{}\hfill[empty]
+\noindent\texttt{deffn \bgroup{}\normalfont{}\textsl{with 
deffnx}\egroup{}}\hfill[empty]
 
 
 
 \index[fn]{deffn@\texttt{deffn}}%
-\noindent\texttt\bgroup{}deffnx\egroup{}\hfill[empty]
+\noindent\texttt{deffnx}\hfill[empty]
 
 
 
 \index[fn]{deffnx@\texttt{deffnx}}%
 
-\noindent\texttt\bgroup{}\textsl{i} \bgroup{}\normalfont{}\textsl{a 
g}\egroup{}\egroup{}\hfill[fset]
+\noindent\texttt{\textsl{i} \bgroup{}\normalfont{}\textsl{a 
g}\egroup{}}\hfill[fset]
 
 
 
 \index[fn]{i@\texttt{\textsl{i}}}%
-\noindent\texttt\bgroup{}truc 
\bgroup{}\normalfont{}\textsl{}\egroup{}\egroup{}\hfill[cmde]
+\noindent\texttt{truc \bgroup{}\normalfont{}\textsl{}\egroup{}}\hfill[cmde]
 
 
 
@@ -2150,189 +2150,189 @@ def--fn
 text in def item for second def item
 
 
-\noindent\texttt\bgroup{}d{-}{-}efvr\_name\egroup{}\hfill[c--ategory]
+\noindent\texttt{d{-}{-}efvr\_name}\hfill[c--ategory]
 
 
 
 \index[cp]{d--efvr\_name@\texttt{d{-}{-}efvr\_name}}%
 d--efvr
 
-\noindent\texttt\bgroup{}n{-}{-}ame 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory]
+\noindent\texttt{n{-}{-}ame 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory]
 
 
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
 d--effn
 
-\noindent\texttt\bgroup{}n{-}{-}ame\egroup{}\hfill[c--ategory]
+\noindent\texttt{n{-}{-}ame}\hfill[c--ategory]
 
 
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
 d--effn no arg
 
-\noindent\texttt\bgroup{}t{-}{-}ype d{-}{-}eftypefn\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory]
 
 
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
 d--eftypefn
 
-\noindent\texttt\bgroup{}t{-}{-}ype 
d{-}{-}eftypefn\_name\egroup{}\hfill[c--ategory]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name}\hfill[c--ategory]
 
 
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
 d--eftypefn no arg
 
-\noindent\texttt\bgroup{}t{-}{-}ype d{-}{-}eftypeop\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory
 on \texttt{c{-}{-}lass}]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypeop\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
 
 
 
 \index[fn]{d--eftypeop\_name on c--lass@\texttt{d{-}{-}eftypeop\_name on 
c{-}{-}lass}}%
 d--eftypeop
 
-\noindent\texttt\bgroup{}t{-}{-}ype 
d{-}{-}eftypeop\_name\egroup{}\hfill[c--ategory on \texttt{c{-}{-}lass}]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypeop\_name}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
 
 
 
 \index[fn]{d--eftypeop\_name on c--lass@\texttt{d{-}{-}eftypeop\_name on 
c{-}{-}lass}}%
 d--eftypeop no arg
 
-\noindent\texttt\bgroup{}t{-}{-}ype 
d{-}{-}eftypevr\_name\egroup{}\hfill[c--ategory]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypevr\_name}\hfill[c--ategory]
 
 
 
 \index[cp]{d--eftypevr\_name@\texttt{d{-}{-}eftypevr\_name}}%
 d--eftypevr
 
-\noindent\texttt\bgroup{}d{-}{-}efcv\_name\egroup{}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efcv\_name}\hfill[c--ategory of \texttt{c{-}{-}lass}]
 
 
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
 d--efcv
 
-\noindent\texttt\bgroup{}d{-}{-}efcv\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory
 of \texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efcv\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
 
 
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
 d--efcv with arguments
 
-\noindent\texttt\bgroup{}t{-}{-}ype 
d{-}{-}eftypecv\_name\egroup{}\hfill[c--ategory of \texttt{c{-}{-}lass}]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypecv\_name}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
 
 
 
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name of 
c{-}{-}lass}}%
 d--eftypecv
 
-\noindent\texttt\bgroup{}t{-}{-}ype d{-}{-}eftypecv\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory
 of \texttt{c{-}{-}lass}]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypecv\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
 
 
 
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name of 
c{-}{-}lass}}%
 d--eftypecv with arguments
 
-\noindent\texttt\bgroup{}d{-}{-}efop\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory
 on \texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efop\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
 
 
 
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name on c{-}{-}lass}}%
 d--efop
 
-\noindent\texttt\bgroup{}d{-}{-}efop\_name\egroup{}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efop\_name}\hfill[c--ategory on \texttt{c{-}{-}lass}]
 
 
 
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name on c{-}{-}lass}}%
 d--efop no arg
 
-\noindent\texttt\bgroup{}d{-}{-}eftp\_name 
\bgroup{}\normalfont{}\textsl{a--ttributes...}\egroup{}\egroup{}\hfill[c--ategory]
+\noindent\texttt{d{-}{-}eftp\_name 
\bgroup{}\normalfont{}\textsl{a--ttributes...}\egroup{}}\hfill[c--ategory]
 
 
 
 \index[tp]{d--eftp\_name@\texttt{d{-}{-}eftp\_name}}%
 d--eftp
 
-\noindent\texttt\bgroup{}d{-}{-}efun\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[Function]
+\noindent\texttt{d{-}{-}efun\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[Function]
 
 
 
 \index[fn]{d--efun\_name@\texttt{d{-}{-}efun\_name}}%
 d--efun
 
-\noindent\texttt\bgroup{}d{-}{-}efmac\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[Macro]
+\noindent\texttt{d{-}{-}efmac\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[Macro]
 
 
 
 \index[fn]{d--efmac\_name@\texttt{d{-}{-}efmac\_name}}%
 d--efmac
 
-\noindent\texttt\bgroup{}d{-}{-}efspec\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[Special 
Form]
+\noindent\texttt{d{-}{-}efspec\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[Special Form]
 
 
 
 \index[fn]{d--efspec\_name@\texttt{d{-}{-}efspec\_name}}%
 d--efspec
 
-\noindent\texttt\bgroup{}d{-}{-}efvar\_name\egroup{}\hfill[Variable]
+\noindent\texttt{d{-}{-}efvar\_name}\hfill[Variable]
 
 
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
 d--efvar
 
-\noindent\texttt\bgroup{}d{-}{-}efvar\_name 
\bgroup{}\normalfont{}\textsl{arg--var 
arg--var1}\egroup{}\egroup{}\hfill[Variable]
+\noindent\texttt{d{-}{-}efvar\_name \bgroup{}\normalfont{}\textsl{arg--var 
arg--var1}\egroup{}}\hfill[Variable]
 
 
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
 d--efvar with args
 
-\noindent\texttt\bgroup{}d{-}{-}efopt\_name\egroup{}\hfill[User Option]
+\noindent\texttt{d{-}{-}efopt\_name}\hfill[User Option]
 
 
 
 \index[cp]{d--efopt\_name@\texttt{d{-}{-}efopt\_name}}%
 d--efopt
 
-\noindent\texttt\bgroup{}t{-}{-}ype d{-}{-}eftypefun\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[Function]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypefun\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[Function]
 
 
 
 \index[fn]{d--eftypefun\_name@\texttt{d{-}{-}eftypefun\_name}}%
 d--eftypefun
 
-\noindent\texttt\bgroup{}t{-}{-}ype 
d{-}{-}eftypevar\_name\egroup{}\hfill[Variable]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypevar\_name}\hfill[Variable]
 
 
 
 \index[cp]{d--eftypevar\_name@\texttt{d{-}{-}eftypevar\_name}}%
 d--eftypevar
 
-\noindent\texttt\bgroup{}d{-}{-}efivar\_name\egroup{}\hfill[Instance Variable 
of \texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efivar\_name}\hfill[Instance Variable of 
\texttt{c{-}{-}lass}]
 
 
 
 \index[cp]{d--efivar\_name of c--lass@\texttt{d{-}{-}efivar\_name of 
c{-}{-}lass}}%
 d--efivar
 
-\noindent\texttt\bgroup{}t{-}{-}ype 
d{-}{-}eftypeivar\_name\egroup{}\hfill[Instance Variable of 
\texttt{c{-}{-}lass}]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypeivar\_name}\hfill[Instance Variable 
of \texttt{c{-}{-}lass}]
 
 
 
 \index[cp]{d--eftypeivar\_name of c--lass@\texttt{d{-}{-}eftypeivar\_name of 
c{-}{-}lass}}%
 d--eftypeivar
 
-\noindent\texttt\bgroup{}d{-}{-}efmethod\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[Method on 
\texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efmethod\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[Method on 
\texttt{c{-}{-}lass}]
 
 
 
 \index[fn]{d--efmethod\_name on c--lass@\texttt{d{-}{-}efmethod\_name on 
c{-}{-}lass}}%
 d--efmethod
 
-\noindent\texttt\bgroup{}t{-}{-}ype d{-}{-}eftypemethod\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[Method on 
\texttt{c{-}{-}lass}]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypemethod\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[Method on 
\texttt{c{-}{-}lass}]
 
 
 
@@ -2340,49 +2340,49 @@ d--efmethod
 d--eftypemethod
 
 
-\noindent\texttt\bgroup{}\leavevmode{}\\data-type2\leavevmode{}\\name2 
\bgroup{}\normalfont{}\textsl{arguments2...}\egroup{}\egroup{}\hfill[Function]
+\noindent\texttt{data-type2\leavevmode{}\\name2 
\bgroup{}\normalfont{}\textsl{arguments2...}\egroup{}}\hfill[Function]
 
 
 
 \index[fn]{name2@\texttt{name2}}%
 aaa2
 
-\noindent\texttt\bgroup{}\leavevmode{}\\t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypefn\_name2\egroup{}\hfill[c--ategory2]
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypefn\_name2}\hfill[c--ategory2]
 
 
 
 \index[fn]{d--eftypefn\_name2@\texttt{d{-}{-}eftypefn\_name2}}%
 d--eftypefn no arg2
 
-\noindent\texttt\bgroup{}t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2 
\bgroup{}\normalfont{}\textsl{a--rguments2...}\egroup{}\egroup{}\hfill[c--ategory2
 on \texttt{c{-}{-}lass2}]
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2 
\bgroup{}\normalfont{}\textsl{a--rguments2...}\egroup{}}\hfill[c--ategory2 on 
\texttt{c{-}{-}lass2}]
 
 
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2 on 
c{-}{-}lass2}}%
 d--eftypeop2
 
-\noindent\texttt\bgroup{}t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2\egroup{}\hfill[c--ategory2
 on \texttt{c{-}{-}lass2}]
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2}\hfill[c--ategory2
 on \texttt{c{-}{-}lass2}]
 
 
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2 on 
c{-}{-}lass2}}%
 d--eftypeop no arg2
 
-\noindent\texttt\bgroup{}t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypecv\_name2\egroup{}\hfill[c--ategory2
 of \texttt{c{-}{-}lass2}]
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypecv\_name2}\hfill[c--ategory2
 of \texttt{c{-}{-}lass2}]
 
 
 
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2 of 
c{-}{-}lass2}}%
 d--eftypecv2
 
-\noindent\texttt\bgroup{}t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypecv\_name2 
\bgroup{}\normalfont{}\textsl{a--rguments2...}\egroup{}\egroup{}\hfill[c--ategory2
 of \texttt{c{-}{-}lass2}]
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypecv\_name2 
\bgroup{}\normalfont{}\textsl{a--rguments2...}\egroup{}}\hfill[c--ategory2 of 
\texttt{c{-}{-}lass2}]
 
 
 
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2 of 
c{-}{-}lass2}}%
 d--eftypecv with arguments2
 
-\noindent\texttt\bgroup{}arg2\egroup{}\hfill[fun2]
+\noindent\texttt{arg2}\hfill[fun2]
 
 
 
@@ -2663,61 +2663,61 @@ b
 l--ine
 \end{description}
 
-\noindent\texttt\bgroup{}\egroup{}\hfill[fun]
+\noindent\texttt{}\hfill[fun]
 
 
 
-\noindent\texttt\bgroup{}machin \bgroup{}\normalfont{}\textsl{bidule chose 
and}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{machin \bgroup{}\normalfont{}\textsl{bidule chose 
and}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt\bgroup{}machin \bgroup{}\normalfont{}\textsl{bidule chose and 
 after}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{machin \bgroup{}\normalfont{}\textsl{bidule chose and  
after}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt\bgroup{}machin \bgroup{}\normalfont{}\textsl{bidule chose and 
}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{machin \bgroup{}\normalfont{}\textsl{bidule chose and 
}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt\bgroup{}machin \bgroup{}\normalfont{}\textsl{bidule chose and 
and after}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{machin \bgroup{}\normalfont{}\textsl{bidule chose and and 
after}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt\bgroup{}followed \bgroup{}\normalfont{}\textsl{by a 
comment}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{followed \bgroup{}\normalfont{}\textsl{by a 
comment}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{followed@\texttt{followed}}%
 Various deff lines
-\noindent\texttt\bgroup{}after \bgroup{}\normalfont{}\textsl{a deff 
item}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{after \bgroup{}\normalfont{}\textsl{a deff 
item}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{after@\texttt{after}}%
 
-\noindent\texttt\bgroup{}\textsl{invalid} \bgroup{}\normalfont{}\textsl{a 
g}\egroup{}\egroup{}\hfill[fsetinv]
+\noindent\texttt{\textsl{invalid} \bgroup{}\normalfont{}\textsl{a 
g}\egroup{}}\hfill[fsetinv]
 
 
 
 \index[fn]{invalid@\texttt{\textsl{invalid}}}%
-\noindent\texttt\bgroup{}\egroup{}\hfill[\textbf{id `\texttt{i}' ule}]
+\noindent\texttt{}\hfill[\textbf{id `\texttt{i}' ule}]
 
 
 
 
-\noindent\texttt\bgroup{}\egroup{}\hfill[aaa]
+\noindent\texttt{}\hfill[aaa]
 
 
 
-\noindent\texttt\bgroup{}\egroup{}\hfill[]
+\noindent\texttt{}\hfill[]
 
 
 
-\noindent\texttt\bgroup{}\egroup{}\hfill[truc]
+\noindent\texttt{}\hfill[truc]
 
 
 
@@ -3372,123 +3372,123 @@ f--ormat
 s--mallformat
 \endgroup{}%
 
-\noindent\texttt\bgroup{}d{-}{-}effn\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory]
+\noindent\texttt{d{-}{-}effn\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory]
 
 
 
 \index[fn]{d--effn\_name@\texttt{d{-}{-}effn\_name}}%
 d--effn
 
-\noindent\texttt\bgroup{}de{-}{-}ffn\_name 
\bgroup{}\normalfont{}\textsl{ar--guments    more args \leavevmode{}\\ even 
more so}\egroup{}\egroup{}\hfill[cate--gory]
+\noindent\texttt{de{-}{-}ffn\_name \bgroup{}\normalfont{}\textsl{ar--guments   
 more args \leavevmode{}\\ even more so}\egroup{}}\hfill[cate--gory]
 
 
 
 \index[fn]{de--ffn\_name@\texttt{de{-}{-}ffn\_name}}%
 def--fn
 
-\noindent\texttt\bgroup{}\textsl{i} \bgroup{}\normalfont{}\textsl{a 
g}\egroup{}\egroup{}\hfill[fset]
+\noindent\texttt{\textsl{i} \bgroup{}\normalfont{}\textsl{a 
g}\egroup{}}\hfill[fset]
 
 
 
 \index[fn]{i@\texttt{\textsl{i}}}%
 \index[cp]{index entry within deffn}%
-\noindent\texttt\bgroup{}truc 
\bgroup{}\normalfont{}\textsl{}\egroup{}\egroup{}\hfill[cmde]
+\noindent\texttt{truc \bgroup{}\normalfont{}\textsl{}\egroup{}}\hfill[cmde]
 
 
 
 \index[fn]{truc@\texttt{truc}}%
-\noindent\texttt\bgroup{}log trap 
\bgroup{}\normalfont{}\textsl{}\egroup{}\egroup{}\hfill[Command]
+\noindent\texttt{log trap 
\bgroup{}\normalfont{}\textsl{}\egroup{}}\hfill[Command]
 
 
 
 \index[fn]{log trap@\texttt{log trap}}%
-\noindent\texttt\bgroup{}log trap1 
\bgroup{}\normalfont{}\textsl{}\egroup{}\egroup{}\hfill[Command]
+\noindent\texttt{log trap1 
\bgroup{}\normalfont{}\textsl{}\egroup{}}\hfill[Command]
 
 
 
 \index[fn]{log trap1@\texttt{log trap1}}%
-\noindent\texttt\bgroup{}log trap2 
\bgroup{}\normalfont{}\textsl{}\egroup{}\egroup{}\hfill[Command]
+\noindent\texttt{log trap2 
\bgroup{}\normalfont{}\textsl{}\egroup{}}\hfill[Command]
 
 
 
 \index[fn]{log trap2@\texttt{log trap2}}%
-\noindent\texttt\bgroup{}\textbf{id ule} 
\bgroup{}\normalfont{}\textsl{truc}\egroup{}\egroup{}\hfill[cmde]
+\noindent\texttt{\textbf{id ule} 
\bgroup{}\normalfont{}\textsl{truc}\egroup{}}\hfill[cmde]
 
 
 
 \index[fn]{id ule@\texttt{\textbf{id ule}}}%
-\noindent\texttt\bgroup{}\textbf{id `\texttt{i}' ule} 
\bgroup{}\normalfont{}\textsl{truc}\egroup{}\egroup{}\hfill[cmde2]
+\noindent\texttt{\textbf{id `\texttt{i}' ule} 
\bgroup{}\normalfont{}\textsl{truc}\egroup{}}\hfill[cmde2]
 
 
 
 \index[fn]{id i ule@\texttt{\textbf{id `\texttt{i}' ule}}}%
-\noindent\texttt\bgroup{}\egroup{}\hfill[]
+\noindent\texttt{}\hfill[]
 
 
 
-\noindent\texttt\bgroup{}machin\egroup{}\hfill[]
+\noindent\texttt{machin}\hfill[]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt\bgroup{}bidule machin\egroup{}\hfill[]
+\noindent\texttt{bidule machin}\hfill[]
 
 
 
 \index[fn]{bidule machin@\texttt{bidule machin}}%
-\noindent\texttt\bgroup{}machin\egroup{}\hfill[truc]
+\noindent\texttt{machin}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt\bgroup{}\egroup{}\hfill[truc]
+\noindent\texttt{}\hfill[truc]
 
 
 
-\noindent\texttt\bgroup{}followed \bgroup{}\normalfont{}\textsl{by a 
comment}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{followed \bgroup{}\normalfont{}\textsl{by a 
comment}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{followed@\texttt{followed}}%
-\noindent\texttt\bgroup{}\egroup{}\hfill[]
+\noindent\texttt{}\hfill[]
 
 
 
-\noindent\texttt\bgroup{}a \bgroup{}\normalfont{}\textsl{b c d e \textbf{f g} 
h i}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{a \bgroup{}\normalfont{}\textsl{b c d e \textbf{f g} h 
i}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{a@\texttt{a}}%
-\noindent\texttt\bgroup{}deffnx \bgroup{}\normalfont{}\textsl{before end 
deffn}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{deffnx \bgroup{}\normalfont{}\textsl{before end 
deffn}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{deffnx@\texttt{deffnx}}%
 
 
-\noindent\texttt\bgroup{}deffn\egroup{}\hfill[empty]
+\noindent\texttt{deffn}\hfill[empty]
 
 
 
 \index[fn]{deffn@\texttt{deffn}}%
 
-\noindent\texttt\bgroup{}deffn \bgroup{}\normalfont{}\textsl{with 
deffnx}\egroup{}\egroup{}\hfill[empty]
+\noindent\texttt{deffn \bgroup{}\normalfont{}\textsl{with 
deffnx}\egroup{}}\hfill[empty]
 
 
 
 \index[fn]{deffn@\texttt{deffn}}%
-\noindent\texttt\bgroup{}deffnx\egroup{}\hfill[empty]
+\noindent\texttt{deffnx}\hfill[empty]
 
 
 
 \index[fn]{deffnx@\texttt{deffnx}}%
 
-\noindent\texttt\bgroup{}\textsl{i} \bgroup{}\normalfont{}\textsl{a 
g}\egroup{}\egroup{}\hfill[fset]
+\noindent\texttt{\textsl{i} \bgroup{}\normalfont{}\textsl{a 
g}\egroup{}}\hfill[fset]
 
 
 
 \index[fn]{i@\texttt{\textsl{i}}}%
-\noindent\texttt\bgroup{}truc 
\bgroup{}\normalfont{}\textsl{}\egroup{}\egroup{}\hfill[cmde]
+\noindent\texttt{truc \bgroup{}\normalfont{}\textsl{}\egroup{}}\hfill[cmde]
 
 
 
@@ -3496,189 +3496,189 @@ def--fn
 text in def item for second def item
 
 
-\noindent\texttt\bgroup{}d{-}{-}efvr\_name\egroup{}\hfill[c--ategory]
+\noindent\texttt{d{-}{-}efvr\_name}\hfill[c--ategory]
 
 
 
 \index[cp]{d--efvr\_name@\texttt{d{-}{-}efvr\_name}}%
 d--efvr
 
-\noindent\texttt\bgroup{}n{-}{-}ame 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory]
+\noindent\texttt{n{-}{-}ame 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory]
 
 
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
 d--effn
 
-\noindent\texttt\bgroup{}n{-}{-}ame\egroup{}\hfill[c--ategory]
+\noindent\texttt{n{-}{-}ame}\hfill[c--ategory]
 
 
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
 d--effn no arg
 
-\noindent\texttt\bgroup{}t{-}{-}ype d{-}{-}eftypefn\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory]
 
 
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
 d--eftypefn
 
-\noindent\texttt\bgroup{}t{-}{-}ype 
d{-}{-}eftypefn\_name\egroup{}\hfill[c--ategory]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name}\hfill[c--ategory]
 
 
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
 d--eftypefn no arg
 
-\noindent\texttt\bgroup{}t{-}{-}ype d{-}{-}eftypeop\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory
 on \texttt{c{-}{-}lass}]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypeop\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
 
 
 
 \index[fn]{d--eftypeop\_name on c--lass@\texttt{d{-}{-}eftypeop\_name on 
c{-}{-}lass}}%
 d--eftypeop
 
-\noindent\texttt\bgroup{}t{-}{-}ype 
d{-}{-}eftypeop\_name\egroup{}\hfill[c--ategory on \texttt{c{-}{-}lass}]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypeop\_name}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
 
 
 
 \index[fn]{d--eftypeop\_name on c--lass@\texttt{d{-}{-}eftypeop\_name on 
c{-}{-}lass}}%
 d--eftypeop no arg
 
-\noindent\texttt\bgroup{}t{-}{-}ype 
d{-}{-}eftypevr\_name\egroup{}\hfill[c--ategory]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypevr\_name}\hfill[c--ategory]
 
 
 
 \index[cp]{d--eftypevr\_name@\texttt{d{-}{-}eftypevr\_name}}%
 d--eftypevr
 
-\noindent\texttt\bgroup{}d{-}{-}efcv\_name\egroup{}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efcv\_name}\hfill[c--ategory of \texttt{c{-}{-}lass}]
 
 
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
 d--efcv
 
-\noindent\texttt\bgroup{}d{-}{-}efcv\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory
 of \texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efcv\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
 
 
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
 d--efcv with arguments
 
-\noindent\texttt\bgroup{}t{-}{-}ype 
d{-}{-}eftypecv\_name\egroup{}\hfill[c--ategory of \texttt{c{-}{-}lass}]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypecv\_name}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
 
 
 
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name of 
c{-}{-}lass}}%
 d--eftypecv
 
-\noindent\texttt\bgroup{}t{-}{-}ype d{-}{-}eftypecv\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory
 of \texttt{c{-}{-}lass}]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypecv\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
 
 
 
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name of 
c{-}{-}lass}}%
 d--eftypecv with arguments
 
-\noindent\texttt\bgroup{}d{-}{-}efop\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory
 on \texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efop\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
 
 
 
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name on c{-}{-}lass}}%
 d--efop
 
-\noindent\texttt\bgroup{}d{-}{-}efop\_name\egroup{}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efop\_name}\hfill[c--ategory on \texttt{c{-}{-}lass}]
 
 
 
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name on c{-}{-}lass}}%
 d--efop no arg
 
-\noindent\texttt\bgroup{}d{-}{-}eftp\_name 
\bgroup{}\normalfont{}\textsl{a--ttributes...}\egroup{}\egroup{}\hfill[c--ategory]
+\noindent\texttt{d{-}{-}eftp\_name 
\bgroup{}\normalfont{}\textsl{a--ttributes...}\egroup{}}\hfill[c--ategory]
 
 
 
 \index[tp]{d--eftp\_name@\texttt{d{-}{-}eftp\_name}}%
 d--eftp
 
-\noindent\texttt\bgroup{}d{-}{-}efun\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[Function]
+\noindent\texttt{d{-}{-}efun\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[Function]
 
 
 
 \index[fn]{d--efun\_name@\texttt{d{-}{-}efun\_name}}%
 d--efun
 
-\noindent\texttt\bgroup{}d{-}{-}efmac\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[Macro]
+\noindent\texttt{d{-}{-}efmac\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[Macro]
 
 
 
 \index[fn]{d--efmac\_name@\texttt{d{-}{-}efmac\_name}}%
 d--efmac
 
-\noindent\texttt\bgroup{}d{-}{-}efspec\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[Special 
Form]
+\noindent\texttt{d{-}{-}efspec\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[Special Form]
 
 
 
 \index[fn]{d--efspec\_name@\texttt{d{-}{-}efspec\_name}}%
 d--efspec
 
-\noindent\texttt\bgroup{}d{-}{-}efvar\_name\egroup{}\hfill[Variable]
+\noindent\texttt{d{-}{-}efvar\_name}\hfill[Variable]
 
 
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
 d--efvar
 
-\noindent\texttt\bgroup{}d{-}{-}efvar\_name 
\bgroup{}\normalfont{}\textsl{arg--var 
arg--var1}\egroup{}\egroup{}\hfill[Variable]
+\noindent\texttt{d{-}{-}efvar\_name \bgroup{}\normalfont{}\textsl{arg--var 
arg--var1}\egroup{}}\hfill[Variable]
 
 
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
 d--efvar with args
 
-\noindent\texttt\bgroup{}d{-}{-}efopt\_name\egroup{}\hfill[User Option]
+\noindent\texttt{d{-}{-}efopt\_name}\hfill[User Option]
 
 
 
 \index[cp]{d--efopt\_name@\texttt{d{-}{-}efopt\_name}}%
 d--efopt
 
-\noindent\texttt\bgroup{}t{-}{-}ype d{-}{-}eftypefun\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[Function]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypefun\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[Function]
 
 
 
 \index[fn]{d--eftypefun\_name@\texttt{d{-}{-}eftypefun\_name}}%
 d--eftypefun
 
-\noindent\texttt\bgroup{}t{-}{-}ype 
d{-}{-}eftypevar\_name\egroup{}\hfill[Variable]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypevar\_name}\hfill[Variable]
 
 
 
 \index[cp]{d--eftypevar\_name@\texttt{d{-}{-}eftypevar\_name}}%
 d--eftypevar
 
-\noindent\texttt\bgroup{}d{-}{-}efivar\_name\egroup{}\hfill[Instance Variable 
of \texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efivar\_name}\hfill[Instance Variable of 
\texttt{c{-}{-}lass}]
 
 
 
 \index[cp]{d--efivar\_name of c--lass@\texttt{d{-}{-}efivar\_name of 
c{-}{-}lass}}%
 d--efivar
 
-\noindent\texttt\bgroup{}t{-}{-}ype 
d{-}{-}eftypeivar\_name\egroup{}\hfill[Instance Variable of 
\texttt{c{-}{-}lass}]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypeivar\_name}\hfill[Instance Variable 
of \texttt{c{-}{-}lass}]
 
 
 
 \index[cp]{d--eftypeivar\_name of c--lass@\texttt{d{-}{-}eftypeivar\_name of 
c{-}{-}lass}}%
 d--eftypeivar
 
-\noindent\texttt\bgroup{}d{-}{-}efmethod\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[Method on 
\texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efmethod\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[Method on 
\texttt{c{-}{-}lass}]
 
 
 
 \index[fn]{d--efmethod\_name on c--lass@\texttt{d{-}{-}efmethod\_name on 
c{-}{-}lass}}%
 d--efmethod
 
-\noindent\texttt\bgroup{}t{-}{-}ype d{-}{-}eftypemethod\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[Method on 
\texttt{c{-}{-}lass}]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypemethod\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[Method on 
\texttt{c{-}{-}lass}]
 
 
 
@@ -3686,49 +3686,49 @@ d--efmethod
 d--eftypemethod
 
 
-\noindent\texttt\bgroup{}\leavevmode{}\\data-type2\leavevmode{}\\name2 
\bgroup{}\normalfont{}\textsl{arguments2...}\egroup{}\egroup{}\hfill[Function]
+\noindent\texttt{data-type2\leavevmode{}\\name2 
\bgroup{}\normalfont{}\textsl{arguments2...}\egroup{}}\hfill[Function]
 
 
 
 \index[fn]{name2@\texttt{name2}}%
 aaa2
 
-\noindent\texttt\bgroup{}\leavevmode{}\\t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypefn\_name2\egroup{}\hfill[c--ategory2]
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypefn\_name2}\hfill[c--ategory2]
 
 
 
 \index[fn]{d--eftypefn\_name2@\texttt{d{-}{-}eftypefn\_name2}}%
 d--eftypefn no arg2
 
-\noindent\texttt\bgroup{}t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2 
\bgroup{}\normalfont{}\textsl{a--rguments2...}\egroup{}\egroup{}\hfill[c--ategory2
 on \texttt{c{-}{-}lass2}]
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2 
\bgroup{}\normalfont{}\textsl{a--rguments2...}\egroup{}}\hfill[c--ategory2 on 
\texttt{c{-}{-}lass2}]
 
 
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2 on 
c{-}{-}lass2}}%
 d--eftypeop2
 
-\noindent\texttt\bgroup{}t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2\egroup{}\hfill[c--ategory2
 on \texttt{c{-}{-}lass2}]
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2}\hfill[c--ategory2
 on \texttt{c{-}{-}lass2}]
 
 
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2 on 
c{-}{-}lass2}}%
 d--eftypeop no arg2
 
-\noindent\texttt\bgroup{}t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypecv\_name2\egroup{}\hfill[c--ategory2
 of \texttt{c{-}{-}lass2}]
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypecv\_name2}\hfill[c--ategory2
 of \texttt{c{-}{-}lass2}]
 
 
 
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2 of 
c{-}{-}lass2}}%
 d--eftypecv2
 
-\noindent\texttt\bgroup{}t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypecv\_name2 
\bgroup{}\normalfont{}\textsl{a--rguments2...}\egroup{}\egroup{}\hfill[c--ategory2
 of \texttt{c{-}{-}lass2}]
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypecv\_name2 
\bgroup{}\normalfont{}\textsl{a--rguments2...}\egroup{}}\hfill[c--ategory2 of 
\texttt{c{-}{-}lass2}]
 
 
 
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2 of 
c{-}{-}lass2}}%
 d--eftypecv with arguments2
 
-\noindent\texttt\bgroup{}arg2\egroup{}\hfill[fun2]
+\noindent\texttt{arg2}\hfill[fun2]
 
 
 
@@ -4009,61 +4009,61 @@ b
 l--ine
 \end{description}
 
-\noindent\texttt\bgroup{}\egroup{}\hfill[fun]
+\noindent\texttt{}\hfill[fun]
 
 
 
-\noindent\texttt\bgroup{}machin \bgroup{}\normalfont{}\textsl{bidule chose 
and}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{machin \bgroup{}\normalfont{}\textsl{bidule chose 
and}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt\bgroup{}machin \bgroup{}\normalfont{}\textsl{bidule chose and 
 after}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{machin \bgroup{}\normalfont{}\textsl{bidule chose and  
after}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt\bgroup{}machin \bgroup{}\normalfont{}\textsl{bidule chose and 
}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{machin \bgroup{}\normalfont{}\textsl{bidule chose and 
}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt\bgroup{}machin \bgroup{}\normalfont{}\textsl{bidule chose and 
and after}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{machin \bgroup{}\normalfont{}\textsl{bidule chose and and 
after}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt\bgroup{}followed \bgroup{}\normalfont{}\textsl{by a 
comment}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{followed \bgroup{}\normalfont{}\textsl{by a 
comment}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{followed@\texttt{followed}}%
 Various deff lines
-\noindent\texttt\bgroup{}after \bgroup{}\normalfont{}\textsl{a deff 
item}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{after \bgroup{}\normalfont{}\textsl{a deff 
item}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{after@\texttt{after}}%
 
-\noindent\texttt\bgroup{}\textsl{invalid} \bgroup{}\normalfont{}\textsl{a 
g}\egroup{}\egroup{}\hfill[fsetinv]
+\noindent\texttt{\textsl{invalid} \bgroup{}\normalfont{}\textsl{a 
g}\egroup{}}\hfill[fsetinv]
 
 
 
 \index[fn]{invalid@\texttt{\textsl{invalid}}}%
-\noindent\texttt\bgroup{}\egroup{}\hfill[\textbf{id `\texttt{i}' ule}]
+\noindent\texttt{}\hfill[\textbf{id `\texttt{i}' ule}]
 
 
 
 
-\noindent\texttt\bgroup{}\egroup{}\hfill[aaa]
+\noindent\texttt{}\hfill[aaa]
 
 
 
-\noindent\texttt\bgroup{}\egroup{}\hfill[]
+\noindent\texttt{}\hfill[]
 
 
 
-\noindent\texttt\bgroup{}\egroup{}\hfill[truc]
+\noindent\texttt{}\hfill[truc]
 
 
 
@@ -4697,123 +4697,123 @@ f--ormat
 s--mallformat
 \endgroup{}%
 
-\noindent\texttt\bgroup{}d{-}{-}effn\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory]
+\noindent\texttt{d{-}{-}effn\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory]
 
 
 
 \index[fn]{d--effn\_name@\texttt{d{-}{-}effn\_name}}%
 d--effn
 
-\noindent\texttt\bgroup{}de{-}{-}ffn\_name 
\bgroup{}\normalfont{}\textsl{ar--guments    more args \leavevmode{}\\ even 
more so}\egroup{}\egroup{}\hfill[cate--gory]
+\noindent\texttt{de{-}{-}ffn\_name \bgroup{}\normalfont{}\textsl{ar--guments   
 more args \leavevmode{}\\ even more so}\egroup{}}\hfill[cate--gory]
 
 
 
 \index[fn]{de--ffn\_name@\texttt{de{-}{-}ffn\_name}}%
 def--fn
 
-\noindent\texttt\bgroup{}\textsl{i} \bgroup{}\normalfont{}\textsl{a 
g}\egroup{}\egroup{}\hfill[fset]
+\noindent\texttt{\textsl{i} \bgroup{}\normalfont{}\textsl{a 
g}\egroup{}}\hfill[fset]
 
 
 
 \index[fn]{i@\texttt{\textsl{i}}}%
 \index[cp]{index entry within deffn}%
-\noindent\texttt\bgroup{}truc 
\bgroup{}\normalfont{}\textsl{}\egroup{}\egroup{}\hfill[cmde]
+\noindent\texttt{truc \bgroup{}\normalfont{}\textsl{}\egroup{}}\hfill[cmde]
 
 
 
 \index[fn]{truc@\texttt{truc}}%
-\noindent\texttt\bgroup{}log trap 
\bgroup{}\normalfont{}\textsl{}\egroup{}\egroup{}\hfill[Command]
+\noindent\texttt{log trap 
\bgroup{}\normalfont{}\textsl{}\egroup{}}\hfill[Command]
 
 
 
 \index[fn]{log trap@\texttt{log trap}}%
-\noindent\texttt\bgroup{}log trap1 
\bgroup{}\normalfont{}\textsl{}\egroup{}\egroup{}\hfill[Command]
+\noindent\texttt{log trap1 
\bgroup{}\normalfont{}\textsl{}\egroup{}}\hfill[Command]
 
 
 
 \index[fn]{log trap1@\texttt{log trap1}}%
-\noindent\texttt\bgroup{}log trap2 
\bgroup{}\normalfont{}\textsl{}\egroup{}\egroup{}\hfill[Command]
+\noindent\texttt{log trap2 
\bgroup{}\normalfont{}\textsl{}\egroup{}}\hfill[Command]
 
 
 
 \index[fn]{log trap2@\texttt{log trap2}}%
-\noindent\texttt\bgroup{}\textbf{id ule} 
\bgroup{}\normalfont{}\textsl{truc}\egroup{}\egroup{}\hfill[cmde]
+\noindent\texttt{\textbf{id ule} 
\bgroup{}\normalfont{}\textsl{truc}\egroup{}}\hfill[cmde]
 
 
 
 \index[fn]{id ule@\texttt{\textbf{id ule}}}%
-\noindent\texttt\bgroup{}\textbf{id `\texttt{i}' ule} 
\bgroup{}\normalfont{}\textsl{truc}\egroup{}\egroup{}\hfill[cmde2]
+\noindent\texttt{\textbf{id `\texttt{i}' ule} 
\bgroup{}\normalfont{}\textsl{truc}\egroup{}}\hfill[cmde2]
 
 
 
 \index[fn]{id i ule@\texttt{\textbf{id `\texttt{i}' ule}}}%
-\noindent\texttt\bgroup{}\egroup{}\hfill[]
+\noindent\texttt{}\hfill[]
 
 
 
-\noindent\texttt\bgroup{}machin\egroup{}\hfill[]
+\noindent\texttt{machin}\hfill[]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt\bgroup{}bidule machin\egroup{}\hfill[]
+\noindent\texttt{bidule machin}\hfill[]
 
 
 
 \index[fn]{bidule machin@\texttt{bidule machin}}%
-\noindent\texttt\bgroup{}machin\egroup{}\hfill[truc]
+\noindent\texttt{machin}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt\bgroup{}\egroup{}\hfill[truc]
+\noindent\texttt{}\hfill[truc]
 
 
 
-\noindent\texttt\bgroup{}followed \bgroup{}\normalfont{}\textsl{by a 
comment}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{followed \bgroup{}\normalfont{}\textsl{by a 
comment}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{followed@\texttt{followed}}%
-\noindent\texttt\bgroup{}\egroup{}\hfill[]
+\noindent\texttt{}\hfill[]
 
 
 
-\noindent\texttt\bgroup{}a \bgroup{}\normalfont{}\textsl{b c d e \textbf{f g} 
h i}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{a \bgroup{}\normalfont{}\textsl{b c d e \textbf{f g} h 
i}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{a@\texttt{a}}%
-\noindent\texttt\bgroup{}deffnx \bgroup{}\normalfont{}\textsl{before end 
deffn}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{deffnx \bgroup{}\normalfont{}\textsl{before end 
deffn}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{deffnx@\texttt{deffnx}}%
 
 
-\noindent\texttt\bgroup{}deffn\egroup{}\hfill[empty]
+\noindent\texttt{deffn}\hfill[empty]
 
 
 
 \index[fn]{deffn@\texttt{deffn}}%
 
-\noindent\texttt\bgroup{}deffn \bgroup{}\normalfont{}\textsl{with 
deffnx}\egroup{}\egroup{}\hfill[empty]
+\noindent\texttt{deffn \bgroup{}\normalfont{}\textsl{with 
deffnx}\egroup{}}\hfill[empty]
 
 
 
 \index[fn]{deffn@\texttt{deffn}}%
-\noindent\texttt\bgroup{}deffnx\egroup{}\hfill[empty]
+\noindent\texttt{deffnx}\hfill[empty]
 
 
 
 \index[fn]{deffnx@\texttt{deffnx}}%
 
-\noindent\texttt\bgroup{}\textsl{i} \bgroup{}\normalfont{}\textsl{a 
g}\egroup{}\egroup{}\hfill[fset]
+\noindent\texttt{\textsl{i} \bgroup{}\normalfont{}\textsl{a 
g}\egroup{}}\hfill[fset]
 
 
 
 \index[fn]{i@\texttt{\textsl{i}}}%
-\noindent\texttt\bgroup{}truc 
\bgroup{}\normalfont{}\textsl{}\egroup{}\egroup{}\hfill[cmde]
+\noindent\texttt{truc \bgroup{}\normalfont{}\textsl{}\egroup{}}\hfill[cmde]
 
 
 
@@ -4821,189 +4821,189 @@ def--fn
 text in def item for second def item
 
 
-\noindent\texttt\bgroup{}d{-}{-}efvr\_name\egroup{}\hfill[c--ategory]
+\noindent\texttt{d{-}{-}efvr\_name}\hfill[c--ategory]
 
 
 
 \index[cp]{d--efvr\_name@\texttt{d{-}{-}efvr\_name}}%
 d--efvr
 
-\noindent\texttt\bgroup{}n{-}{-}ame 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory]
+\noindent\texttt{n{-}{-}ame 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory]
 
 
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
 d--effn
 
-\noindent\texttt\bgroup{}n{-}{-}ame\egroup{}\hfill[c--ategory]
+\noindent\texttt{n{-}{-}ame}\hfill[c--ategory]
 
 
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
 d--effn no arg
 
-\noindent\texttt\bgroup{}t{-}{-}ype d{-}{-}eftypefn\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory]
 
 
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
 d--eftypefn
 
-\noindent\texttt\bgroup{}t{-}{-}ype 
d{-}{-}eftypefn\_name\egroup{}\hfill[c--ategory]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name}\hfill[c--ategory]
 
 
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
 d--eftypefn no arg
 
-\noindent\texttt\bgroup{}t{-}{-}ype d{-}{-}eftypeop\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory
 on \texttt{c{-}{-}lass}]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypeop\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
 
 
 
 \index[fn]{d--eftypeop\_name on c--lass@\texttt{d{-}{-}eftypeop\_name on 
c{-}{-}lass}}%
 d--eftypeop
 
-\noindent\texttt\bgroup{}t{-}{-}ype 
d{-}{-}eftypeop\_name\egroup{}\hfill[c--ategory on \texttt{c{-}{-}lass}]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypeop\_name}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
 
 
 
 \index[fn]{d--eftypeop\_name on c--lass@\texttt{d{-}{-}eftypeop\_name on 
c{-}{-}lass}}%
 d--eftypeop no arg
 
-\noindent\texttt\bgroup{}t{-}{-}ype 
d{-}{-}eftypevr\_name\egroup{}\hfill[c--ategory]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypevr\_name}\hfill[c--ategory]
 
 
 
 \index[cp]{d--eftypevr\_name@\texttt{d{-}{-}eftypevr\_name}}%
 d--eftypevr
 
-\noindent\texttt\bgroup{}d{-}{-}efcv\_name\egroup{}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efcv\_name}\hfill[c--ategory of \texttt{c{-}{-}lass}]
 
 
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
 d--efcv
 
-\noindent\texttt\bgroup{}d{-}{-}efcv\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory
 of \texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efcv\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
 
 
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
 d--efcv with arguments
 
-\noindent\texttt\bgroup{}t{-}{-}ype 
d{-}{-}eftypecv\_name\egroup{}\hfill[c--ategory of \texttt{c{-}{-}lass}]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypecv\_name}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
 
 
 
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name of 
c{-}{-}lass}}%
 d--eftypecv
 
-\noindent\texttt\bgroup{}t{-}{-}ype d{-}{-}eftypecv\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory
 of \texttt{c{-}{-}lass}]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypecv\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
 
 
 
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name of 
c{-}{-}lass}}%
 d--eftypecv with arguments
 
-\noindent\texttt\bgroup{}d{-}{-}efop\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory
 on \texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efop\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
 
 
 
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name on c{-}{-}lass}}%
 d--efop
 
-\noindent\texttt\bgroup{}d{-}{-}efop\_name\egroup{}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efop\_name}\hfill[c--ategory on \texttt{c{-}{-}lass}]
 
 
 
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name on c{-}{-}lass}}%
 d--efop no arg
 
-\noindent\texttt\bgroup{}d{-}{-}eftp\_name 
\bgroup{}\normalfont{}\textsl{a--ttributes...}\egroup{}\egroup{}\hfill[c--ategory]
+\noindent\texttt{d{-}{-}eftp\_name 
\bgroup{}\normalfont{}\textsl{a--ttributes...}\egroup{}}\hfill[c--ategory]
 
 
 
 \index[tp]{d--eftp\_name@\texttt{d{-}{-}eftp\_name}}%
 d--eftp
 
-\noindent\texttt\bgroup{}d{-}{-}efun\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[Function]
+\noindent\texttt{d{-}{-}efun\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[Function]
 
 
 
 \index[fn]{d--efun\_name@\texttt{d{-}{-}efun\_name}}%
 d--efun
 
-\noindent\texttt\bgroup{}d{-}{-}efmac\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[Macro]
+\noindent\texttt{d{-}{-}efmac\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[Macro]
 
 
 
 \index[fn]{d--efmac\_name@\texttt{d{-}{-}efmac\_name}}%
 d--efmac
 
-\noindent\texttt\bgroup{}d{-}{-}efspec\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[Special 
Form]
+\noindent\texttt{d{-}{-}efspec\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[Special Form]
 
 
 
 \index[fn]{d--efspec\_name@\texttt{d{-}{-}efspec\_name}}%
 d--efspec
 
-\noindent\texttt\bgroup{}d{-}{-}efvar\_name\egroup{}\hfill[Variable]
+\noindent\texttt{d{-}{-}efvar\_name}\hfill[Variable]
 
 
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
 d--efvar
 
-\noindent\texttt\bgroup{}d{-}{-}efvar\_name 
\bgroup{}\normalfont{}\textsl{arg--var 
arg--var1}\egroup{}\egroup{}\hfill[Variable]
+\noindent\texttt{d{-}{-}efvar\_name \bgroup{}\normalfont{}\textsl{arg--var 
arg--var1}\egroup{}}\hfill[Variable]
 
 
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
 d--efvar with args
 
-\noindent\texttt\bgroup{}d{-}{-}efopt\_name\egroup{}\hfill[User Option]
+\noindent\texttt{d{-}{-}efopt\_name}\hfill[User Option]
 
 
 
 \index[cp]{d--efopt\_name@\texttt{d{-}{-}efopt\_name}}%
 d--efopt
 
-\noindent\texttt\bgroup{}t{-}{-}ype d{-}{-}eftypefun\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[Function]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypefun\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[Function]
 
 
 
 \index[fn]{d--eftypefun\_name@\texttt{d{-}{-}eftypefun\_name}}%
 d--eftypefun
 
-\noindent\texttt\bgroup{}t{-}{-}ype 
d{-}{-}eftypevar\_name\egroup{}\hfill[Variable]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypevar\_name}\hfill[Variable]
 
 
 
 \index[cp]{d--eftypevar\_name@\texttt{d{-}{-}eftypevar\_name}}%
 d--eftypevar
 
-\noindent\texttt\bgroup{}d{-}{-}efivar\_name\egroup{}\hfill[Instance Variable 
of \texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efivar\_name}\hfill[Instance Variable of 
\texttt{c{-}{-}lass}]
 
 
 
 \index[cp]{d--efivar\_name of c--lass@\texttt{d{-}{-}efivar\_name of 
c{-}{-}lass}}%
 d--efivar
 
-\noindent\texttt\bgroup{}t{-}{-}ype 
d{-}{-}eftypeivar\_name\egroup{}\hfill[Instance Variable of 
\texttt{c{-}{-}lass}]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypeivar\_name}\hfill[Instance Variable 
of \texttt{c{-}{-}lass}]
 
 
 
 \index[cp]{d--eftypeivar\_name of c--lass@\texttt{d{-}{-}eftypeivar\_name of 
c{-}{-}lass}}%
 d--eftypeivar
 
-\noindent\texttt\bgroup{}d{-}{-}efmethod\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[Method on 
\texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efmethod\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[Method on 
\texttt{c{-}{-}lass}]
 
 
 
 \index[fn]{d--efmethod\_name on c--lass@\texttt{d{-}{-}efmethod\_name on 
c{-}{-}lass}}%
 d--efmethod
 
-\noindent\texttt\bgroup{}t{-}{-}ype d{-}{-}eftypemethod\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[Method on 
\texttt{c{-}{-}lass}]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypemethod\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[Method on 
\texttt{c{-}{-}lass}]
 
 
 
@@ -5011,49 +5011,49 @@ d--efmethod
 d--eftypemethod
 
 
-\noindent\texttt\bgroup{}\leavevmode{}\\data-type2\leavevmode{}\\name2 
\bgroup{}\normalfont{}\textsl{arguments2...}\egroup{}\egroup{}\hfill[Function]
+\noindent\texttt{data-type2\leavevmode{}\\name2 
\bgroup{}\normalfont{}\textsl{arguments2...}\egroup{}}\hfill[Function]
 
 
 
 \index[fn]{name2@\texttt{name2}}%
 aaa2
 
-\noindent\texttt\bgroup{}\leavevmode{}\\t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypefn\_name2\egroup{}\hfill[c--ategory2]
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypefn\_name2}\hfill[c--ategory2]
 
 
 
 \index[fn]{d--eftypefn\_name2@\texttt{d{-}{-}eftypefn\_name2}}%
 d--eftypefn no arg2
 
-\noindent\texttt\bgroup{}t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2 
\bgroup{}\normalfont{}\textsl{a--rguments2...}\egroup{}\egroup{}\hfill[c--ategory2
 on \texttt{c{-}{-}lass2}]
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2 
\bgroup{}\normalfont{}\textsl{a--rguments2...}\egroup{}}\hfill[c--ategory2 on 
\texttt{c{-}{-}lass2}]
 
 
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2 on 
c{-}{-}lass2}}%
 d--eftypeop2
 
-\noindent\texttt\bgroup{}t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2\egroup{}\hfill[c--ategory2
 on \texttt{c{-}{-}lass2}]
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2}\hfill[c--ategory2
 on \texttt{c{-}{-}lass2}]
 
 
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2 on 
c{-}{-}lass2}}%
 d--eftypeop no arg2
 
-\noindent\texttt\bgroup{}t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypecv\_name2\egroup{}\hfill[c--ategory2
 of \texttt{c{-}{-}lass2}]
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypecv\_name2}\hfill[c--ategory2
 of \texttt{c{-}{-}lass2}]
 
 
 
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2 of 
c{-}{-}lass2}}%
 d--eftypecv2
 
-\noindent\texttt\bgroup{}t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypecv\_name2 
\bgroup{}\normalfont{}\textsl{a--rguments2...}\egroup{}\egroup{}\hfill[c--ategory2
 of \texttt{c{-}{-}lass2}]
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypecv\_name2 
\bgroup{}\normalfont{}\textsl{a--rguments2...}\egroup{}}\hfill[c--ategory2 of 
\texttt{c{-}{-}lass2}]
 
 
 
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2 of 
c{-}{-}lass2}}%
 d--eftypecv with arguments2
 
-\noindent\texttt\bgroup{}arg2\egroup{}\hfill[fun2]
+\noindent\texttt{arg2}\hfill[fun2]
 
 
 
@@ -5334,61 +5334,61 @@ b
 l--ine
 \end{description}
 
-\noindent\texttt\bgroup{}\egroup{}\hfill[fun]
+\noindent\texttt{}\hfill[fun]
 
 
 
-\noindent\texttt\bgroup{}machin \bgroup{}\normalfont{}\textsl{bidule chose 
and}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{machin \bgroup{}\normalfont{}\textsl{bidule chose 
and}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt\bgroup{}machin \bgroup{}\normalfont{}\textsl{bidule chose and 
 after}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{machin \bgroup{}\normalfont{}\textsl{bidule chose and  
after}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt\bgroup{}machin \bgroup{}\normalfont{}\textsl{bidule chose and 
}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{machin \bgroup{}\normalfont{}\textsl{bidule chose and 
}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt\bgroup{}machin \bgroup{}\normalfont{}\textsl{bidule chose and 
and after}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{machin \bgroup{}\normalfont{}\textsl{bidule chose and and 
after}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt\bgroup{}followed \bgroup{}\normalfont{}\textsl{by a 
comment}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{followed \bgroup{}\normalfont{}\textsl{by a 
comment}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{followed@\texttt{followed}}%
 Various deff lines
-\noindent\texttt\bgroup{}after \bgroup{}\normalfont{}\textsl{a deff 
item}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{after \bgroup{}\normalfont{}\textsl{a deff 
item}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{after@\texttt{after}}%
 
-\noindent\texttt\bgroup{}\textsl{invalid} \bgroup{}\normalfont{}\textsl{a 
g}\egroup{}\egroup{}\hfill[fsetinv]
+\noindent\texttt{\textsl{invalid} \bgroup{}\normalfont{}\textsl{a 
g}\egroup{}}\hfill[fsetinv]
 
 
 
 \index[fn]{invalid@\texttt{\textsl{invalid}}}%
-\noindent\texttt\bgroup{}\egroup{}\hfill[\textbf{id `\texttt{i}' ule}]
+\noindent\texttt{}\hfill[\textbf{id `\texttt{i}' ule}]
 
 
 
 
-\noindent\texttt\bgroup{}\egroup{}\hfill[aaa]
+\noindent\texttt{}\hfill[aaa]
 
 
 
-\noindent\texttt\bgroup{}\egroup{}\hfill[]
+\noindent\texttt{}\hfill[]
 
 
 
-\noindent\texttt\bgroup{}\egroup{}\hfill[truc]
+\noindent\texttt{}\hfill[truc]
 
 
 
@@ -6277,7 +6277,7 @@ s--mallformat
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}d{-}{-}effn\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory]
+\noindent\texttt{d{-}{-}effn\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory]
 
 
 
@@ -6288,7 +6288,7 @@ d{-}{-}effn
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}de{-}{-}ffn\_name 
\bgroup{}\normalfont{}\textsl{ar--guments    more args \leavevmode{}\\ even 
more so}\egroup{}\egroup{}\hfill[cate--gory]
+\noindent\texttt{de{-}{-}ffn\_name \bgroup{}\normalfont{}\textsl{ar--guments   
 more args \leavevmode{}\\ even more so}\egroup{}}\hfill[cate--gory]
 
 
 
@@ -6299,7 +6299,7 @@ def{-}{-}fn
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}\textsl{i} \bgroup{}\normalfont{}\textsl{a 
g}\egroup{}\egroup{}\hfill[fset]
+\noindent\texttt{\textsl{i} \bgroup{}\normalfont{}\textsl{a 
g}\egroup{}}\hfill[fset]
 
 
 
@@ -6307,76 +6307,76 @@ def{-}{-}fn
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 \index[cp]{index entry within deffn}%
 \endgroup{}%
-\noindent\texttt\bgroup{}truc 
\bgroup{}\normalfont{}\textsl{}\egroup{}\egroup{}\hfill[cmde]
+\noindent\texttt{truc \bgroup{}\normalfont{}\textsl{}\egroup{}}\hfill[cmde]
 
 
 
 \index[fn]{truc@\texttt{truc}}%
-\noindent\texttt\bgroup{}log trap 
\bgroup{}\normalfont{}\textsl{}\egroup{}\egroup{}\hfill[Command]
+\noindent\texttt{log trap 
\bgroup{}\normalfont{}\textsl{}\egroup{}}\hfill[Command]
 
 
 
 \index[fn]{log trap@\texttt{log trap}}%
-\noindent\texttt\bgroup{}log trap1 
\bgroup{}\normalfont{}\textsl{}\egroup{}\egroup{}\hfill[Command]
+\noindent\texttt{log trap1 
\bgroup{}\normalfont{}\textsl{}\egroup{}}\hfill[Command]
 
 
 
 \index[fn]{log trap1@\texttt{log trap1}}%
-\noindent\texttt\bgroup{}log trap2 
\bgroup{}\normalfont{}\textsl{}\egroup{}\egroup{}\hfill[Command]
+\noindent\texttt{log trap2 
\bgroup{}\normalfont{}\textsl{}\egroup{}}\hfill[Command]
 
 
 
 \index[fn]{log trap2@\texttt{log trap2}}%
-\noindent\texttt\bgroup{}\textbf{id ule} 
\bgroup{}\normalfont{}\textsl{truc}\egroup{}\egroup{}\hfill[cmde]
+\noindent\texttt{\textbf{id ule} 
\bgroup{}\normalfont{}\textsl{truc}\egroup{}}\hfill[cmde]
 
 
 
 \index[fn]{id ule@\texttt{\textbf{id ule}}}%
-\noindent\texttt\bgroup{}\textbf{id `\texttt{i}' ule} 
\bgroup{}\normalfont{}\textsl{truc}\egroup{}\egroup{}\hfill[cmde2]
+\noindent\texttt{\textbf{id `\texttt{i}' ule} 
\bgroup{}\normalfont{}\textsl{truc}\egroup{}}\hfill[cmde2]
 
 
 
 \index[fn]{id i ule@\texttt{\textbf{id `\texttt{i}' ule}}}%
-\noindent\texttt\bgroup{}\egroup{}\hfill[]
+\noindent\texttt{}\hfill[]
 
 
 
-\noindent\texttt\bgroup{}machin\egroup{}\hfill[]
+\noindent\texttt{machin}\hfill[]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt\bgroup{}bidule machin\egroup{}\hfill[]
+\noindent\texttt{bidule machin}\hfill[]
 
 
 
 \index[fn]{bidule machin@\texttt{bidule machin}}%
-\noindent\texttt\bgroup{}machin\egroup{}\hfill[truc]
+\noindent\texttt{machin}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt\bgroup{}\egroup{}\hfill[truc]
+\noindent\texttt{}\hfill[truc]
 
 
 
-\noindent\texttt\bgroup{}followed \bgroup{}\normalfont{}\textsl{by a 
comment}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{followed \bgroup{}\normalfont{}\textsl{by a 
comment}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{followed@\texttt{followed}}%
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 \endgroup{}%
-\noindent\texttt\bgroup{}\egroup{}\hfill[]
+\noindent\texttt{}\hfill[]
 
 
 
-\noindent\texttt\bgroup{}a \bgroup{}\normalfont{}\textsl{b c d e \textbf{f g} 
h i}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{a \bgroup{}\normalfont{}\textsl{b c d e \textbf{f g} h 
i}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{a@\texttt{a}}%
-\noindent\texttt\bgroup{}deffnx \bgroup{}\normalfont{}\textsl{before end 
deffn}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{deffnx \bgroup{}\normalfont{}\textsl{before end 
deffn}\egroup{}}\hfill[truc]
 
 
 
@@ -6385,7 +6385,7 @@ def{-}{-}fn
 
 
 \endgroup{}%
-\noindent\texttt\bgroup{}deffn\egroup{}\hfill[empty]
+\noindent\texttt{deffn}\hfill[empty]
 
 
 
@@ -6393,14 +6393,14 @@ def{-}{-}fn
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}deffn \bgroup{}\normalfont{}\textsl{with 
deffnx}\egroup{}\egroup{}\hfill[empty]
+\noindent\texttt{deffn \bgroup{}\normalfont{}\textsl{with 
deffnx}\egroup{}}\hfill[empty]
 
 
 
 \index[fn]{deffn@\texttt{deffn}}%
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 \endgroup{}%
-\noindent\texttt\bgroup{}deffnx\egroup{}\hfill[empty]
+\noindent\texttt{deffnx}\hfill[empty]
 
 
 
@@ -6408,12 +6408,12 @@ def{-}{-}fn
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}\textsl{i} \bgroup{}\normalfont{}\textsl{a 
g}\egroup{}\egroup{}\hfill[fset]
+\noindent\texttt{\textsl{i} \bgroup{}\normalfont{}\textsl{a 
g}\egroup{}}\hfill[fset]
 
 
 
 \index[fn]{i@\texttt{\textsl{i}}}%
-\noindent\texttt\bgroup{}truc 
\bgroup{}\normalfont{}\textsl{}\egroup{}\egroup{}\hfill[cmde]
+\noindent\texttt{truc \bgroup{}\normalfont{}\textsl{}\egroup{}}\hfill[cmde]
 
 
 
@@ -6425,7 +6425,7 @@ text in def item for second def item
 
 
 \endgroup{}%
-\noindent\texttt\bgroup{}d{-}{-}efvr\_name\egroup{}\hfill[c--ategory]
+\noindent\texttt{d{-}{-}efvr\_name}\hfill[c--ategory]
 
 
 
@@ -6436,7 +6436,7 @@ d{-}{-}efvr
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}n{-}{-}ame 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory]
+\noindent\texttt{n{-}{-}ame 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory]
 
 
 
@@ -6447,7 +6447,7 @@ d{-}{-}effn
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}n{-}{-}ame\egroup{}\hfill[c--ategory]
+\noindent\texttt{n{-}{-}ame}\hfill[c--ategory]
 
 
 
@@ -6458,7 +6458,7 @@ d{-}{-}effn no arg
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}t{-}{-}ype d{-}{-}eftypefn\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory]
 
 
 
@@ -6469,7 +6469,7 @@ d{-}{-}eftypefn
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}t{-}{-}ype 
d{-}{-}eftypefn\_name\egroup{}\hfill[c--ategory]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name}\hfill[c--ategory]
 
 
 
@@ -6480,7 +6480,7 @@ d{-}{-}eftypefn no arg
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}t{-}{-}ype d{-}{-}eftypeop\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory
 on \texttt{c{-}{-}lass}]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypeop\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
 
 
 
@@ -6491,7 +6491,7 @@ d{-}{-}eftypeop
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}t{-}{-}ype 
d{-}{-}eftypeop\_name\egroup{}\hfill[c--ategory on \texttt{c{-}{-}lass}]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypeop\_name}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
 
 
 
@@ -6502,7 +6502,7 @@ d{-}{-}eftypeop no arg
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}t{-}{-}ype 
d{-}{-}eftypevr\_name\egroup{}\hfill[c--ategory]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypevr\_name}\hfill[c--ategory]
 
 
 
@@ -6513,7 +6513,7 @@ d{-}{-}eftypevr
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}d{-}{-}efcv\_name\egroup{}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efcv\_name}\hfill[c--ategory of \texttt{c{-}{-}lass}]
 
 
 
@@ -6524,7 +6524,7 @@ d{-}{-}efcv
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}d{-}{-}efcv\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory
 of \texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efcv\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
 
 
 
@@ -6535,7 +6535,7 @@ d{-}{-}efcv with arguments
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}t{-}{-}ype 
d{-}{-}eftypecv\_name\egroup{}\hfill[c--ategory of \texttt{c{-}{-}lass}]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypecv\_name}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
 
 
 
@@ -6546,7 +6546,7 @@ d{-}{-}eftypecv
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}t{-}{-}ype d{-}{-}eftypecv\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory
 of \texttt{c{-}{-}lass}]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypecv\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
 
 
 
@@ -6557,7 +6557,7 @@ d{-}{-}eftypecv with arguments
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}d{-}{-}efop\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[c--ategory
 on \texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efop\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
 
 
 
@@ -6568,7 +6568,7 @@ d{-}{-}efop
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}d{-}{-}efop\_name\egroup{}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efop\_name}\hfill[c--ategory on \texttt{c{-}{-}lass}]
 
 
 
@@ -6579,7 +6579,7 @@ d{-}{-}efop no arg
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}d{-}{-}eftp\_name 
\bgroup{}\normalfont{}\textsl{a--ttributes...}\egroup{}\egroup{}\hfill[c--ategory]
+\noindent\texttt{d{-}{-}eftp\_name 
\bgroup{}\normalfont{}\textsl{a--ttributes...}\egroup{}}\hfill[c--ategory]
 
 
 
@@ -6590,7 +6590,7 @@ d{-}{-}eftp
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}d{-}{-}efun\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[Function]
+\noindent\texttt{d{-}{-}efun\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[Function]
 
 
 
@@ -6601,7 +6601,7 @@ d{-}{-}efun
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}d{-}{-}efmac\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[Macro]
+\noindent\texttt{d{-}{-}efmac\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[Macro]
 
 
 
@@ -6612,7 +6612,7 @@ d{-}{-}efmac
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}d{-}{-}efspec\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[Special 
Form]
+\noindent\texttt{d{-}{-}efspec\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[Special Form]
 
 
 
@@ -6623,7 +6623,7 @@ d{-}{-}efspec
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}d{-}{-}efvar\_name\egroup{}\hfill[Variable]
+\noindent\texttt{d{-}{-}efvar\_name}\hfill[Variable]
 
 
 
@@ -6634,7 +6634,7 @@ d{-}{-}efvar
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}d{-}{-}efvar\_name 
\bgroup{}\normalfont{}\textsl{arg--var 
arg--var1}\egroup{}\egroup{}\hfill[Variable]
+\noindent\texttt{d{-}{-}efvar\_name \bgroup{}\normalfont{}\textsl{arg--var 
arg--var1}\egroup{}}\hfill[Variable]
 
 
 
@@ -6645,7 +6645,7 @@ d{-}{-}efvar with args
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}d{-}{-}efopt\_name\egroup{}\hfill[User Option]
+\noindent\texttt{d{-}{-}efopt\_name}\hfill[User Option]
 
 
 
@@ -6656,7 +6656,7 @@ d{-}{-}efopt
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}t{-}{-}ype d{-}{-}eftypefun\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[Function]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypefun\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[Function]
 
 
 
@@ -6667,7 +6667,7 @@ d{-}{-}eftypefun
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}t{-}{-}ype 
d{-}{-}eftypevar\_name\egroup{}\hfill[Variable]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypevar\_name}\hfill[Variable]
 
 
 
@@ -6678,7 +6678,7 @@ d{-}{-}eftypevar
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}d{-}{-}efivar\_name\egroup{}\hfill[Instance Variable 
of \texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efivar\_name}\hfill[Instance Variable of 
\texttt{c{-}{-}lass}]
 
 
 
@@ -6689,7 +6689,7 @@ d{-}{-}efivar
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}t{-}{-}ype 
d{-}{-}eftypeivar\_name\egroup{}\hfill[Instance Variable of 
\texttt{c{-}{-}lass}]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypeivar\_name}\hfill[Instance Variable 
of \texttt{c{-}{-}lass}]
 
 
 
@@ -6700,7 +6700,7 @@ d{-}{-}eftypeivar
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}d{-}{-}efmethod\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[Method on 
\texttt{c{-}{-}lass}]
+\noindent\texttt{d{-}{-}efmethod\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[Method on 
\texttt{c{-}{-}lass}]
 
 
 
@@ -6711,7 +6711,7 @@ d{-}{-}efmethod
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}t{-}{-}ype d{-}{-}eftypemethod\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}\egroup{}\hfill[Method on 
\texttt{c{-}{-}lass}]
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypemethod\_name 
\bgroup{}\normalfont{}\textsl{a--rguments...}\egroup{}}\hfill[Method on 
\texttt{c{-}{-}lass}]
 
 
 
@@ -6723,7 +6723,7 @@ d{-}{-}eftypemethod
 
 
 \endgroup{}%
-\noindent\texttt\bgroup{}\leavevmode{}\\data-type2\leavevmode{}\\name2 
\bgroup{}\normalfont{}\textsl{arguments2...}\egroup{}\egroup{}\hfill[Function]
+\noindent\texttt{data-type2\leavevmode{}\\name2 
\bgroup{}\normalfont{}\textsl{arguments2...}\egroup{}}\hfill[Function]
 
 
 
@@ -6734,7 +6734,7 @@ aaa2
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}\leavevmode{}\\t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypefn\_name2\egroup{}\hfill[c--ategory2]
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypefn\_name2}\hfill[c--ategory2]
 
 
 
@@ -6745,7 +6745,7 @@ d{-}{-}eftypefn no arg2
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2 
\bgroup{}\normalfont{}\textsl{a--rguments2...}\egroup{}\egroup{}\hfill[c--ategory2
 on \texttt{c{-}{-}lass2}]
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2 
\bgroup{}\normalfont{}\textsl{a--rguments2...}\egroup{}}\hfill[c--ategory2 on 
\texttt{c{-}{-}lass2}]
 
 
 
@@ -6756,7 +6756,7 @@ d{-}{-}eftypeop2
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2\egroup{}\hfill[c--ategory2
 on \texttt{c{-}{-}lass2}]
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2}\hfill[c--ategory2
 on \texttt{c{-}{-}lass2}]
 
 
 
@@ -6767,7 +6767,7 @@ d{-}{-}eftypeop no arg2
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypecv\_name2\egroup{}\hfill[c--ategory2
 of \texttt{c{-}{-}lass2}]
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypecv\_name2}\hfill[c--ategory2
 of \texttt{c{-}{-}lass2}]
 
 
 
@@ -6778,7 +6778,7 @@ d{-}{-}eftypecv2
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypecv\_name2 
\bgroup{}\normalfont{}\textsl{a--rguments2...}\egroup{}\egroup{}\hfill[c--ategory2
 of \texttt{c{-}{-}lass2}]
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypecv\_name2 
\bgroup{}\normalfont{}\textsl{a--rguments2...}\egroup{}}\hfill[c--ategory2 of 
\texttt{c{-}{-}lass2}]
 
 
 
@@ -6789,7 +6789,7 @@ d{-}{-}eftypecv with arguments2
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}arg2\egroup{}\hfill[fun2]
+\noindent\texttt{arg2}\hfill[fun2]
 
 
 
@@ -7174,31 +7174,31 @@ l{-}{-}ine
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}\egroup{}\hfill[fun]
+\noindent\texttt{}\hfill[fun]
 
 
 
-\noindent\texttt\bgroup{}machin \bgroup{}\normalfont{}\textsl{bidule chose 
and}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{machin \bgroup{}\normalfont{}\textsl{bidule chose 
and}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt\bgroup{}machin \bgroup{}\normalfont{}\textsl{bidule chose and 
 after}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{machin \bgroup{}\normalfont{}\textsl{bidule chose and  
after}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt\bgroup{}machin \bgroup{}\normalfont{}\textsl{bidule chose and 
}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{machin \bgroup{}\normalfont{}\textsl{bidule chose and 
}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt\bgroup{}machin \bgroup{}\normalfont{}\textsl{bidule chose and 
and after}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{machin \bgroup{}\normalfont{}\textsl{bidule chose and and 
after}\egroup{}}\hfill[truc]
 
 
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt\bgroup{}followed \bgroup{}\normalfont{}\textsl{by a 
comment}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{followed \bgroup{}\normalfont{}\textsl{by a 
comment}\egroup{}}\hfill[truc]
 
 
 
@@ -7206,7 +7206,7 @@ l{-}{-}ine
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 Various deff lines
 \endgroup{}%
-\noindent\texttt\bgroup{}after \bgroup{}\normalfont{}\textsl{a deff 
item}\egroup{}\egroup{}\hfill[truc]
+\noindent\texttt{after \bgroup{}\normalfont{}\textsl{a deff 
item}\egroup{}}\hfill[truc]
 
 
 
@@ -7214,25 +7214,25 @@ Various deff lines
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt\bgroup{}\textsl{invalid} \bgroup{}\normalfont{}\textsl{a 
g}\egroup{}\egroup{}\hfill[fsetinv]
+\noindent\texttt{\textsl{invalid} \bgroup{}\normalfont{}\textsl{a 
g}\egroup{}}\hfill[fsetinv]
 
 
 
 \index[fn]{invalid@\texttt{\textsl{invalid}}}%
-\noindent\texttt\bgroup{}\egroup{}\hfill[\textbf{id `\texttt{i}' ule}]
+\noindent\texttt{}\hfill[\textbf{id `\texttt{i}' ule}]
 
 
 
 
-\noindent\texttt\bgroup{}\egroup{}\hfill[aaa]
+\noindent\texttt{}\hfill[aaa]
 
 
 
-\noindent\texttt\bgroup{}\egroup{}\hfill[]
+\noindent\texttt{}\hfill[]
 
 
 
-\noindent\texttt\bgroup{}\egroup{}\hfill[truc]
+\noindent\texttt{}\hfill[truc]
 
 
 



reply via email to

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