texinfo-commits
[Top][All Lists]
Advanced

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

[no subject]


From: Gavin D. Smith
Date: Sun, 24 Jul 2022 12:02:11 -0400 (EDT)

branch: master
commit 0645d53d7982187d5f9ac62b49d357df8bf62469
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Jul 24 16:51:23 2022 +0100

    @def* in LaTex
    
    * tp/Texinfo/Convert/LaTex.pm (_convert) <def_line>:
    Float category to end of line and typeset in typewriter font, as
    is done in texinfo.tex.
---
 ChangeLog                                          |   10 +-
 tp/Texinfo/Convert/LaTeX.pm                        |   82 +-
 .../res_latex/multiple_lang_chapters.tex           |    9 +-
 .../res_parser/formatting_latex/formatting.tex     | 1020 +++++++++++++-------
 4 files changed, 736 insertions(+), 385 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0dd1d12f9e..3bebbf6f15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
-2022-07-23  Gavin Smith  <gavinsmith0123@gmail.com>
+2022-07-24  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       @def* in LaTex
+
+       * tp/Texinfo/Convert/LaTex.pm (_convert) <def_line>:
+       Float category to end of line and typeset in typewriter font, as
+       is done in texinfo.tex.
+
+2022-07-24  Gavin Smith  <gavinsmith0123@gmail.com>
 
        * NEWS: Update for variable renaming.
 
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index e1962f8d86..761bcaf4a0 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -1,6 +1,6 @@
 # LaTeX.pm: output tree as LaTeX
 #
-# Copyright 2010-2021 Free Software Foundation, Inc.
+# Copyright 2010-2022 Free Software Foundation, Inc.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 #
 # TODO
 #
-# @def* not implemented (code from Plaintext was kept as-is), including
+# @def* not finished (code from Plaintext was kept as-is), including
 # effect of @deftypefnnewline
 #
 # @shortcontent is not implemented.  Tried shorttoc package but it
@@ -3303,6 +3303,9 @@ sub _convert($$)
         } else {
           $name = '';
         }
+        $result .= '\noindent\texttt\bgroup{}';
+
+        my $category = $element->{'extra'}->{'def_parsed_hash'}->{'category'};
         
         if ($command eq 'deffn'
             or $command eq 'defvr'
@@ -3311,143 +3314,140 @@ sub _convert($$)
                  or $command eq 'deftypevr')
                 and !$element->{'extra'}->{'def_parsed_hash'}->{'type'})) {
           if ($arguments) {
-            $tree = $self->gdt("\@tie{}-- {category}: {name} {arguments}", {
-                    'category' => 
$element->{'extra'}->{'def_parsed_hash'}->{'category'},
+            $tree = $self->gdt("{name} {arguments}", {
                     'name' => $name,
                     'arguments' => $arguments});
           } else {
-            $tree = $self->gdt("\@tie{}-- {category}: {name}", {
-                    'category' => 
$element->{'extra'}->{'def_parsed_hash'}->{'category'},
+            $tree = $self->gdt("{name}", {
                     'name' => $name});
           }
         } elsif ($command eq 'deftypefn'
                  or $command eq 'deftypevr') {
           if ($arguments) {
             my $strings = {
-                    'category' => 
$element->{'extra'}->{'def_parsed_hash'}->{'category'},
                     'name' => $name,
                     'type' => 
$element->{'extra'}->{'def_parsed_hash'}->{'type'},
                     'arguments' => $arguments};
             if ($self->get_conf('deftypefnnewline') eq 'on') {
-              $tree = $self->gdt("\@tie{}-- {category}:\@*{type}\@*{name} 
{arguments}",
+              $tree = $self->gdt("\@*{type}\@*{name} {arguments}",
                                  $strings);
             } else {
-              $tree = $self->gdt("\@tie{}-- {category}: {type} {name} 
{arguments}",
+              $tree = $self->gdt("{type} {name} {arguments}",
                                  $strings);
             }
           } else {
             my $strings = {
-                    'category' => 
$element->{'extra'}->{'def_parsed_hash'}->{'category'},
                     'type' => 
$element->{'extra'}->{'def_parsed_hash'}->{'type'},
                     'name' => $name};
             if ($self->get_conf('deftypefnnewline') eq 'on') {
-              $tree = $self->gdt("\@tie{}-- {category}:\@*{type}\@*{name}",
+              $tree = $self->gdt("\@*{type}\@*{name}",
                                  $strings);
             } else {
-              $tree = $self->gdt("\@tie{}-- {category}: {type} {name}",
+              $tree = $self->gdt("{type} {name}",
                                  $strings);
             }
           }
         } elsif ($command eq 'defcv'
                  or ($command eq 'deftypecv'
                      and !$element->{'extra'}->{'def_parsed_hash'}->{'type'})) 
{
+          $category =  $self->gdt("{category} of {class}",
+                          { 'category' => 
$element->{'extra'}->{'def_parsed_hash'}->{'category'},
+                            'class' => 
$element->{'extra'}->{'def_parsed_hash'}->{'class'} } );
           if ($arguments) {
-            $tree = $self->gdt("\@tie{}-- {category} of {class}: {name} 
{arguments}", {
-                    'category' => 
$element->{'extra'}->{'def_parsed_hash'}->{'category'},
+            $tree = $self->gdt("{name} {arguments}", {
                     'name' => $name,
-                    'class' => 
$element->{'extra'}->{'def_parsed_hash'}->{'class'},
                     'arguments' => $arguments});
           } else {
-            $tree = $self->gdt("\@tie{}-- {category} of {class}: {name}", {
-                    'category' => 
$element->{'extra'}->{'def_parsed_hash'}->{'category'},
-                    'class' => 
$element->{'extra'}->{'def_parsed_hash'}->{'class'},
+            $tree = $self->gdt("{name}", {
                     'name' => $name});
           }
         } elsif ($command eq 'defop'
                  or ($command eq 'deftypeop'
                      and !$element->{'extra'}->{'def_parsed_hash'}->{'type'})) 
{
+          $category =  $self->gdt("{category} on {class}",
+                          { 'category' => 
$element->{'extra'}->{'def_parsed_hash'}->{'category'},
+                            'class' => 
$element->{'extra'}->{'def_parsed_hash'}->{'class'} } );
           if ($arguments) {
-            $tree = $self->gdt("\@tie{}-- {category} on {class}: {name} 
{arguments}", {
-                    'category' => 
$element->{'extra'}->{'def_parsed_hash'}->{'category'},
+            $tree = $self->gdt("{name} {arguments}", {
                     'name' => $name,
-                    'class' => 
$element->{'extra'}->{'def_parsed_hash'}->{'class'},
                     'arguments' => $arguments});
           } else {
-            $tree = $self->gdt("\@tie{}-- {category} on {class}: {name}", {
-                    'category' => 
$element->{'extra'}->{'def_parsed_hash'}->{'category'},
-                    'class' => 
$element->{'extra'}->{'def_parsed_hash'}->{'class'},
+            $tree = $self->gdt("{name}", {
                     'name' => $name});
           }
         } elsif ($command eq 'deftypeop') {
+          $category =  $self->gdt("{category} on {class}",
+                          { 'category' => 
$element->{'extra'}->{'def_parsed_hash'}->{'category'},
+                            'class' => 
$element->{'extra'}->{'def_parsed_hash'}->{'class'} } );
           if ($arguments) {
             my $strings = {
-                    'category' => 
$element->{'extra'}->{'def_parsed_hash'}->{'category'},
                     'name' => $name,
-                    'class' => 
$element->{'extra'}->{'def_parsed_hash'}->{'class'},
                     'type' => 
$element->{'extra'}->{'def_parsed_hash'}->{'type'},
                     'arguments' => $arguments};
+
             if ($self->get_conf('deftypefnnewline') eq 'on') {
               $tree
-                = $self->gdt("\@tie{}-- {category} on 
{class}:\@*{type}\@*{name} {arguments}",
+                = $self->gdt("{type}\@*{name} {arguments}",
                              $strings);
             } else {
               $tree
-                = $self->gdt("\@tie{}-- {category} on {class}: {type} {name} 
{arguments}",
+                = $self->gdt("{type} {name} {arguments}",
                              $strings);
             }
           } else {
             my $strings = {
-                    'category' => 
$element->{'extra'}->{'def_parsed_hash'}->{'category'},
                     'type' => 
$element->{'extra'}->{'def_parsed_hash'}->{'type'},
-                    'class' => 
$element->{'extra'}->{'def_parsed_hash'}->{'class'},
                     'name' => $name};
             if ($self->get_conf('deftypefnnewline') eq 'on') {
               $tree
-                = $self->gdt("\@tie{}-- {category} on 
{class}:\@*{type}\@*{name}",
+                = $self->gdt("{type}\@*{name}",
                              $strings);
             } else {
               $tree
-                = $self->gdt("\@tie{}-- {category} on {class}: {type} {name}",
+                = $self->gdt("{type} {name}",
                              $strings);
             }
           }
         } elsif ($command eq 'deftypecv') {
+          $category =  $self->gdt("{category} of {class}",
+                          { 'category' => 
$element->{'extra'}->{'def_parsed_hash'}->{'category'},
+                            'class' => 
$element->{'extra'}->{'def_parsed_hash'}->{'class'} } );
           if ($arguments) {
             my $strings = {
-                    'category' => 
$element->{'extra'}->{'def_parsed_hash'}->{'category'},
                     'name' => $name,
-                    'class' => 
$element->{'extra'}->{'def_parsed_hash'}->{'class'},
                     'type' => 
$element->{'extra'}->{'def_parsed_hash'}->{'type'},
                     'arguments' => $arguments};
             if ($self->get_conf('deftypefnnewline') eq 'on') {
               $tree
-                = $self->gdt("\@tie{}-- {category} of 
{class}:\@*{type}\@*{name} {arguments}",
+                = $self->gdt("{type}\@*{name} {arguments}",
                              $strings);
             } else {
               $tree
-                = $self->gdt("\@tie{}-- {category} of {class}: {type} {name} 
{arguments}",
+                = $self->gdt("{type} {name} {arguments}",
                              $strings);
             }
           } else {
             my $strings = {
-                    'category' => 
$element->{'extra'}->{'def_parsed_hash'}->{'category'},
                     'type' => 
$element->{'extra'}->{'def_parsed_hash'}->{'type'},
-                    'class' => 
$element->{'extra'}->{'def_parsed_hash'}->{'class'},
                     'name' => $name};
             if ($self->get_conf('deftypefnnewline') eq 'on') {
               $tree
-                = $self->gdt("\@tie{}-- {category} of 
{class}:\@*{type}\@*{name}",
+                = $self->gdt("{type}\@*{name}",
                              $strings);
             } else {
               $tree
-                = $self->gdt("\@tie{}-- {category} of {class}: {type} {name}",
+                = $self->gdt("{type} {name}",
                              $strings);
             }
           }
         }
 
-
         $result .= _convert($self, {'type' => '_code', 'contents' => [$tree]});
+        $result .= '\egroup{}'; # \texttt
+        if (defined($category)) {
+          my $converted = _convert($self, $category);
+          $result .= "\\hfill[$converted]\n";
+        }
         $result .= "\n\n";
       }
       $result .= "\n";
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 837e85ff18..e386053ea8 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,8 @@
 \label{anchor:chapter-ja}%
 
 In japanese. See 
\hyperref[anchor:chapter-ja]{\chaptername~\ref*{anchor:chapter-ja} [chapter 
ja], page~\pageref*{anchor:chapter-ja}}.
-\hbox{}-- Instance Variable of AAA: BBB CCC
+\noindent\texttt\bgroup{}BBB CCC\egroup{}\hfill[Instance Variable of AAA]
+
 
 
 \index[vr]{BBB of AAA@\texttt{BBB of AAA}}%
@@ -85,7 +86,8 @@ 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}}.
-\hbox{}-- Instance Variable of AAA: BBB CCC
+\noindent\texttt\bgroup{}BBB CCC\egroup{}\hfill[Instance Variable of AAA]
+
 
 
 \index[vr]{BBB of AAA@\texttt{BBB of AAA}}%
@@ -94,7 +96,8 @@ In english. See 
\hyperref[anchor:chapter-ja]{\chaptername~\ref*{anchor:chapter-j
 \chapter{fr\_FR}
 \label{anchor:chapter-fr_005fFR}%
 
-\hbox{}-- Variable d'instance de AAA\ {}: BBB CCC
+\noindent\texttt\bgroup{}BBB CCC\egroup{}\hfill[Variable d'instance de AAA]
+
 
 
 \index[vr]{BBB of AAA@\texttt{BBB of AAA}}%
diff --git a/tp/tests/layout/res_parser/formatting_latex/formatting.tex 
b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
index b3084587a0..50e07705e8 100644
--- a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
+++ b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
@@ -711,320 +711,381 @@ disp--laymath
 f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 2}\left({x-\mu \over 
\sigma}\right)^2}
 $$
 
-\hbox{}-- c--ategory: d--effn\_name a--rguments...
+\noindent\texttt\bgroup{}d--effn\_name 
a--rguments...\egroup{}\hfill[c--ategory]
+
 
 
 \index[fn]{d--effn\_name@\texttt{d{-}{-}effn\_name}}%
 d--effn
 
-\hbox{}-- cate--gory: de--ffn\_name ar--guments    more args \leavevmode{}\\ 
even more so
+\noindent\texttt\bgroup{}de--ffn\_name ar--guments    more args 
\leavevmode{}\\ even more so\egroup{}\hfill[cate--gory]
+
 
 
 \index[fn]{de--ffn\_name@\texttt{de{-}{-}ffn\_name}}%
 def--fn
 
-\hbox{}-- fset: \emph{i} a g
+\noindent\texttt\bgroup{}\emph{i} a g\egroup{}\hfill[fset]
+
 
 
 \index[fn]{i@\texttt{\emph{i}}}%
 \index[cp]{index entry within deffn}%
-\hbox{}-- cmde: truc 
+\noindent\texttt\bgroup{}truc \egroup{}\hfill[cmde]
+
 
 
 \index[fn]{truc@\texttt{truc}}%
-\hbox{}-- Command: log trap 
+\noindent\texttt\bgroup{}log trap \egroup{}\hfill[Command]
+
 
 
 \index[fn]{log trap@\texttt{log trap}}%
-\hbox{}-- Command: log trap1 
+\noindent\texttt\bgroup{}log trap1 \egroup{}\hfill[Command]
+
 
 
 \index[fn]{log trap1@\texttt{log trap1}}%
-\hbox{}-- Command: log trap2 
+\noindent\texttt\bgroup{}log trap2 \egroup{}\hfill[Command]
+
 
 
 \index[fn]{log trap2@\texttt{log trap2}}%
-\hbox{}-- cmde: \textbf{id ule} truc
+\noindent\texttt\bgroup{}\textbf{id ule} truc\egroup{}\hfill[cmde]
+
 
 
 \index[fn]{id ule@\texttt{\textbf{id ule}}}%
-\hbox{}-- cmde2: \textbf{id `\texttt{i}' ule} truc
+\noindent\texttt\bgroup{}\textbf{id `\texttt{i}' ule} 
truc\egroup{}\hfill[cmde2]
+
 
 
 \index[fn]{id i ule@\texttt{\textbf{id `\texttt{i}' ule}}}%
-\hbox{}-- \textbf{id `\texttt{i}' ule}: 
+\noindent\texttt\bgroup{}\egroup{}\hfill[\textbf{id `\texttt{i}' ule}]
+
+
 
 
+\noindent\texttt\bgroup{}\egroup{}\hfill[aaa]
 
-\hbox{}-- aaa: 
 
 
-\hbox{}-- : 
+\noindent\texttt\bgroup{}\egroup{}\hfill[]
 
 
-\hbox{}-- : 
 
+\noindent\texttt\bgroup{}\egroup{}\hfill[]
+
+
+
+\noindent\texttt\bgroup{}machin\egroup{}\hfill[]
 
-\hbox{}-- : machin
 
 
 \index[fn]{machin@\texttt{machin}}%
-\hbox{}-- : bidule machin
+\noindent\texttt\bgroup{}bidule machin\egroup{}\hfill[]
+
 
 
 \index[fn]{bidule machin@\texttt{bidule machin}}%
-\hbox{}-- truc: machin
+\noindent\texttt\bgroup{}machin\egroup{}\hfill[truc]
+
 
 
 \index[fn]{machin@\texttt{machin}}%
-\hbox{}-- truc: 
+\noindent\texttt\bgroup{}\egroup{}\hfill[truc]
+
 
 
-\hbox{}-- truc: followed by a comment
+\noindent\texttt\bgroup{}followed by a comment\egroup{}\hfill[truc]
+
 
 
 \index[fn]{followed@\texttt{followed}}%
-\hbox{}-- truc: 
+\noindent\texttt\bgroup{}\egroup{}\hfill[truc]
+
+
 
+\noindent\texttt\bgroup{}\egroup{}\hfill[]
 
-\hbox{}-- : 
 
 
-\hbox{}-- truc: a b c d e \textbf{f g} h i
+\noindent\texttt\bgroup{}a b c d e \textbf{f g} h i\egroup{}\hfill[truc]
+
 
 
 \index[fn]{a@\texttt{a}}%
-\hbox{}-- truc: deffnx before end deffn
+\noindent\texttt\bgroup{}deffnx before end deffn\egroup{}\hfill[truc]
+
 
 
 \index[fn]{deffnx@\texttt{deffnx}}%
 
 
-\hbox{}-- empty: deffn
+\noindent\texttt\bgroup{}deffn\egroup{}\hfill[empty]
+
 
 
 \index[fn]{deffn@\texttt{deffn}}%
 
-\hbox{}-- empty: deffn with deffnx
+\noindent\texttt\bgroup{}deffn with deffnx\egroup{}\hfill[empty]
+
 
 
 \index[fn]{deffn@\texttt{deffn}}%
-\hbox{}-- empty: deffnx
+\noindent\texttt\bgroup{}deffnx\egroup{}\hfill[empty]
+
 
 
 \index[fn]{deffnx@\texttt{deffnx}}%
 
-\hbox{}-- fset: \emph{i} a g
+\noindent\texttt\bgroup{}\emph{i} a g\egroup{}\hfill[fset]
+
 
 
 \index[fn]{i@\texttt{\emph{i}}}%
-\hbox{}-- cmde: truc 
+\noindent\texttt\bgroup{}truc \egroup{}\hfill[cmde]
+
 
 
 \index[fn]{truc@\texttt{truc}}%
 text in def item for second def item
 
 
-\hbox{}-- c--ategory: d--efvr\_name
+\noindent\texttt\bgroup{}d--efvr\_name\egroup{}\hfill[c--ategory]
+
 
 
 \index[cp]{d--efvr\_name@\texttt{d{-}{-}efvr\_name}}%
 d--efvr
 
-\hbox{}-- c--ategory: n--ame a--rguments...
+\noindent\texttt\bgroup{}n--ame a--rguments...\egroup{}\hfill[c--ategory]
+
 
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
 d--effn
 
-\hbox{}-- c--ategory: n--ame
+\noindent\texttt\bgroup{}n--ame\egroup{}\hfill[c--ategory]
+
 
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
 d--effn no arg
 
-\hbox{}-- c--ategory: t--ype d--eftypefn\_name a--rguments...
+\noindent\texttt\bgroup{}t--ype d--eftypefn\_name 
a--rguments...\egroup{}\hfill[c--ategory]
+
 
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
 d--eftypefn
 
-\hbox{}-- c--ategory: t--ype d--eftypefn\_name
+\noindent\texttt\bgroup{}t--ype d--eftypefn\_name\egroup{}\hfill[c--ategory]
+
 
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
 d--eftypefn no arg
 
-\hbox{}-- c--ategory on c--lass: t--ype d--eftypeop\_name a--rguments...
+\noindent\texttt\bgroup{}t--ype d--eftypeop\_name 
a--rguments...\egroup{}\hfill[c--ategory on c--lass]
+
 
 
 \index[fn]{d--eftypeop\_name on c--lass@\texttt{d{-}{-}eftypeop\_name on 
c{-}{-}lass}}%
 d--eftypeop
 
-\hbox{}-- c--ategory on c--lass: t--ype d--eftypeop\_name
+\noindent\texttt\bgroup{}t--ype d--eftypeop\_name\egroup{}\hfill[c--ategory on 
c--lass]
+
 
 
 \index[fn]{d--eftypeop\_name on c--lass@\texttt{d{-}{-}eftypeop\_name on 
c{-}{-}lass}}%
 d--eftypeop no arg
 
-\hbox{}-- c--ategory: t--ype d--eftypevr\_name
+\noindent\texttt\bgroup{}t--ype d--eftypevr\_name\egroup{}\hfill[c--ategory]
+
 
 
 \index[cp]{d--eftypevr\_name@\texttt{d{-}{-}eftypevr\_name}}%
 d--eftypevr
 
-\hbox{}-- c--ategory of c--lass: d--efcv\_name
+\noindent\texttt\bgroup{}d--efcv\_name\egroup{}\hfill[c--ategory of c--lass]
+
 
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
 d--efcv
 
-\hbox{}-- c--ategory of c--lass: d--efcv\_name a--rguments...
+\noindent\texttt\bgroup{}d--efcv\_name 
a--rguments...\egroup{}\hfill[c--ategory of c--lass]
+
 
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
 d--efcv with arguments
 
-\hbox{}-- c--ategory of c--lass: t--ype d--eftypecv\_name
+\noindent\texttt\bgroup{}t--ype d--eftypecv\_name\egroup{}\hfill[c--ategory of 
c--lass]
+
 
 
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name of 
c{-}{-}lass}}%
 d--eftypecv
 
-\hbox{}-- c--ategory of c--lass: t--ype d--eftypecv\_name a--rguments...
+\noindent\texttt\bgroup{}t--ype d--eftypecv\_name 
a--rguments...\egroup{}\hfill[c--ategory of c--lass]
+
 
 
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name of 
c{-}{-}lass}}%
 d--eftypecv with arguments
 
-\hbox{}-- c--ategory on c--lass: d--efop\_name a--rguments...
+\noindent\texttt\bgroup{}d--efop\_name 
a--rguments...\egroup{}\hfill[c--ategory on c--lass]
+
 
 
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name on c{-}{-}lass}}%
 d--efop
 
-\hbox{}-- c--ategory on c--lass: d--efop\_name
+\noindent\texttt\bgroup{}d--efop\_name\egroup{}\hfill[c--ategory on c--lass]
+
 
 
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name on c{-}{-}lass}}%
 d--efop no arg
 
-\hbox{}-- c--ategory: d--eftp\_name a--ttributes...
+\noindent\texttt\bgroup{}d--eftp\_name 
a--ttributes...\egroup{}\hfill[c--ategory]
+
 
 
 \index[tp]{d--eftp\_name@\texttt{d{-}{-}eftp\_name}}%
 d--eftp
 
-\hbox{}-- Function: d--efun\_name a--rguments...
+\noindent\texttt\bgroup{}d--efun\_name a--rguments...\egroup{}\hfill[Function]
+
 
 
 \index[fn]{d--efun\_name@\texttt{d{-}{-}efun\_name}}%
 d--efun
 
-\hbox{}-- Macro: d--efmac\_name a--rguments...
+\noindent\texttt\bgroup{}d--efmac\_name a--rguments...\egroup{}\hfill[Macro]
+
 
 
 \index[fn]{d--efmac\_name@\texttt{d{-}{-}efmac\_name}}%
 d--efmac
 
-\hbox{}-- Special Form: d--efspec\_name a--rguments...
+\noindent\texttt\bgroup{}d--efspec\_name a--rguments...\egroup{}\hfill[Special 
Form]
+
 
 
 \index[fn]{d--efspec\_name@\texttt{d{-}{-}efspec\_name}}%
 d--efspec
 
-\hbox{}-- Variable: d--efvar\_name
+\noindent\texttt\bgroup{}d--efvar\_name\egroup{}\hfill[Variable]
+
 
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
 d--efvar
 
-\hbox{}-- Variable: d--efvar\_name arg--var arg--var1
+\noindent\texttt\bgroup{}d--efvar\_name arg--var 
arg--var1\egroup{}\hfill[Variable]
+
 
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
 d--efvar with args
 
-\hbox{}-- User Option: d--efopt\_name
+\noindent\texttt\bgroup{}d--efopt\_name\egroup{}\hfill[User Option]
+
 
 
 \index[cp]{d--efopt\_name@\texttt{d{-}{-}efopt\_name}}%
 d--efopt
 
-\hbox{}-- Function: t--ype d--eftypefun\_name a--rguments...
+\noindent\texttt\bgroup{}t--ype d--eftypefun\_name 
a--rguments...\egroup{}\hfill[Function]
+
 
 
 \index[fn]{d--eftypefun\_name@\texttt{d{-}{-}eftypefun\_name}}%
 d--eftypefun
 
-\hbox{}-- Variable: t--ype d--eftypevar\_name
+\noindent\texttt\bgroup{}t--ype d--eftypevar\_name\egroup{}\hfill[Variable]
+
 
 
 \index[cp]{d--eftypevar\_name@\texttt{d{-}{-}eftypevar\_name}}%
 d--eftypevar
 
-\hbox{}-- Instance Variable of c--lass: d--efivar\_name
+\noindent\texttt\bgroup{}d--efivar\_name\egroup{}\hfill[Instance Variable of 
c--lass]
+
 
 
 \index[cp]{d--efivar\_name of c--lass@\texttt{d{-}{-}efivar\_name of 
c{-}{-}lass}}%
 d--efivar
 
-\hbox{}-- Instance Variable of c--lass: t--ype d--eftypeivar\_name
+\noindent\texttt\bgroup{}t--ype d--eftypeivar\_name\egroup{}\hfill[Instance 
Variable of c--lass]
+
 
 
 \index[cp]{d--eftypeivar\_name of c--lass@\texttt{d{-}{-}eftypeivar\_name of 
c{-}{-}lass}}%
 d--eftypeivar
 
-\hbox{}-- Method on c--lass: d--efmethod\_name a--rguments...
+\noindent\texttt\bgroup{}d--efmethod\_name 
a--rguments...\egroup{}\hfill[Method on c--lass]
+
 
 
 \index[fn]{d--efmethod\_name on c--lass@\texttt{d{-}{-}efmethod\_name on 
c{-}{-}lass}}%
 d--efmethod
 
-\hbox{}-- Method on c--lass: t--ype d--eftypemethod\_name a--rguments...
+\noindent\texttt\bgroup{}t--ype d--eftypemethod\_name 
a--rguments...\egroup{}\hfill[Method on c--lass]
+
 
 
 \index[fn]{d--eftypemethod\_name on c--lass@\texttt{d{-}{-}eftypemethod\_name 
on c{-}{-}lass}}%
 d--eftypemethod
 
 
-\hbox{}-- Function:\leavevmode{}\\data-type2\leavevmode{}\\name2 arguments2...
+\noindent\texttt\bgroup{}\leavevmode{}\\data-type2\leavevmode{}\\name2 
arguments2...\egroup{}\hfill[Function]
+
 
 
 \index[fn]{name2@\texttt{name2}}%
 aaa2
 
-\hbox{}-- c--ategory2:\leavevmode{}\\t--ype2\leavevmode{}\\d--eftypefn\_name2
+\noindent\texttt\bgroup{}\leavevmode{}\\t--ype2\leavevmode{}\\d--eftypefn\_name2\egroup{}\hfill[c--ategory2]
+
 
 
 \index[fn]{d--eftypefn\_name2@\texttt{d{-}{-}eftypefn\_name2}}%
 d--eftypefn no arg2
 
-\hbox{}-- c--ategory2 on 
c--lass2:\leavevmode{}\\t--ype2\leavevmode{}\\d--eftypeop\_name2 a--rguments2...
+\noindent\texttt\bgroup{}t--ype2\leavevmode{}\\d--eftypeop\_name2 
a--rguments2...\egroup{}\hfill[c--ategory2 on c--lass2]
+
 
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2 on 
c{-}{-}lass2}}%
 d--eftypeop2
 
-\hbox{}-- c--ategory2 on 
c--lass2:\leavevmode{}\\t--ype2\leavevmode{}\\d--eftypeop\_name2
+\noindent\texttt\bgroup{}t--ype2\leavevmode{}\\d--eftypeop\_name2\egroup{}\hfill[c--ategory2
 on c--lass2]
+
 
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2 on 
c{-}{-}lass2}}%
 d--eftypeop no arg2
 
-\hbox{}-- c--ategory2 of 
c--lass2:\leavevmode{}\\t--ype2\leavevmode{}\\d--eftypecv\_name2
+\noindent\texttt\bgroup{}t--ype2\leavevmode{}\\d--eftypecv\_name2\egroup{}\hfill[c--ategory2
 of c--lass2]
+
 
 
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2 of 
c{-}{-}lass2}}%
 d--eftypecv2
 
-\hbox{}-- c--ategory2 of 
c--lass2:\leavevmode{}\\t--ype2\leavevmode{}\\d--eftypecv\_name2 a--rguments2...
+\noindent\texttt\bgroup{}t--ype2\leavevmode{}\\d--eftypecv\_name2 
a--rguments2...\egroup{}\hfill[c--ategory2 of c--lass2]
+
 
 
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2 of 
c{-}{-}lass2}}%
 d--eftypecv with arguments2
 
-\hbox{}-- fun2: arg2
+\noindent\texttt\bgroup{}arg2\egroup{}\hfill[fun2]
+
 
 
 \index[fn]{arg2@\texttt{arg2}}%
@@ -1272,31 +1333,38 @@ b
 l--ine
 \end{description}
 
-\hbox{}-- fun: 
+\noindent\texttt\bgroup{}\egroup{}\hfill[fun]
+
 
 
-\hbox{}-- truc: machin bidule chose and
+\noindent\texttt\bgroup{}machin bidule chose and\egroup{}\hfill[truc]
+
 
 
 \index[fn]{machin@\texttt{machin}}%
-\hbox{}-- truc: machin bidule chose and  after
+\noindent\texttt\bgroup{}machin bidule chose and  after\egroup{}\hfill[truc]
+
 
 
 \index[fn]{machin@\texttt{machin}}%
-\hbox{}-- truc: machin bidule chose and 
+\noindent\texttt\bgroup{}machin bidule chose and \egroup{}\hfill[truc]
+
 
 
 \index[fn]{machin@\texttt{machin}}%
-\hbox{}-- truc: machin bidule chose and and after
+\noindent\texttt\bgroup{}machin bidule chose and and after\egroup{}\hfill[truc]
+
 
 
 \index[fn]{machin@\texttt{machin}}%
-\hbox{}-- truc: followed by a comment
+\noindent\texttt\bgroup{}followed by a comment\egroup{}\hfill[truc]
+
 
 
 \index[fn]{followed@\texttt{followed}}%
 Various deff lines
-\hbox{}-- truc: after a deff item
+\noindent\texttt\bgroup{}after a deff item\egroup{}\hfill[truc]
+
 
 
 \index[fn]{after@\texttt{after}}%
@@ -1944,320 +2012,381 @@ disp--laymath
 f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 2}\left({x-\mu \over 
\sigma}\right)^2}
 $$
 
-\hbox{}-- c--ategory: d--effn\_name a--rguments...
+\noindent\texttt\bgroup{}d--effn\_name 
a--rguments...\egroup{}\hfill[c--ategory]
+
 
 
 \index[fn]{d--effn\_name@\texttt{d{-}{-}effn\_name}}%
 d--effn
 
-\hbox{}-- cate--gory: de--ffn\_name ar--guments    more args \leavevmode{}\\ 
even more so
+\noindent\texttt\bgroup{}de--ffn\_name ar--guments    more args 
\leavevmode{}\\ even more so\egroup{}\hfill[cate--gory]
+
 
 
 \index[fn]{de--ffn\_name@\texttt{de{-}{-}ffn\_name}}%
 def--fn
 
-\hbox{}-- fset: \emph{i} a g
+\noindent\texttt\bgroup{}\emph{i} a g\egroup{}\hfill[fset]
+
 
 
 \index[fn]{i@\texttt{\emph{i}}}%
 \index[cp]{index entry within deffn}%
-\hbox{}-- cmde: truc 
+\noindent\texttt\bgroup{}truc \egroup{}\hfill[cmde]
+
 
 
 \index[fn]{truc@\texttt{truc}}%
-\hbox{}-- Command: log trap 
+\noindent\texttt\bgroup{}log trap \egroup{}\hfill[Command]
+
 
 
 \index[fn]{log trap@\texttt{log trap}}%
-\hbox{}-- Command: log trap1 
+\noindent\texttt\bgroup{}log trap1 \egroup{}\hfill[Command]
+
 
 
 \index[fn]{log trap1@\texttt{log trap1}}%
-\hbox{}-- Command: log trap2 
+\noindent\texttt\bgroup{}log trap2 \egroup{}\hfill[Command]
+
 
 
 \index[fn]{log trap2@\texttt{log trap2}}%
-\hbox{}-- cmde: \textbf{id ule} truc
+\noindent\texttt\bgroup{}\textbf{id ule} truc\egroup{}\hfill[cmde]
+
 
 
 \index[fn]{id ule@\texttt{\textbf{id ule}}}%
-\hbox{}-- cmde2: \textbf{id `\texttt{i}' ule} truc
+\noindent\texttt\bgroup{}\textbf{id `\texttt{i}' ule} 
truc\egroup{}\hfill[cmde2]
+
 
 
 \index[fn]{id i ule@\texttt{\textbf{id `\texttt{i}' ule}}}%
-\hbox{}-- \textbf{id `\texttt{i}' ule}: 
+\noindent\texttt\bgroup{}\egroup{}\hfill[\textbf{id `\texttt{i}' ule}]
+
+
+
 
+\noindent\texttt\bgroup{}\egroup{}\hfill[aaa]
 
 
-\hbox{}-- aaa: 
 
+\noindent\texttt\bgroup{}\egroup{}\hfill[]
 
-\hbox{}-- : 
 
 
-\hbox{}-- : 
+\noindent\texttt\bgroup{}\egroup{}\hfill[]
 
 
-\hbox{}-- : machin
+
+\noindent\texttt\bgroup{}machin\egroup{}\hfill[]
+
 
 
 \index[fn]{machin@\texttt{machin}}%
-\hbox{}-- : bidule machin
+\noindent\texttt\bgroup{}bidule machin\egroup{}\hfill[]
+
 
 
 \index[fn]{bidule machin@\texttt{bidule machin}}%
-\hbox{}-- truc: machin
+\noindent\texttt\bgroup{}machin\egroup{}\hfill[truc]
+
 
 
 \index[fn]{machin@\texttt{machin}}%
-\hbox{}-- truc: 
+\noindent\texttt\bgroup{}\egroup{}\hfill[truc]
+
 
 
-\hbox{}-- truc: followed by a comment
+\noindent\texttt\bgroup{}followed by a comment\egroup{}\hfill[truc]
+
 
 
 \index[fn]{followed@\texttt{followed}}%
-\hbox{}-- truc: 
+\noindent\texttt\bgroup{}\egroup{}\hfill[truc]
+
+
 
+\noindent\texttt\bgroup{}\egroup{}\hfill[]
 
-\hbox{}-- : 
 
 
-\hbox{}-- truc: a b c d e \textbf{f g} h i
+\noindent\texttt\bgroup{}a b c d e \textbf{f g} h i\egroup{}\hfill[truc]
+
 
 
 \index[fn]{a@\texttt{a}}%
-\hbox{}-- truc: deffnx before end deffn
+\noindent\texttt\bgroup{}deffnx before end deffn\egroup{}\hfill[truc]
+
 
 
 \index[fn]{deffnx@\texttt{deffnx}}%
 
 
-\hbox{}-- empty: deffn
+\noindent\texttt\bgroup{}deffn\egroup{}\hfill[empty]
+
 
 
 \index[fn]{deffn@\texttt{deffn}}%
 
-\hbox{}-- empty: deffn with deffnx
+\noindent\texttt\bgroup{}deffn with deffnx\egroup{}\hfill[empty]
+
 
 
 \index[fn]{deffn@\texttt{deffn}}%
-\hbox{}-- empty: deffnx
+\noindent\texttt\bgroup{}deffnx\egroup{}\hfill[empty]
+
 
 
 \index[fn]{deffnx@\texttt{deffnx}}%
 
-\hbox{}-- fset: \emph{i} a g
+\noindent\texttt\bgroup{}\emph{i} a g\egroup{}\hfill[fset]
+
 
 
 \index[fn]{i@\texttt{\emph{i}}}%
-\hbox{}-- cmde: truc 
+\noindent\texttt\bgroup{}truc \egroup{}\hfill[cmde]
+
 
 
 \index[fn]{truc@\texttt{truc}}%
 text in def item for second def item
 
 
-\hbox{}-- c--ategory: d--efvr\_name
+\noindent\texttt\bgroup{}d--efvr\_name\egroup{}\hfill[c--ategory]
+
 
 
 \index[cp]{d--efvr\_name@\texttt{d{-}{-}efvr\_name}}%
 d--efvr
 
-\hbox{}-- c--ategory: n--ame a--rguments...
+\noindent\texttt\bgroup{}n--ame a--rguments...\egroup{}\hfill[c--ategory]
+
 
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
 d--effn
 
-\hbox{}-- c--ategory: n--ame
+\noindent\texttt\bgroup{}n--ame\egroup{}\hfill[c--ategory]
+
 
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
 d--effn no arg
 
-\hbox{}-- c--ategory: t--ype d--eftypefn\_name a--rguments...
+\noindent\texttt\bgroup{}t--ype d--eftypefn\_name 
a--rguments...\egroup{}\hfill[c--ategory]
+
 
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
 d--eftypefn
 
-\hbox{}-- c--ategory: t--ype d--eftypefn\_name
+\noindent\texttt\bgroup{}t--ype d--eftypefn\_name\egroup{}\hfill[c--ategory]
+
 
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
 d--eftypefn no arg
 
-\hbox{}-- c--ategory on c--lass: t--ype d--eftypeop\_name a--rguments...
+\noindent\texttt\bgroup{}t--ype d--eftypeop\_name 
a--rguments...\egroup{}\hfill[c--ategory on c--lass]
+
 
 
 \index[fn]{d--eftypeop\_name on c--lass@\texttt{d{-}{-}eftypeop\_name on 
c{-}{-}lass}}%
 d--eftypeop
 
-\hbox{}-- c--ategory on c--lass: t--ype d--eftypeop\_name
+\noindent\texttt\bgroup{}t--ype d--eftypeop\_name\egroup{}\hfill[c--ategory on 
c--lass]
+
 
 
 \index[fn]{d--eftypeop\_name on c--lass@\texttt{d{-}{-}eftypeop\_name on 
c{-}{-}lass}}%
 d--eftypeop no arg
 
-\hbox{}-- c--ategory: t--ype d--eftypevr\_name
+\noindent\texttt\bgroup{}t--ype d--eftypevr\_name\egroup{}\hfill[c--ategory]
+
 
 
 \index[cp]{d--eftypevr\_name@\texttt{d{-}{-}eftypevr\_name}}%
 d--eftypevr
 
-\hbox{}-- c--ategory of c--lass: d--efcv\_name
+\noindent\texttt\bgroup{}d--efcv\_name\egroup{}\hfill[c--ategory of c--lass]
+
 
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
 d--efcv
 
-\hbox{}-- c--ategory of c--lass: d--efcv\_name a--rguments...
+\noindent\texttt\bgroup{}d--efcv\_name 
a--rguments...\egroup{}\hfill[c--ategory of c--lass]
+
 
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
 d--efcv with arguments
 
-\hbox{}-- c--ategory of c--lass: t--ype d--eftypecv\_name
+\noindent\texttt\bgroup{}t--ype d--eftypecv\_name\egroup{}\hfill[c--ategory of 
c--lass]
+
 
 
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name of 
c{-}{-}lass}}%
 d--eftypecv
 
-\hbox{}-- c--ategory of c--lass: t--ype d--eftypecv\_name a--rguments...
+\noindent\texttt\bgroup{}t--ype d--eftypecv\_name 
a--rguments...\egroup{}\hfill[c--ategory of c--lass]
+
 
 
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name of 
c{-}{-}lass}}%
 d--eftypecv with arguments
 
-\hbox{}-- c--ategory on c--lass: d--efop\_name a--rguments...
+\noindent\texttt\bgroup{}d--efop\_name 
a--rguments...\egroup{}\hfill[c--ategory on c--lass]
+
 
 
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name on c{-}{-}lass}}%
 d--efop
 
-\hbox{}-- c--ategory on c--lass: d--efop\_name
+\noindent\texttt\bgroup{}d--efop\_name\egroup{}\hfill[c--ategory on c--lass]
+
 
 
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name on c{-}{-}lass}}%
 d--efop no arg
 
-\hbox{}-- c--ategory: d--eftp\_name a--ttributes...
+\noindent\texttt\bgroup{}d--eftp\_name 
a--ttributes...\egroup{}\hfill[c--ategory]
+
 
 
 \index[tp]{d--eftp\_name@\texttt{d{-}{-}eftp\_name}}%
 d--eftp
 
-\hbox{}-- Function: d--efun\_name a--rguments...
+\noindent\texttt\bgroup{}d--efun\_name a--rguments...\egroup{}\hfill[Function]
+
 
 
 \index[fn]{d--efun\_name@\texttt{d{-}{-}efun\_name}}%
 d--efun
 
-\hbox{}-- Macro: d--efmac\_name a--rguments...
+\noindent\texttt\bgroup{}d--efmac\_name a--rguments...\egroup{}\hfill[Macro]
+
 
 
 \index[fn]{d--efmac\_name@\texttt{d{-}{-}efmac\_name}}%
 d--efmac
 
-\hbox{}-- Special Form: d--efspec\_name a--rguments...
+\noindent\texttt\bgroup{}d--efspec\_name a--rguments...\egroup{}\hfill[Special 
Form]
+
 
 
 \index[fn]{d--efspec\_name@\texttt{d{-}{-}efspec\_name}}%
 d--efspec
 
-\hbox{}-- Variable: d--efvar\_name
+\noindent\texttt\bgroup{}d--efvar\_name\egroup{}\hfill[Variable]
+
 
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
 d--efvar
 
-\hbox{}-- Variable: d--efvar\_name arg--var arg--var1
+\noindent\texttt\bgroup{}d--efvar\_name arg--var 
arg--var1\egroup{}\hfill[Variable]
+
 
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
 d--efvar with args
 
-\hbox{}-- User Option: d--efopt\_name
+\noindent\texttt\bgroup{}d--efopt\_name\egroup{}\hfill[User Option]
+
 
 
 \index[cp]{d--efopt\_name@\texttt{d{-}{-}efopt\_name}}%
 d--efopt
 
-\hbox{}-- Function: t--ype d--eftypefun\_name a--rguments...
+\noindent\texttt\bgroup{}t--ype d--eftypefun\_name 
a--rguments...\egroup{}\hfill[Function]
+
 
 
 \index[fn]{d--eftypefun\_name@\texttt{d{-}{-}eftypefun\_name}}%
 d--eftypefun
 
-\hbox{}-- Variable: t--ype d--eftypevar\_name
+\noindent\texttt\bgroup{}t--ype d--eftypevar\_name\egroup{}\hfill[Variable]
+
 
 
 \index[cp]{d--eftypevar\_name@\texttt{d{-}{-}eftypevar\_name}}%
 d--eftypevar
 
-\hbox{}-- Instance Variable of c--lass: d--efivar\_name
+\noindent\texttt\bgroup{}d--efivar\_name\egroup{}\hfill[Instance Variable of 
c--lass]
+
 
 
 \index[cp]{d--efivar\_name of c--lass@\texttt{d{-}{-}efivar\_name of 
c{-}{-}lass}}%
 d--efivar
 
-\hbox{}-- Instance Variable of c--lass: t--ype d--eftypeivar\_name
+\noindent\texttt\bgroup{}t--ype d--eftypeivar\_name\egroup{}\hfill[Instance 
Variable of c--lass]
+
 
 
 \index[cp]{d--eftypeivar\_name of c--lass@\texttt{d{-}{-}eftypeivar\_name of 
c{-}{-}lass}}%
 d--eftypeivar
 
-\hbox{}-- Method on c--lass: d--efmethod\_name a--rguments...
+\noindent\texttt\bgroup{}d--efmethod\_name 
a--rguments...\egroup{}\hfill[Method on c--lass]
+
 
 
 \index[fn]{d--efmethod\_name on c--lass@\texttt{d{-}{-}efmethod\_name on 
c{-}{-}lass}}%
 d--efmethod
 
-\hbox{}-- Method on c--lass: t--ype d--eftypemethod\_name a--rguments...
+\noindent\texttt\bgroup{}t--ype d--eftypemethod\_name 
a--rguments...\egroup{}\hfill[Method on c--lass]
+
 
 
 \index[fn]{d--eftypemethod\_name on c--lass@\texttt{d{-}{-}eftypemethod\_name 
on c{-}{-}lass}}%
 d--eftypemethod
 
 
-\hbox{}-- Function:\leavevmode{}\\data-type2\leavevmode{}\\name2 arguments2...
+\noindent\texttt\bgroup{}\leavevmode{}\\data-type2\leavevmode{}\\name2 
arguments2...\egroup{}\hfill[Function]
+
 
 
 \index[fn]{name2@\texttt{name2}}%
 aaa2
 
-\hbox{}-- c--ategory2:\leavevmode{}\\t--ype2\leavevmode{}\\d--eftypefn\_name2
+\noindent\texttt\bgroup{}\leavevmode{}\\t--ype2\leavevmode{}\\d--eftypefn\_name2\egroup{}\hfill[c--ategory2]
+
 
 
 \index[fn]{d--eftypefn\_name2@\texttt{d{-}{-}eftypefn\_name2}}%
 d--eftypefn no arg2
 
-\hbox{}-- c--ategory2 on 
c--lass2:\leavevmode{}\\t--ype2\leavevmode{}\\d--eftypeop\_name2 a--rguments2...
+\noindent\texttt\bgroup{}t--ype2\leavevmode{}\\d--eftypeop\_name2 
a--rguments2...\egroup{}\hfill[c--ategory2 on c--lass2]
+
 
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2 on 
c{-}{-}lass2}}%
 d--eftypeop2
 
-\hbox{}-- c--ategory2 on 
c--lass2:\leavevmode{}\\t--ype2\leavevmode{}\\d--eftypeop\_name2
+\noindent\texttt\bgroup{}t--ype2\leavevmode{}\\d--eftypeop\_name2\egroup{}\hfill[c--ategory2
 on c--lass2]
+
 
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2 on 
c{-}{-}lass2}}%
 d--eftypeop no arg2
 
-\hbox{}-- c--ategory2 of 
c--lass2:\leavevmode{}\\t--ype2\leavevmode{}\\d--eftypecv\_name2
+\noindent\texttt\bgroup{}t--ype2\leavevmode{}\\d--eftypecv\_name2\egroup{}\hfill[c--ategory2
 of c--lass2]
+
 
 
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2 of 
c{-}{-}lass2}}%
 d--eftypecv2
 
-\hbox{}-- c--ategory2 of 
c--lass2:\leavevmode{}\\t--ype2\leavevmode{}\\d--eftypecv\_name2 a--rguments2...
+\noindent\texttt\bgroup{}t--ype2\leavevmode{}\\d--eftypecv\_name2 
a--rguments2...\egroup{}\hfill[c--ategory2 of c--lass2]
+
 
 
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2 of 
c{-}{-}lass2}}%
 d--eftypecv with arguments2
 
-\hbox{}-- fun2: arg2
+\noindent\texttt\bgroup{}arg2\egroup{}\hfill[fun2]
+
 
 
 \index[fn]{arg2@\texttt{arg2}}%
@@ -2505,31 +2634,38 @@ b
 l--ine
 \end{description}
 
-\hbox{}-- fun: 
+\noindent\texttt\bgroup{}\egroup{}\hfill[fun]
+
+
 
+\noindent\texttt\bgroup{}machin bidule chose and\egroup{}\hfill[truc]
 
-\hbox{}-- truc: machin bidule chose and
 
 
 \index[fn]{machin@\texttt{machin}}%
-\hbox{}-- truc: machin bidule chose and  after
+\noindent\texttt\bgroup{}machin bidule chose and  after\egroup{}\hfill[truc]
+
 
 
 \index[fn]{machin@\texttt{machin}}%
-\hbox{}-- truc: machin bidule chose and 
+\noindent\texttt\bgroup{}machin bidule chose and \egroup{}\hfill[truc]
+
 
 
 \index[fn]{machin@\texttt{machin}}%
-\hbox{}-- truc: machin bidule chose and and after
+\noindent\texttt\bgroup{}machin bidule chose and and after\egroup{}\hfill[truc]
+
 
 
 \index[fn]{machin@\texttt{machin}}%
-\hbox{}-- truc: followed by a comment
+\noindent\texttt\bgroup{}followed by a comment\egroup{}\hfill[truc]
+
 
 
 \index[fn]{followed@\texttt{followed}}%
 Various deff lines
-\hbox{}-- truc: after a deff item
+\noindent\texttt\bgroup{}after a deff item\egroup{}\hfill[truc]
+
 
 
 \index[fn]{after@\texttt{after}}%
@@ -3197,320 +3333,381 @@ disp--laymath
 f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 2}\left({x-\mu \over 
\sigma}\right)^2}
 $$
 
-\hbox{}-- c--ategory: d--effn\_name a--rguments...
+\noindent\texttt\bgroup{}d--effn\_name 
a--rguments...\egroup{}\hfill[c--ategory]
+
 
 
 \index[fn]{d--effn\_name@\texttt{d{-}{-}effn\_name}}%
 d--effn
 
-\hbox{}-- cate--gory: de--ffn\_name ar--guments    more args \leavevmode{}\\ 
even more so
+\noindent\texttt\bgroup{}de--ffn\_name ar--guments    more args 
\leavevmode{}\\ even more so\egroup{}\hfill[cate--gory]
+
 
 
 \index[fn]{de--ffn\_name@\texttt{de{-}{-}ffn\_name}}%
 def--fn
 
-\hbox{}-- fset: \emph{i} a g
+\noindent\texttt\bgroup{}\emph{i} a g\egroup{}\hfill[fset]
+
 
 
 \index[fn]{i@\texttt{\emph{i}}}%
 \index[cp]{index entry within deffn}%
-\hbox{}-- cmde: truc 
+\noindent\texttt\bgroup{}truc \egroup{}\hfill[cmde]
+
 
 
 \index[fn]{truc@\texttt{truc}}%
-\hbox{}-- Command: log trap 
+\noindent\texttt\bgroup{}log trap \egroup{}\hfill[Command]
+
 
 
 \index[fn]{log trap@\texttt{log trap}}%
-\hbox{}-- Command: log trap1 
+\noindent\texttt\bgroup{}log trap1 \egroup{}\hfill[Command]
+
 
 
 \index[fn]{log trap1@\texttt{log trap1}}%
-\hbox{}-- Command: log trap2 
+\noindent\texttt\bgroup{}log trap2 \egroup{}\hfill[Command]
+
 
 
 \index[fn]{log trap2@\texttt{log trap2}}%
-\hbox{}-- cmde: \textbf{id ule} truc
+\noindent\texttt\bgroup{}\textbf{id ule} truc\egroup{}\hfill[cmde]
+
 
 
 \index[fn]{id ule@\texttt{\textbf{id ule}}}%
-\hbox{}-- cmde2: \textbf{id `\texttt{i}' ule} truc
+\noindent\texttt\bgroup{}\textbf{id `\texttt{i}' ule} 
truc\egroup{}\hfill[cmde2]
+
 
 
 \index[fn]{id i ule@\texttt{\textbf{id `\texttt{i}' ule}}}%
-\hbox{}-- \textbf{id `\texttt{i}' ule}: 
+\noindent\texttt\bgroup{}\egroup{}\hfill[\textbf{id `\texttt{i}' ule}]
+
+
+
+
+\noindent\texttt\bgroup{}\egroup{}\hfill[aaa]
 
 
 
-\hbox{}-- aaa: 
+\noindent\texttt\bgroup{}\egroup{}\hfill[]
 
 
-\hbox{}-- : 
 
+\noindent\texttt\bgroup{}\egroup{}\hfill[]
 
-\hbox{}-- : 
 
 
-\hbox{}-- : machin
+\noindent\texttt\bgroup{}machin\egroup{}\hfill[]
+
 
 
 \index[fn]{machin@\texttt{machin}}%
-\hbox{}-- : bidule machin
+\noindent\texttt\bgroup{}bidule machin\egroup{}\hfill[]
+
 
 
 \index[fn]{bidule machin@\texttt{bidule machin}}%
-\hbox{}-- truc: machin
+\noindent\texttt\bgroup{}machin\egroup{}\hfill[truc]
+
 
 
 \index[fn]{machin@\texttt{machin}}%
-\hbox{}-- truc: 
+\noindent\texttt\bgroup{}\egroup{}\hfill[truc]
 
 
-\hbox{}-- truc: followed by a comment
+
+\noindent\texttt\bgroup{}followed by a comment\egroup{}\hfill[truc]
+
 
 
 \index[fn]{followed@\texttt{followed}}%
-\hbox{}-- truc: 
+\noindent\texttt\bgroup{}\egroup{}\hfill[truc]
+
 
 
-\hbox{}-- : 
+\noindent\texttt\bgroup{}\egroup{}\hfill[]
 
 
-\hbox{}-- truc: a b c d e \textbf{f g} h i
+
+\noindent\texttt\bgroup{}a b c d e \textbf{f g} h i\egroup{}\hfill[truc]
+
 
 
 \index[fn]{a@\texttt{a}}%
-\hbox{}-- truc: deffnx before end deffn
+\noindent\texttt\bgroup{}deffnx before end deffn\egroup{}\hfill[truc]
+
 
 
 \index[fn]{deffnx@\texttt{deffnx}}%
 
 
-\hbox{}-- empty: deffn
+\noindent\texttt\bgroup{}deffn\egroup{}\hfill[empty]
+
 
 
 \index[fn]{deffn@\texttt{deffn}}%
 
-\hbox{}-- empty: deffn with deffnx
+\noindent\texttt\bgroup{}deffn with deffnx\egroup{}\hfill[empty]
+
 
 
 \index[fn]{deffn@\texttt{deffn}}%
-\hbox{}-- empty: deffnx
+\noindent\texttt\bgroup{}deffnx\egroup{}\hfill[empty]
+
 
 
 \index[fn]{deffnx@\texttt{deffnx}}%
 
-\hbox{}-- fset: \emph{i} a g
+\noindent\texttt\bgroup{}\emph{i} a g\egroup{}\hfill[fset]
+
 
 
 \index[fn]{i@\texttt{\emph{i}}}%
-\hbox{}-- cmde: truc 
+\noindent\texttt\bgroup{}truc \egroup{}\hfill[cmde]
+
 
 
 \index[fn]{truc@\texttt{truc}}%
 text in def item for second def item
 
 
-\hbox{}-- c--ategory: d--efvr\_name
+\noindent\texttt\bgroup{}d--efvr\_name\egroup{}\hfill[c--ategory]
+
 
 
 \index[cp]{d--efvr\_name@\texttt{d{-}{-}efvr\_name}}%
 d--efvr
 
-\hbox{}-- c--ategory: n--ame a--rguments...
+\noindent\texttt\bgroup{}n--ame a--rguments...\egroup{}\hfill[c--ategory]
+
 
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
 d--effn
 
-\hbox{}-- c--ategory: n--ame
+\noindent\texttt\bgroup{}n--ame\egroup{}\hfill[c--ategory]
+
 
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
 d--effn no arg
 
-\hbox{}-- c--ategory: t--ype d--eftypefn\_name a--rguments...
+\noindent\texttt\bgroup{}t--ype d--eftypefn\_name 
a--rguments...\egroup{}\hfill[c--ategory]
+
 
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
 d--eftypefn
 
-\hbox{}-- c--ategory: t--ype d--eftypefn\_name
+\noindent\texttt\bgroup{}t--ype d--eftypefn\_name\egroup{}\hfill[c--ategory]
+
 
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
 d--eftypefn no arg
 
-\hbox{}-- c--ategory on c--lass: t--ype d--eftypeop\_name a--rguments...
+\noindent\texttt\bgroup{}t--ype d--eftypeop\_name 
a--rguments...\egroup{}\hfill[c--ategory on c--lass]
+
 
 
 \index[fn]{d--eftypeop\_name on c--lass@\texttt{d{-}{-}eftypeop\_name on 
c{-}{-}lass}}%
 d--eftypeop
 
-\hbox{}-- c--ategory on c--lass: t--ype d--eftypeop\_name
+\noindent\texttt\bgroup{}t--ype d--eftypeop\_name\egroup{}\hfill[c--ategory on 
c--lass]
+
 
 
 \index[fn]{d--eftypeop\_name on c--lass@\texttt{d{-}{-}eftypeop\_name on 
c{-}{-}lass}}%
 d--eftypeop no arg
 
-\hbox{}-- c--ategory: t--ype d--eftypevr\_name
+\noindent\texttt\bgroup{}t--ype d--eftypevr\_name\egroup{}\hfill[c--ategory]
+
 
 
 \index[cp]{d--eftypevr\_name@\texttt{d{-}{-}eftypevr\_name}}%
 d--eftypevr
 
-\hbox{}-- c--ategory of c--lass: d--efcv\_name
+\noindent\texttt\bgroup{}d--efcv\_name\egroup{}\hfill[c--ategory of c--lass]
+
 
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
 d--efcv
 
-\hbox{}-- c--ategory of c--lass: d--efcv\_name a--rguments...
+\noindent\texttt\bgroup{}d--efcv\_name 
a--rguments...\egroup{}\hfill[c--ategory of c--lass]
+
 
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
 d--efcv with arguments
 
-\hbox{}-- c--ategory of c--lass: t--ype d--eftypecv\_name
+\noindent\texttt\bgroup{}t--ype d--eftypecv\_name\egroup{}\hfill[c--ategory of 
c--lass]
+
 
 
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name of 
c{-}{-}lass}}%
 d--eftypecv
 
-\hbox{}-- c--ategory of c--lass: t--ype d--eftypecv\_name a--rguments...
+\noindent\texttt\bgroup{}t--ype d--eftypecv\_name 
a--rguments...\egroup{}\hfill[c--ategory of c--lass]
+
 
 
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name of 
c{-}{-}lass}}%
 d--eftypecv with arguments
 
-\hbox{}-- c--ategory on c--lass: d--efop\_name a--rguments...
+\noindent\texttt\bgroup{}d--efop\_name 
a--rguments...\egroup{}\hfill[c--ategory on c--lass]
+
 
 
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name on c{-}{-}lass}}%
 d--efop
 
-\hbox{}-- c--ategory on c--lass: d--efop\_name
+\noindent\texttt\bgroup{}d--efop\_name\egroup{}\hfill[c--ategory on c--lass]
+
 
 
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name on c{-}{-}lass}}%
 d--efop no arg
 
-\hbox{}-- c--ategory: d--eftp\_name a--ttributes...
+\noindent\texttt\bgroup{}d--eftp\_name 
a--ttributes...\egroup{}\hfill[c--ategory]
+
 
 
 \index[tp]{d--eftp\_name@\texttt{d{-}{-}eftp\_name}}%
 d--eftp
 
-\hbox{}-- Function: d--efun\_name a--rguments...
+\noindent\texttt\bgroup{}d--efun\_name a--rguments...\egroup{}\hfill[Function]
+
 
 
 \index[fn]{d--efun\_name@\texttt{d{-}{-}efun\_name}}%
 d--efun
 
-\hbox{}-- Macro: d--efmac\_name a--rguments...
+\noindent\texttt\bgroup{}d--efmac\_name a--rguments...\egroup{}\hfill[Macro]
+
 
 
 \index[fn]{d--efmac\_name@\texttt{d{-}{-}efmac\_name}}%
 d--efmac
 
-\hbox{}-- Special Form: d--efspec\_name a--rguments...
+\noindent\texttt\bgroup{}d--efspec\_name a--rguments...\egroup{}\hfill[Special 
Form]
+
 
 
 \index[fn]{d--efspec\_name@\texttt{d{-}{-}efspec\_name}}%
 d--efspec
 
-\hbox{}-- Variable: d--efvar\_name
+\noindent\texttt\bgroup{}d--efvar\_name\egroup{}\hfill[Variable]
+
 
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
 d--efvar
 
-\hbox{}-- Variable: d--efvar\_name arg--var arg--var1
+\noindent\texttt\bgroup{}d--efvar\_name arg--var 
arg--var1\egroup{}\hfill[Variable]
+
 
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
 d--efvar with args
 
-\hbox{}-- User Option: d--efopt\_name
+\noindent\texttt\bgroup{}d--efopt\_name\egroup{}\hfill[User Option]
+
 
 
 \index[cp]{d--efopt\_name@\texttt{d{-}{-}efopt\_name}}%
 d--efopt
 
-\hbox{}-- Function: t--ype d--eftypefun\_name a--rguments...
+\noindent\texttt\bgroup{}t--ype d--eftypefun\_name 
a--rguments...\egroup{}\hfill[Function]
+
 
 
 \index[fn]{d--eftypefun\_name@\texttt{d{-}{-}eftypefun\_name}}%
 d--eftypefun
 
-\hbox{}-- Variable: t--ype d--eftypevar\_name
+\noindent\texttt\bgroup{}t--ype d--eftypevar\_name\egroup{}\hfill[Variable]
+
 
 
 \index[cp]{d--eftypevar\_name@\texttt{d{-}{-}eftypevar\_name}}%
 d--eftypevar
 
-\hbox{}-- Instance Variable of c--lass: d--efivar\_name
+\noindent\texttt\bgroup{}d--efivar\_name\egroup{}\hfill[Instance Variable of 
c--lass]
+
 
 
 \index[cp]{d--efivar\_name of c--lass@\texttt{d{-}{-}efivar\_name of 
c{-}{-}lass}}%
 d--efivar
 
-\hbox{}-- Instance Variable of c--lass: t--ype d--eftypeivar\_name
+\noindent\texttt\bgroup{}t--ype d--eftypeivar\_name\egroup{}\hfill[Instance 
Variable of c--lass]
+
 
 
 \index[cp]{d--eftypeivar\_name of c--lass@\texttt{d{-}{-}eftypeivar\_name of 
c{-}{-}lass}}%
 d--eftypeivar
 
-\hbox{}-- Method on c--lass: d--efmethod\_name a--rguments...
+\noindent\texttt\bgroup{}d--efmethod\_name 
a--rguments...\egroup{}\hfill[Method on c--lass]
+
 
 
 \index[fn]{d--efmethod\_name on c--lass@\texttt{d{-}{-}efmethod\_name on 
c{-}{-}lass}}%
 d--efmethod
 
-\hbox{}-- Method on c--lass: t--ype d--eftypemethod\_name a--rguments...
+\noindent\texttt\bgroup{}t--ype d--eftypemethod\_name 
a--rguments...\egroup{}\hfill[Method on c--lass]
+
 
 
 \index[fn]{d--eftypemethod\_name on c--lass@\texttt{d{-}{-}eftypemethod\_name 
on c{-}{-}lass}}%
 d--eftypemethod
 
 
-\hbox{}-- Function:\leavevmode{}\\data-type2\leavevmode{}\\name2 arguments2...
+\noindent\texttt\bgroup{}\leavevmode{}\\data-type2\leavevmode{}\\name2 
arguments2...\egroup{}\hfill[Function]
+
 
 
 \index[fn]{name2@\texttt{name2}}%
 aaa2
 
-\hbox{}-- c--ategory2:\leavevmode{}\\t--ype2\leavevmode{}\\d--eftypefn\_name2
+\noindent\texttt\bgroup{}\leavevmode{}\\t--ype2\leavevmode{}\\d--eftypefn\_name2\egroup{}\hfill[c--ategory2]
+
 
 
 \index[fn]{d--eftypefn\_name2@\texttt{d{-}{-}eftypefn\_name2}}%
 d--eftypefn no arg2
 
-\hbox{}-- c--ategory2 on 
c--lass2:\leavevmode{}\\t--ype2\leavevmode{}\\d--eftypeop\_name2 a--rguments2...
+\noindent\texttt\bgroup{}t--ype2\leavevmode{}\\d--eftypeop\_name2 
a--rguments2...\egroup{}\hfill[c--ategory2 on c--lass2]
+
 
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2 on 
c{-}{-}lass2}}%
 d--eftypeop2
 
-\hbox{}-- c--ategory2 on 
c--lass2:\leavevmode{}\\t--ype2\leavevmode{}\\d--eftypeop\_name2
+\noindent\texttt\bgroup{}t--ype2\leavevmode{}\\d--eftypeop\_name2\egroup{}\hfill[c--ategory2
 on c--lass2]
+
 
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2 on 
c{-}{-}lass2}}%
 d--eftypeop no arg2
 
-\hbox{}-- c--ategory2 of 
c--lass2:\leavevmode{}\\t--ype2\leavevmode{}\\d--eftypecv\_name2
+\noindent\texttt\bgroup{}t--ype2\leavevmode{}\\d--eftypecv\_name2\egroup{}\hfill[c--ategory2
 of c--lass2]
+
 
 
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2 of 
c{-}{-}lass2}}%
 d--eftypecv2
 
-\hbox{}-- c--ategory2 of 
c--lass2:\leavevmode{}\\t--ype2\leavevmode{}\\d--eftypecv\_name2 a--rguments2...
+\noindent\texttt\bgroup{}t--ype2\leavevmode{}\\d--eftypecv\_name2 
a--rguments2...\egroup{}\hfill[c--ategory2 of c--lass2]
+
 
 
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2 of 
c{-}{-}lass2}}%
 d--eftypecv with arguments2
 
-\hbox{}-- fun2: arg2
+\noindent\texttt\bgroup{}arg2\egroup{}\hfill[fun2]
+
 
 
 \index[fn]{arg2@\texttt{arg2}}%
@@ -3758,31 +3955,38 @@ b
 l--ine
 \end{description}
 
-\hbox{}-- fun: 
+\noindent\texttt\bgroup{}\egroup{}\hfill[fun]
+
 
 
-\hbox{}-- truc: machin bidule chose and
+\noindent\texttt\bgroup{}machin bidule chose and\egroup{}\hfill[truc]
+
 
 
 \index[fn]{machin@\texttt{machin}}%
-\hbox{}-- truc: machin bidule chose and  after
+\noindent\texttt\bgroup{}machin bidule chose and  after\egroup{}\hfill[truc]
+
 
 
 \index[fn]{machin@\texttt{machin}}%
-\hbox{}-- truc: machin bidule chose and 
+\noindent\texttt\bgroup{}machin bidule chose and \egroup{}\hfill[truc]
+
 
 
 \index[fn]{machin@\texttt{machin}}%
-\hbox{}-- truc: machin bidule chose and and after
+\noindent\texttt\bgroup{}machin bidule chose and and after\egroup{}\hfill[truc]
+
 
 
 \index[fn]{machin@\texttt{machin}}%
-\hbox{}-- truc: followed by a comment
+\noindent\texttt\bgroup{}followed by a comment\egroup{}\hfill[truc]
+
 
 
 \index[fn]{followed@\texttt{followed}}%
 Various deff lines
-\hbox{}-- truc: after a deff item
+\noindent\texttt\bgroup{}after a deff item\egroup{}\hfill[truc]
+
 
 
 \index[fn]{after@\texttt{after}}%
@@ -4429,320 +4633,381 @@ disp--laymath
 f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 2}\left({x-\mu \over 
\sigma}\right)^2}
 $$
 
-\hbox{}-- c--ategory: d--effn\_name a--rguments...
+\noindent\texttt\bgroup{}d--effn\_name 
a--rguments...\egroup{}\hfill[c--ategory]
+
 
 
 \index[fn]{d--effn\_name@\texttt{d{-}{-}effn\_name}}%
 d--effn
 
-\hbox{}-- cate--gory: de--ffn\_name ar--guments    more args \leavevmode{}\\ 
even more so
+\noindent\texttt\bgroup{}de--ffn\_name ar--guments    more args 
\leavevmode{}\\ even more so\egroup{}\hfill[cate--gory]
+
 
 
 \index[fn]{de--ffn\_name@\texttt{de{-}{-}ffn\_name}}%
 def--fn
 
-\hbox{}-- fset: \emph{i} a g
+\noindent\texttt\bgroup{}\emph{i} a g\egroup{}\hfill[fset]
+
 
 
 \index[fn]{i@\texttt{\emph{i}}}%
 \index[cp]{index entry within deffn}%
-\hbox{}-- cmde: truc 
+\noindent\texttt\bgroup{}truc \egroup{}\hfill[cmde]
+
 
 
 \index[fn]{truc@\texttt{truc}}%
-\hbox{}-- Command: log trap 
+\noindent\texttt\bgroup{}log trap \egroup{}\hfill[Command]
+
 
 
 \index[fn]{log trap@\texttt{log trap}}%
-\hbox{}-- Command: log trap1 
+\noindent\texttt\bgroup{}log trap1 \egroup{}\hfill[Command]
+
 
 
 \index[fn]{log trap1@\texttt{log trap1}}%
-\hbox{}-- Command: log trap2 
+\noindent\texttt\bgroup{}log trap2 \egroup{}\hfill[Command]
+
 
 
 \index[fn]{log trap2@\texttt{log trap2}}%
-\hbox{}-- cmde: \textbf{id ule} truc
+\noindent\texttt\bgroup{}\textbf{id ule} truc\egroup{}\hfill[cmde]
+
 
 
 \index[fn]{id ule@\texttt{\textbf{id ule}}}%
-\hbox{}-- cmde2: \textbf{id `\texttt{i}' ule} truc
+\noindent\texttt\bgroup{}\textbf{id `\texttt{i}' ule} 
truc\egroup{}\hfill[cmde2]
+
 
 
 \index[fn]{id i ule@\texttt{\textbf{id `\texttt{i}' ule}}}%
-\hbox{}-- \textbf{id `\texttt{i}' ule}: 
+\noindent\texttt\bgroup{}\egroup{}\hfill[\textbf{id `\texttt{i}' ule}]
 
 
 
-\hbox{}-- aaa: 
 
+\noindent\texttt\bgroup{}\egroup{}\hfill[aaa]
 
-\hbox{}-- : 
 
 
-\hbox{}-- : 
+\noindent\texttt\bgroup{}\egroup{}\hfill[]
 
 
-\hbox{}-- : machin
+
+\noindent\texttt\bgroup{}\egroup{}\hfill[]
+
+
+
+\noindent\texttt\bgroup{}machin\egroup{}\hfill[]
+
 
 
 \index[fn]{machin@\texttt{machin}}%
-\hbox{}-- : bidule machin
+\noindent\texttt\bgroup{}bidule machin\egroup{}\hfill[]
+
 
 
 \index[fn]{bidule machin@\texttt{bidule machin}}%
-\hbox{}-- truc: machin
+\noindent\texttt\bgroup{}machin\egroup{}\hfill[truc]
+
 
 
 \index[fn]{machin@\texttt{machin}}%
-\hbox{}-- truc: 
+\noindent\texttt\bgroup{}\egroup{}\hfill[truc]
+
+
 
+\noindent\texttt\bgroup{}followed by a comment\egroup{}\hfill[truc]
 
-\hbox{}-- truc: followed by a comment
 
 
 \index[fn]{followed@\texttt{followed}}%
-\hbox{}-- truc: 
+\noindent\texttt\bgroup{}\egroup{}\hfill[truc]
+
+
 
+\noindent\texttt\bgroup{}\egroup{}\hfill[]
 
-\hbox{}-- : 
 
 
-\hbox{}-- truc: a b c d e \textbf{f g} h i
+\noindent\texttt\bgroup{}a b c d e \textbf{f g} h i\egroup{}\hfill[truc]
+
 
 
 \index[fn]{a@\texttt{a}}%
-\hbox{}-- truc: deffnx before end deffn
+\noindent\texttt\bgroup{}deffnx before end deffn\egroup{}\hfill[truc]
+
 
 
 \index[fn]{deffnx@\texttt{deffnx}}%
 
 
-\hbox{}-- empty: deffn
+\noindent\texttt\bgroup{}deffn\egroup{}\hfill[empty]
+
 
 
 \index[fn]{deffn@\texttt{deffn}}%
 
-\hbox{}-- empty: deffn with deffnx
+\noindent\texttt\bgroup{}deffn with deffnx\egroup{}\hfill[empty]
+
 
 
 \index[fn]{deffn@\texttt{deffn}}%
-\hbox{}-- empty: deffnx
+\noindent\texttt\bgroup{}deffnx\egroup{}\hfill[empty]
+
 
 
 \index[fn]{deffnx@\texttt{deffnx}}%
 
-\hbox{}-- fset: \emph{i} a g
+\noindent\texttt\bgroup{}\emph{i} a g\egroup{}\hfill[fset]
+
 
 
 \index[fn]{i@\texttt{\emph{i}}}%
-\hbox{}-- cmde: truc 
+\noindent\texttt\bgroup{}truc \egroup{}\hfill[cmde]
+
 
 
 \index[fn]{truc@\texttt{truc}}%
 text in def item for second def item
 
 
-\hbox{}-- c--ategory: d--efvr\_name
+\noindent\texttt\bgroup{}d--efvr\_name\egroup{}\hfill[c--ategory]
+
 
 
 \index[cp]{d--efvr\_name@\texttt{d{-}{-}efvr\_name}}%
 d--efvr
 
-\hbox{}-- c--ategory: n--ame a--rguments...
+\noindent\texttt\bgroup{}n--ame a--rguments...\egroup{}\hfill[c--ategory]
+
 
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
 d--effn
 
-\hbox{}-- c--ategory: n--ame
+\noindent\texttt\bgroup{}n--ame\egroup{}\hfill[c--ategory]
+
 
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
 d--effn no arg
 
-\hbox{}-- c--ategory: t--ype d--eftypefn\_name a--rguments...
+\noindent\texttt\bgroup{}t--ype d--eftypefn\_name 
a--rguments...\egroup{}\hfill[c--ategory]
+
 
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
 d--eftypefn
 
-\hbox{}-- c--ategory: t--ype d--eftypefn\_name
+\noindent\texttt\bgroup{}t--ype d--eftypefn\_name\egroup{}\hfill[c--ategory]
+
 
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
 d--eftypefn no arg
 
-\hbox{}-- c--ategory on c--lass: t--ype d--eftypeop\_name a--rguments...
+\noindent\texttt\bgroup{}t--ype d--eftypeop\_name 
a--rguments...\egroup{}\hfill[c--ategory on c--lass]
+
 
 
 \index[fn]{d--eftypeop\_name on c--lass@\texttt{d{-}{-}eftypeop\_name on 
c{-}{-}lass}}%
 d--eftypeop
 
-\hbox{}-- c--ategory on c--lass: t--ype d--eftypeop\_name
+\noindent\texttt\bgroup{}t--ype d--eftypeop\_name\egroup{}\hfill[c--ategory on 
c--lass]
+
 
 
 \index[fn]{d--eftypeop\_name on c--lass@\texttt{d{-}{-}eftypeop\_name on 
c{-}{-}lass}}%
 d--eftypeop no arg
 
-\hbox{}-- c--ategory: t--ype d--eftypevr\_name
+\noindent\texttt\bgroup{}t--ype d--eftypevr\_name\egroup{}\hfill[c--ategory]
+
 
 
 \index[cp]{d--eftypevr\_name@\texttt{d{-}{-}eftypevr\_name}}%
 d--eftypevr
 
-\hbox{}-- c--ategory of c--lass: d--efcv\_name
+\noindent\texttt\bgroup{}d--efcv\_name\egroup{}\hfill[c--ategory of c--lass]
+
 
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
 d--efcv
 
-\hbox{}-- c--ategory of c--lass: d--efcv\_name a--rguments...
+\noindent\texttt\bgroup{}d--efcv\_name 
a--rguments...\egroup{}\hfill[c--ategory of c--lass]
+
 
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
 d--efcv with arguments
 
-\hbox{}-- c--ategory of c--lass: t--ype d--eftypecv\_name
+\noindent\texttt\bgroup{}t--ype d--eftypecv\_name\egroup{}\hfill[c--ategory of 
c--lass]
+
 
 
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name of 
c{-}{-}lass}}%
 d--eftypecv
 
-\hbox{}-- c--ategory of c--lass: t--ype d--eftypecv\_name a--rguments...
+\noindent\texttt\bgroup{}t--ype d--eftypecv\_name 
a--rguments...\egroup{}\hfill[c--ategory of c--lass]
+
 
 
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name of 
c{-}{-}lass}}%
 d--eftypecv with arguments
 
-\hbox{}-- c--ategory on c--lass: d--efop\_name a--rguments...
+\noindent\texttt\bgroup{}d--efop\_name 
a--rguments...\egroup{}\hfill[c--ategory on c--lass]
+
 
 
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name on c{-}{-}lass}}%
 d--efop
 
-\hbox{}-- c--ategory on c--lass: d--efop\_name
+\noindent\texttt\bgroup{}d--efop\_name\egroup{}\hfill[c--ategory on c--lass]
+
 
 
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name on c{-}{-}lass}}%
 d--efop no arg
 
-\hbox{}-- c--ategory: d--eftp\_name a--ttributes...
+\noindent\texttt\bgroup{}d--eftp\_name 
a--ttributes...\egroup{}\hfill[c--ategory]
+
 
 
 \index[tp]{d--eftp\_name@\texttt{d{-}{-}eftp\_name}}%
 d--eftp
 
-\hbox{}-- Function: d--efun\_name a--rguments...
+\noindent\texttt\bgroup{}d--efun\_name a--rguments...\egroup{}\hfill[Function]
+
 
 
 \index[fn]{d--efun\_name@\texttt{d{-}{-}efun\_name}}%
 d--efun
 
-\hbox{}-- Macro: d--efmac\_name a--rguments...
+\noindent\texttt\bgroup{}d--efmac\_name a--rguments...\egroup{}\hfill[Macro]
+
 
 
 \index[fn]{d--efmac\_name@\texttt{d{-}{-}efmac\_name}}%
 d--efmac
 
-\hbox{}-- Special Form: d--efspec\_name a--rguments...
+\noindent\texttt\bgroup{}d--efspec\_name a--rguments...\egroup{}\hfill[Special 
Form]
+
 
 
 \index[fn]{d--efspec\_name@\texttt{d{-}{-}efspec\_name}}%
 d--efspec
 
-\hbox{}-- Variable: d--efvar\_name
+\noindent\texttt\bgroup{}d--efvar\_name\egroup{}\hfill[Variable]
+
 
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
 d--efvar
 
-\hbox{}-- Variable: d--efvar\_name arg--var arg--var1
+\noindent\texttt\bgroup{}d--efvar\_name arg--var 
arg--var1\egroup{}\hfill[Variable]
+
 
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
 d--efvar with args
 
-\hbox{}-- User Option: d--efopt\_name
+\noindent\texttt\bgroup{}d--efopt\_name\egroup{}\hfill[User Option]
+
 
 
 \index[cp]{d--efopt\_name@\texttt{d{-}{-}efopt\_name}}%
 d--efopt
 
-\hbox{}-- Function: t--ype d--eftypefun\_name a--rguments...
+\noindent\texttt\bgroup{}t--ype d--eftypefun\_name 
a--rguments...\egroup{}\hfill[Function]
+
 
 
 \index[fn]{d--eftypefun\_name@\texttt{d{-}{-}eftypefun\_name}}%
 d--eftypefun
 
-\hbox{}-- Variable: t--ype d--eftypevar\_name
+\noindent\texttt\bgroup{}t--ype d--eftypevar\_name\egroup{}\hfill[Variable]
+
 
 
 \index[cp]{d--eftypevar\_name@\texttt{d{-}{-}eftypevar\_name}}%
 d--eftypevar
 
-\hbox{}-- Instance Variable of c--lass: d--efivar\_name
+\noindent\texttt\bgroup{}d--efivar\_name\egroup{}\hfill[Instance Variable of 
c--lass]
+
 
 
 \index[cp]{d--efivar\_name of c--lass@\texttt{d{-}{-}efivar\_name of 
c{-}{-}lass}}%
 d--efivar
 
-\hbox{}-- Instance Variable of c--lass: t--ype d--eftypeivar\_name
+\noindent\texttt\bgroup{}t--ype d--eftypeivar\_name\egroup{}\hfill[Instance 
Variable of c--lass]
+
 
 
 \index[cp]{d--eftypeivar\_name of c--lass@\texttt{d{-}{-}eftypeivar\_name of 
c{-}{-}lass}}%
 d--eftypeivar
 
-\hbox{}-- Method on c--lass: d--efmethod\_name a--rguments...
+\noindent\texttt\bgroup{}d--efmethod\_name 
a--rguments...\egroup{}\hfill[Method on c--lass]
+
 
 
 \index[fn]{d--efmethod\_name on c--lass@\texttt{d{-}{-}efmethod\_name on 
c{-}{-}lass}}%
 d--efmethod
 
-\hbox{}-- Method on c--lass: t--ype d--eftypemethod\_name a--rguments...
+\noindent\texttt\bgroup{}t--ype d--eftypemethod\_name 
a--rguments...\egroup{}\hfill[Method on c--lass]
+
 
 
 \index[fn]{d--eftypemethod\_name on c--lass@\texttt{d{-}{-}eftypemethod\_name 
on c{-}{-}lass}}%
 d--eftypemethod
 
 
-\hbox{}-- Function:\leavevmode{}\\data-type2\leavevmode{}\\name2 arguments2...
+\noindent\texttt\bgroup{}\leavevmode{}\\data-type2\leavevmode{}\\name2 
arguments2...\egroup{}\hfill[Function]
+
 
 
 \index[fn]{name2@\texttt{name2}}%
 aaa2
 
-\hbox{}-- c--ategory2:\leavevmode{}\\t--ype2\leavevmode{}\\d--eftypefn\_name2
+\noindent\texttt\bgroup{}\leavevmode{}\\t--ype2\leavevmode{}\\d--eftypefn\_name2\egroup{}\hfill[c--ategory2]
+
 
 
 \index[fn]{d--eftypefn\_name2@\texttt{d{-}{-}eftypefn\_name2}}%
 d--eftypefn no arg2
 
-\hbox{}-- c--ategory2 on 
c--lass2:\leavevmode{}\\t--ype2\leavevmode{}\\d--eftypeop\_name2 a--rguments2...
+\noindent\texttt\bgroup{}t--ype2\leavevmode{}\\d--eftypeop\_name2 
a--rguments2...\egroup{}\hfill[c--ategory2 on c--lass2]
+
 
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2 on 
c{-}{-}lass2}}%
 d--eftypeop2
 
-\hbox{}-- c--ategory2 on 
c--lass2:\leavevmode{}\\t--ype2\leavevmode{}\\d--eftypeop\_name2
+\noindent\texttt\bgroup{}t--ype2\leavevmode{}\\d--eftypeop\_name2\egroup{}\hfill[c--ategory2
 on c--lass2]
+
 
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2 on 
c{-}{-}lass2}}%
 d--eftypeop no arg2
 
-\hbox{}-- c--ategory2 of 
c--lass2:\leavevmode{}\\t--ype2\leavevmode{}\\d--eftypecv\_name2
+\noindent\texttt\bgroup{}t--ype2\leavevmode{}\\d--eftypecv\_name2\egroup{}\hfill[c--ategory2
 of c--lass2]
+
 
 
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2 of 
c{-}{-}lass2}}%
 d--eftypecv2
 
-\hbox{}-- c--ategory2 of 
c--lass2:\leavevmode{}\\t--ype2\leavevmode{}\\d--eftypecv\_name2 a--rguments2...
+\noindent\texttt\bgroup{}t--ype2\leavevmode{}\\d--eftypecv\_name2 
a--rguments2...\egroup{}\hfill[c--ategory2 of c--lass2]
+
 
 
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2 of 
c{-}{-}lass2}}%
 d--eftypecv with arguments2
 
-\hbox{}-- fun2: arg2
+\noindent\texttt\bgroup{}arg2\egroup{}\hfill[fun2]
+
 
 
 \index[fn]{arg2@\texttt{arg2}}%
@@ -4990,31 +5255,38 @@ b
 l--ine
 \end{description}
 
-\hbox{}-- fun: 
+\noindent\texttt\bgroup{}\egroup{}\hfill[fun]
+
 
 
-\hbox{}-- truc: machin bidule chose and
+\noindent\texttt\bgroup{}machin bidule chose and\egroup{}\hfill[truc]
+
 
 
 \index[fn]{machin@\texttt{machin}}%
-\hbox{}-- truc: machin bidule chose and  after
+\noindent\texttt\bgroup{}machin bidule chose and  after\egroup{}\hfill[truc]
+
 
 
 \index[fn]{machin@\texttt{machin}}%
-\hbox{}-- truc: machin bidule chose and 
+\noindent\texttt\bgroup{}machin bidule chose and \egroup{}\hfill[truc]
+
 
 
 \index[fn]{machin@\texttt{machin}}%
-\hbox{}-- truc: machin bidule chose and and after
+\noindent\texttt\bgroup{}machin bidule chose and and after\egroup{}\hfill[truc]
+
 
 
 \index[fn]{machin@\texttt{machin}}%
-\hbox{}-- truc: followed by a comment
+\noindent\texttt\bgroup{}followed by a comment\egroup{}\hfill[truc]
+
 
 
 \index[fn]{followed@\texttt{followed}}%
 Various deff lines
-\hbox{}-- truc: after a deff item
+\noindent\texttt\bgroup{}after a deff item\egroup{}\hfill[truc]
+
 
 
 \index[fn]{after@\texttt{after}}%
@@ -5914,7 +6186,8 @@ $$
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- c--ategory: d--effn\_name a--rguments...
+\noindent\texttt\bgroup{}d--effn\_name 
a--rguments...\egroup{}\hfill[c--ategory]
+
 
 
 \index[fn]{d--effn\_name@\texttt{d{-}{-}effn\_name}}%
@@ -5924,7 +6197,8 @@ d{-}{-}effn
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- cate--gory: de--ffn\_name ar--guments    more args \leavevmode{}\\ 
even more so
+\noindent\texttt\bgroup{}de--ffn\_name ar--guments    more args 
\leavevmode{}\\ even more so\egroup{}\hfill[cate--gory]
+
 
 
 \index[fn]{de--ffn\_name@\texttt{de{-}{-}ffn\_name}}%
@@ -5934,82 +6208,102 @@ def{-}{-}fn
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- fset: \emph{i} a g
+\noindent\texttt\bgroup{}\emph{i} a g\egroup{}\hfill[fset]
+
 
 
 \index[fn]{i@\texttt{\emph{i}}}%
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 \index[cp]{index entry within deffn}%
 \endgroup{}%
-\hbox{}-- cmde: truc 
+\noindent\texttt\bgroup{}truc \egroup{}\hfill[cmde]
+
 
 
 \index[fn]{truc@\texttt{truc}}%
-\hbox{}-- Command: log trap 
+\noindent\texttt\bgroup{}log trap \egroup{}\hfill[Command]
+
 
 
 \index[fn]{log trap@\texttt{log trap}}%
-\hbox{}-- Command: log trap1 
+\noindent\texttt\bgroup{}log trap1 \egroup{}\hfill[Command]
+
 
 
 \index[fn]{log trap1@\texttt{log trap1}}%
-\hbox{}-- Command: log trap2 
+\noindent\texttt\bgroup{}log trap2 \egroup{}\hfill[Command]
+
 
 
 \index[fn]{log trap2@\texttt{log trap2}}%
-\hbox{}-- cmde: \textbf{id ule} truc
+\noindent\texttt\bgroup{}\textbf{id ule} truc\egroup{}\hfill[cmde]
+
 
 
 \index[fn]{id ule@\texttt{\textbf{id ule}}}%
-\hbox{}-- cmde2: \textbf{id `\texttt{i}' ule} truc
+\noindent\texttt\bgroup{}\textbf{id `\texttt{i}' ule} 
truc\egroup{}\hfill[cmde2]
+
 
 
 \index[fn]{id i ule@\texttt{\textbf{id `\texttt{i}' ule}}}%
-\hbox{}-- \textbf{id `\texttt{i}' ule}: 
+\noindent\texttt\bgroup{}\egroup{}\hfill[\textbf{id `\texttt{i}' ule}]
+
+
 
 
+\noindent\texttt\bgroup{}\egroup{}\hfill[aaa]
 
-\hbox{}-- aaa: 
 
 
-\hbox{}-- : 
+\noindent\texttt\bgroup{}\egroup{}\hfill[]
 
 
-\hbox{}-- : 
 
+\noindent\texttt\bgroup{}\egroup{}\hfill[]
+
+
+
+\noindent\texttt\bgroup{}machin\egroup{}\hfill[]
 
-\hbox{}-- : machin
 
 
 \index[fn]{machin@\texttt{machin}}%
-\hbox{}-- : bidule machin
+\noindent\texttt\bgroup{}bidule machin\egroup{}\hfill[]
+
 
 
 \index[fn]{bidule machin@\texttt{bidule machin}}%
-\hbox{}-- truc: machin
+\noindent\texttt\bgroup{}machin\egroup{}\hfill[truc]
+
 
 
 \index[fn]{machin@\texttt{machin}}%
-\hbox{}-- truc: 
+\noindent\texttt\bgroup{}\egroup{}\hfill[truc]
 
 
-\hbox{}-- truc: followed by a comment
+
+\noindent\texttt\bgroup{}followed by a comment\egroup{}\hfill[truc]
+
 
 
 \index[fn]{followed@\texttt{followed}}%
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 \endgroup{}%
-\hbox{}-- truc: 
+\noindent\texttt\bgroup{}\egroup{}\hfill[truc]
+
+
+
+\noindent\texttt\bgroup{}\egroup{}\hfill[]
 
 
-\hbox{}-- : 
 
+\noindent\texttt\bgroup{}a b c d e \textbf{f g} h i\egroup{}\hfill[truc]
 
-\hbox{}-- truc: a b c d e \textbf{f g} h i
 
 
 \index[fn]{a@\texttt{a}}%
-\hbox{}-- truc: deffnx before end deffn
+\noindent\texttt\bgroup{}deffnx before end deffn\egroup{}\hfill[truc]
+
 
 
 \index[fn]{deffnx@\texttt{deffnx}}%
@@ -6017,31 +6311,36 @@ def{-}{-}fn
 
 
 \endgroup{}%
-\hbox{}-- empty: deffn
+\noindent\texttt\bgroup{}deffn\egroup{}\hfill[empty]
+
 
 
 \index[fn]{deffn@\texttt{deffn}}%
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- empty: deffn with deffnx
+\noindent\texttt\bgroup{}deffn with deffnx\egroup{}\hfill[empty]
+
 
 
 \index[fn]{deffn@\texttt{deffn}}%
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 \endgroup{}%
-\hbox{}-- empty: deffnx
+\noindent\texttt\bgroup{}deffnx\egroup{}\hfill[empty]
+
 
 
 \index[fn]{deffnx@\texttt{deffnx}}%
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- fset: \emph{i} a g
+\noindent\texttt\bgroup{}\emph{i} a g\egroup{}\hfill[fset]
+
 
 
 \index[fn]{i@\texttt{\emph{i}}}%
-\hbox{}-- cmde: truc 
+\noindent\texttt\bgroup{}truc \egroup{}\hfill[cmde]
+
 
 
 \index[fn]{truc@\texttt{truc}}%
@@ -6052,7 +6351,8 @@ text in def item for second def item
 
 
 \endgroup{}%
-\hbox{}-- c--ategory: d--efvr\_name
+\noindent\texttt\bgroup{}d--efvr\_name\egroup{}\hfill[c--ategory]
+
 
 
 \index[cp]{d--efvr\_name@\texttt{d{-}{-}efvr\_name}}%
@@ -6062,7 +6362,8 @@ d{-}{-}efvr
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- c--ategory: n--ame a--rguments...
+\noindent\texttt\bgroup{}n--ame a--rguments...\egroup{}\hfill[c--ategory]
+
 
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
@@ -6072,7 +6373,8 @@ d{-}{-}effn
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- c--ategory: n--ame
+\noindent\texttt\bgroup{}n--ame\egroup{}\hfill[c--ategory]
+
 
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
@@ -6082,7 +6384,8 @@ d{-}{-}effn no arg
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- c--ategory: t--ype d--eftypefn\_name a--rguments...
+\noindent\texttt\bgroup{}t--ype d--eftypefn\_name 
a--rguments...\egroup{}\hfill[c--ategory]
+
 
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
@@ -6092,7 +6395,8 @@ d{-}{-}eftypefn
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- c--ategory: t--ype d--eftypefn\_name
+\noindent\texttt\bgroup{}t--ype d--eftypefn\_name\egroup{}\hfill[c--ategory]
+
 
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
@@ -6102,7 +6406,8 @@ d{-}{-}eftypefn no arg
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- c--ategory on c--lass: t--ype d--eftypeop\_name a--rguments...
+\noindent\texttt\bgroup{}t--ype d--eftypeop\_name 
a--rguments...\egroup{}\hfill[c--ategory on c--lass]
+
 
 
 \index[fn]{d--eftypeop\_name on c--lass@\texttt{d{-}{-}eftypeop\_name on 
c{-}{-}lass}}%
@@ -6112,7 +6417,8 @@ d{-}{-}eftypeop
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- c--ategory on c--lass: t--ype d--eftypeop\_name
+\noindent\texttt\bgroup{}t--ype d--eftypeop\_name\egroup{}\hfill[c--ategory on 
c--lass]
+
 
 
 \index[fn]{d--eftypeop\_name on c--lass@\texttt{d{-}{-}eftypeop\_name on 
c{-}{-}lass}}%
@@ -6122,7 +6428,8 @@ d{-}{-}eftypeop no arg
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- c--ategory: t--ype d--eftypevr\_name
+\noindent\texttt\bgroup{}t--ype d--eftypevr\_name\egroup{}\hfill[c--ategory]
+
 
 
 \index[cp]{d--eftypevr\_name@\texttt{d{-}{-}eftypevr\_name}}%
@@ -6132,7 +6439,8 @@ d{-}{-}eftypevr
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- c--ategory of c--lass: d--efcv\_name
+\noindent\texttt\bgroup{}d--efcv\_name\egroup{}\hfill[c--ategory of c--lass]
+
 
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
@@ -6142,7 +6450,8 @@ d{-}{-}efcv
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- c--ategory of c--lass: d--efcv\_name a--rguments...
+\noindent\texttt\bgroup{}d--efcv\_name 
a--rguments...\egroup{}\hfill[c--ategory of c--lass]
+
 
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
@@ -6152,7 +6461,8 @@ d{-}{-}efcv with arguments
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- c--ategory of c--lass: t--ype d--eftypecv\_name
+\noindent\texttt\bgroup{}t--ype d--eftypecv\_name\egroup{}\hfill[c--ategory of 
c--lass]
+
 
 
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name of 
c{-}{-}lass}}%
@@ -6162,7 +6472,8 @@ d{-}{-}eftypecv
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- c--ategory of c--lass: t--ype d--eftypecv\_name a--rguments...
+\noindent\texttt\bgroup{}t--ype d--eftypecv\_name 
a--rguments...\egroup{}\hfill[c--ategory of c--lass]
+
 
 
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name of 
c{-}{-}lass}}%
@@ -6172,7 +6483,8 @@ d{-}{-}eftypecv with arguments
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- c--ategory on c--lass: d--efop\_name a--rguments...
+\noindent\texttt\bgroup{}d--efop\_name 
a--rguments...\egroup{}\hfill[c--ategory on c--lass]
+
 
 
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name on c{-}{-}lass}}%
@@ -6182,7 +6494,8 @@ d{-}{-}efop
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- c--ategory on c--lass: d--efop\_name
+\noindent\texttt\bgroup{}d--efop\_name\egroup{}\hfill[c--ategory on c--lass]
+
 
 
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name on c{-}{-}lass}}%
@@ -6192,7 +6505,8 @@ d{-}{-}efop no arg
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- c--ategory: d--eftp\_name a--ttributes...
+\noindent\texttt\bgroup{}d--eftp\_name 
a--ttributes...\egroup{}\hfill[c--ategory]
+
 
 
 \index[tp]{d--eftp\_name@\texttt{d{-}{-}eftp\_name}}%
@@ -6202,7 +6516,8 @@ d{-}{-}eftp
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- Function: d--efun\_name a--rguments...
+\noindent\texttt\bgroup{}d--efun\_name a--rguments...\egroup{}\hfill[Function]
+
 
 
 \index[fn]{d--efun\_name@\texttt{d{-}{-}efun\_name}}%
@@ -6212,7 +6527,8 @@ d{-}{-}efun
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- Macro: d--efmac\_name a--rguments...
+\noindent\texttt\bgroup{}d--efmac\_name a--rguments...\egroup{}\hfill[Macro]
+
 
 
 \index[fn]{d--efmac\_name@\texttt{d{-}{-}efmac\_name}}%
@@ -6222,7 +6538,8 @@ d{-}{-}efmac
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- Special Form: d--efspec\_name a--rguments...
+\noindent\texttt\bgroup{}d--efspec\_name a--rguments...\egroup{}\hfill[Special 
Form]
+
 
 
 \index[fn]{d--efspec\_name@\texttt{d{-}{-}efspec\_name}}%
@@ -6232,7 +6549,8 @@ d{-}{-}efspec
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- Variable: d--efvar\_name
+\noindent\texttt\bgroup{}d--efvar\_name\egroup{}\hfill[Variable]
+
 
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
@@ -6242,7 +6560,8 @@ d{-}{-}efvar
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- Variable: d--efvar\_name arg--var arg--var1
+\noindent\texttt\bgroup{}d--efvar\_name arg--var 
arg--var1\egroup{}\hfill[Variable]
+
 
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
@@ -6252,7 +6571,8 @@ d{-}{-}efvar with args
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- User Option: d--efopt\_name
+\noindent\texttt\bgroup{}d--efopt\_name\egroup{}\hfill[User Option]
+
 
 
 \index[cp]{d--efopt\_name@\texttt{d{-}{-}efopt\_name}}%
@@ -6262,7 +6582,8 @@ d{-}{-}efopt
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- Function: t--ype d--eftypefun\_name a--rguments...
+\noindent\texttt\bgroup{}t--ype d--eftypefun\_name 
a--rguments...\egroup{}\hfill[Function]
+
 
 
 \index[fn]{d--eftypefun\_name@\texttt{d{-}{-}eftypefun\_name}}%
@@ -6272,7 +6593,8 @@ d{-}{-}eftypefun
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- Variable: t--ype d--eftypevar\_name
+\noindent\texttt\bgroup{}t--ype d--eftypevar\_name\egroup{}\hfill[Variable]
+
 
 
 \index[cp]{d--eftypevar\_name@\texttt{d{-}{-}eftypevar\_name}}%
@@ -6282,7 +6604,8 @@ d{-}{-}eftypevar
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- Instance Variable of c--lass: d--efivar\_name
+\noindent\texttt\bgroup{}d--efivar\_name\egroup{}\hfill[Instance Variable of 
c--lass]
+
 
 
 \index[cp]{d--efivar\_name of c--lass@\texttt{d{-}{-}efivar\_name of 
c{-}{-}lass}}%
@@ -6292,7 +6615,8 @@ d{-}{-}efivar
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- Instance Variable of c--lass: t--ype d--eftypeivar\_name
+\noindent\texttt\bgroup{}t--ype d--eftypeivar\_name\egroup{}\hfill[Instance 
Variable of c--lass]
+
 
 
 \index[cp]{d--eftypeivar\_name of c--lass@\texttt{d{-}{-}eftypeivar\_name of 
c{-}{-}lass}}%
@@ -6302,7 +6626,8 @@ d{-}{-}eftypeivar
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- Method on c--lass: d--efmethod\_name a--rguments...
+\noindent\texttt\bgroup{}d--efmethod\_name 
a--rguments...\egroup{}\hfill[Method on c--lass]
+
 
 
 \index[fn]{d--efmethod\_name on c--lass@\texttt{d{-}{-}efmethod\_name on 
c{-}{-}lass}}%
@@ -6312,7 +6637,8 @@ d{-}{-}efmethod
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- Method on c--lass: t--ype d--eftypemethod\_name a--rguments...
+\noindent\texttt\bgroup{}t--ype d--eftypemethod\_name 
a--rguments...\egroup{}\hfill[Method on c--lass]
+
 
 
 \index[fn]{d--eftypemethod\_name on c--lass@\texttt{d{-}{-}eftypemethod\_name 
on c{-}{-}lass}}%
@@ -6323,7 +6649,8 @@ d{-}{-}eftypemethod
 
 
 \endgroup{}%
-\hbox{}-- Function:\leavevmode{}\\data-type2\leavevmode{}\\name2 arguments2...
+\noindent\texttt\bgroup{}\leavevmode{}\\data-type2\leavevmode{}\\name2 
arguments2...\egroup{}\hfill[Function]
+
 
 
 \index[fn]{name2@\texttt{name2}}%
@@ -6333,7 +6660,8 @@ aaa2
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- c--ategory2:\leavevmode{}\\t--ype2\leavevmode{}\\d--eftypefn\_name2
+\noindent\texttt\bgroup{}\leavevmode{}\\t--ype2\leavevmode{}\\d--eftypefn\_name2\egroup{}\hfill[c--ategory2]
+
 
 
 \index[fn]{d--eftypefn\_name2@\texttt{d{-}{-}eftypefn\_name2}}%
@@ -6343,7 +6671,8 @@ d{-}{-}eftypefn no arg2
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- c--ategory2 on 
c--lass2:\leavevmode{}\\t--ype2\leavevmode{}\\d--eftypeop\_name2 a--rguments2...
+\noindent\texttt\bgroup{}t--ype2\leavevmode{}\\d--eftypeop\_name2 
a--rguments2...\egroup{}\hfill[c--ategory2 on c--lass2]
+
 
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2 on 
c{-}{-}lass2}}%
@@ -6353,7 +6682,8 @@ d{-}{-}eftypeop2
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- c--ategory2 on 
c--lass2:\leavevmode{}\\t--ype2\leavevmode{}\\d--eftypeop\_name2
+\noindent\texttt\bgroup{}t--ype2\leavevmode{}\\d--eftypeop\_name2\egroup{}\hfill[c--ategory2
 on c--lass2]
+
 
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2 on 
c{-}{-}lass2}}%
@@ -6363,7 +6693,8 @@ d{-}{-}eftypeop no arg2
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- c--ategory2 of 
c--lass2:\leavevmode{}\\t--ype2\leavevmode{}\\d--eftypecv\_name2
+\noindent\texttt\bgroup{}t--ype2\leavevmode{}\\d--eftypecv\_name2\egroup{}\hfill[c--ategory2
 of c--lass2]
+
 
 
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2 of 
c{-}{-}lass2}}%
@@ -6373,7 +6704,8 @@ d{-}{-}eftypecv2
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- c--ategory2 of 
c--lass2:\leavevmode{}\\t--ype2\leavevmode{}\\d--eftypecv\_name2 a--rguments2...
+\noindent\texttt\bgroup{}t--ype2\leavevmode{}\\d--eftypecv\_name2 
a--rguments2...\egroup{}\hfill[c--ategory2 of c--lass2]
+
 
 
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2 of 
c{-}{-}lass2}}%
@@ -6383,7 +6715,8 @@ d{-}{-}eftypecv with arguments2
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- fun2: arg2
+\noindent\texttt\bgroup{}arg2\egroup{}\hfill[fun2]
+
 
 
 \index[fn]{arg2@\texttt{arg2}}%
@@ -6727,33 +7060,40 @@ l{-}{-}ine
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\hbox{}-- fun: 
+\noindent\texttt\bgroup{}\egroup{}\hfill[fun]
+
+
 
+\noindent\texttt\bgroup{}machin bidule chose and\egroup{}\hfill[truc]
 
-\hbox{}-- truc: machin bidule chose and
 
 
 \index[fn]{machin@\texttt{machin}}%
-\hbox{}-- truc: machin bidule chose and  after
+\noindent\texttt\bgroup{}machin bidule chose and  after\egroup{}\hfill[truc]
+
 
 
 \index[fn]{machin@\texttt{machin}}%
-\hbox{}-- truc: machin bidule chose and 
+\noindent\texttt\bgroup{}machin bidule chose and \egroup{}\hfill[truc]
+
 
 
 \index[fn]{machin@\texttt{machin}}%
-\hbox{}-- truc: machin bidule chose and and after
+\noindent\texttt\bgroup{}machin bidule chose and and after\egroup{}\hfill[truc]
+
 
 
 \index[fn]{machin@\texttt{machin}}%
-\hbox{}-- truc: followed by a comment
+\noindent\texttt\bgroup{}followed by a comment\egroup{}\hfill[truc]
+
 
 
 \index[fn]{followed@\texttt{followed}}%
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 Various deff lines
 \endgroup{}%
-\hbox{}-- truc: after a deff item
+\noindent\texttt\bgroup{}after a deff item\egroup{}\hfill[truc]
+
 
 
 \index[fn]{after@\texttt{after}}%



reply via email to

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