texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: tabularx for @def


From: Gavin D. Smith
Subject: branch master updated: tabularx for @def
Date: Thu, 11 Aug 2022 17:14: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 312e24d3e1 tabularx for @def
312e24d3e1 is described below

commit 312e24d3e1e55456e0252c0a5e12b6d3335b4ab4
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Thu Aug 11 22:14:00 2022 +0100

    tabularx for @def
    
    * tp/Texinfo/Convert/LaTeX.pm (_convert) <def line>:
    Use tabularx package for definition line.
    (_latex_header): Load 'tabularx' if needed.
    * tp/Texinfo/Convert/LaTeX.pm: Remove todo item.
---
 ChangeLog                                          |    9 +
 tp/Texinfo/Convert/LaTeX.pm                        |   21 +-
 .../res_latex/definition_commands.tex              |  435 +++-
 .../converters_tests/frenchspacing_and_code.pl     |   28 +-
 .../converters_tests/test_deftypefnnewline.pl      |   98 +-
 tp/t/results/def/omit_def_space.pl                 |   14 +-
 .../res_latex/multiple_lang_chapters.tex           |   22 +-
 .../res_parser/formatting_latex/formatting.tex     | 2416 +++++++++++++++++---
 8 files changed, 2609 insertions(+), 434 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 29e0c7f262..dcf41bb11e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2022-08-11  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       tabularx for @def
+
+       * tp/Texinfo/Convert/LaTeX.pm (_convert) <def line>:
+       Use tabularx package for definition line.
+       (_latex_header): Load 'tabularx' if needed.
+       * tp/Texinfo/Convert/LaTeX.pm: Remove todo item.
+
 2022-08-11  Gavin Smith  <gavinsmith0123@gmail.com>
 
        Protect space at start of code
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 0b95422f62..fbc382bee9 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -42,9 +42,6 @@
 # more or less a normal space, with LaTeX, the space has shrinked so
 # much it seems that the two words are glued together.
 #
-# with @deftypefnnewline on, the category is on the same line as the function
-# line, in Texinfo TeX it is on the same line as the type.
-#
 # There is something about form feeds to do.  There is some processing of form
 # feeds right now, which simply amounts to keeping them in ignorable spaces
 # (and with another condition that may not be relevant for LaTeX as the code
@@ -1416,6 +1413,9 @@ roundcorner=10pt}
     $header .= "\\usepackage{embrac}\n";
     $header .= "\\usepackage{expl3}\n";
   }
+  if ($self->{'packages'}->{'tabularx'}) {
+    $header .= "\\usepackage{tabularx}\n";
+  }
   if ($self->{'packages'}->{'mdframed'}) {
     # framemethod=tikz needed for roundcorners for @cartouche
     $header .= "\\usepackage[framemethod=tikz]{mdframed}\n";
@@ -3557,6 +3557,18 @@ sub _convert($$)
           $def_space = '';
         }
 
+        $self->{'packages'}->{'tabularx'} = 1;
+        # First column (X) is as wide as possible, second column (r) is for
+        # category.  @{} removes space at left side of table.
+        $result .= "\n\\noindent\\begin{tabularx}{\\linewidth}{\@{}Xr}\n";
+
+        # This stops the definition line overlapping the category in
+        # case it is hard to break the first line.
+        $result .= "\\rightskip=5em plus 1 fill\n";
+
+        # In case definition "line" doesn't fit on one line.
+        $result .= "\\hangindent=2em\n";
+
         $result .= '\noindent\texttt{';
         # the def* line except for the category is converted in code context
         push @{$self->{'formatting_context'}->[-1]->{'code'}}, 1;
@@ -3613,8 +3625,9 @@ sub _convert($$)
         if (defined($category)) {
           # category is converted in normal text context
           my $converted = _convert($self, $category);
-          $result .= "\\hfill[$converted]\n";
+          $result .= "& [$converted]\n";
         }
+        $result .= "\\end{tabularx}\n";
         # undefine symbols associated with commands that have been made
         # known to embrac, such that they can be redefined later
         if (defined($known_embrac_commands)) {
diff --git 
a/tp/t/results/converters_tests/definition_commands/res_latex/definition_commands.tex
 
b/tp/t/results/converters_tests/definition_commands/res_latex/definition_commands.tex
index b9e2f18647..e73161a453 100644
--- 
a/tp/t/results/converters_tests/definition_commands/res_latex/definition_commands.tex
+++ 
b/tp/t/results/converters_tests/definition_commands/res_latex/definition_commands.tex
@@ -9,6 +9,7 @@
 \usepackage{etoolbox}
 \usepackage{embrac}
 \usepackage{expl3}
+\usepackage{tabularx}
 \usepackage{titleps}
 \usepackage{float}
 % use hidelinks to remove boxes around links to be similar with Texinfo TeX
@@ -77,7 +78,12 @@
 \chapter{{chapter}}
 \label{anchor:chapter}%
 
-\noindent\texttt{fname \EmbracOn{}\textnormal{\textsl{a---rg1 
a--rg2}}\EmbracOff{}}\hfill[Func]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{fname \EmbracOn{}\textnormal{\textsl{a---rg1 
a--rg2}}\EmbracOff{}}& [Func]
+\end{tabularx}
 
 \index[fn]{fname@\texttt{fname}}%
 \begin{quote}
@@ -85,7 +91,12 @@
 deffn no var for \GNUTexinfocommandstyletextvar{a---rg1} and 
\GNUTexinfocommandstyletextvar{a--rg2}
 \end{quote}
 
-\noindent\texttt{fname 
\EmbracOn{}\textnormal{\textsl{\GNUTexinfocommandstyletextvar{a---rg1} 
\GNUTexinfocommandstyletextvar{a--rg2}}}\EmbracOff{}}\hfill[Func]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{fname 
\EmbracOn{}\textnormal{\textsl{\GNUTexinfocommandstyletextvar{a---rg1} 
\GNUTexinfocommandstyletextvar{a--rg2}}}\EmbracOff{}}& [Func]
+\end{tabularx}
 
 \index[fn]{fname@\texttt{fname}}%
 \begin{quote}
@@ -93,7 +104,12 @@ deffn no var for \GNUTexinfocommandstyletextvar{a---rg1} 
and \GNUTexinfocommands
 deffn explict var for \GNUTexinfocommandstyletextvar{a---rg1} and 
\GNUTexinfocommandstyletextvar{a--rg2}
 \end{quote}
 
-\noindent\texttt{fname 
\EmbracOn{}\textnormal{\textsl{\EmbracOff{}\textnormal{\textsl{a---rg1}}\EmbracOn{}
 \EmbracOff{}\textnormal{\textsl{a--rg2}}\EmbracOn{}}}\EmbracOff{}}\hfill[Func]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{fname 
\EmbracOn{}\textnormal{\textsl{\EmbracOff{}\textnormal{\textsl{a---rg1}}\EmbracOn{}
 \EmbracOff{}\textnormal{\textsl{a--rg2}}\EmbracOn{}}}\EmbracOff{}}& [Func]
+\end{tabularx}
 
 \index[fn]{fname@\texttt{fname}}%
 \begin{quote}
@@ -101,47 +117,102 @@ deffn explict var for 
\GNUTexinfocommandstyletextvar{a---rg1} and \GNUTexinfocom
 deffn r slanted for \GNUTexinfocommandstyletextvar{a---rg1} and 
\GNUTexinfocommandstyletextvar{a--rg2}
 \end{quote}
 
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var [from to [inc]]) 
default}}\EmbracOff{}}\hfill[Special Form]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var [from to [inc]]) 
default}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracOff{}\textnormal{[}\EmbracOn{}from to 
\EmbracOff{}\textnormal{[}\EmbracOn{}inc\EmbracOff{}\textnormal{]]}\EmbracOn{}) 
r}}\EmbracOff{}}\hfill[Special Form]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracOff{}\textnormal{[}\EmbracOn{}from to 
\EmbracOff{}\textnormal{[}\EmbracOn{}inc\EmbracOff{}\textnormal{]]}\EmbracOn{}) 
r}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\GNUTexinfocommandstyletextvar{[}from to 
\GNUTexinfocommandstyletextvar{[}inc\GNUTexinfocommandstyletextvar{]]}) 
var}}\EmbracOff{}}\hfill[Special Form]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\GNUTexinfocommandstyletextvar{[}from to 
\GNUTexinfocommandstyletextvar{[}inc\GNUTexinfocommandstyletextvar{]]}) 
var}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var \textsl{[}from to 
\textsl{[}inc\textsl{]]}) slanted}}\EmbracOff{}}\hfill[Special Form]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var \textsl{[}from to 
\textsl{[}inc\textsl{]]}) slanted}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracMakeKnown{texttt}\texttt{[}from to \texttt{[}inc\texttt{]]}) 
code}}\EmbracOff{}}\hfill[Special Form]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracMakeKnown{texttt}\texttt{[}from to \texttt{[}inc\texttt{]]}) 
code}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
 \ExplSyntaxOn%
 
\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
 \ExplSyntaxOff%
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracMakeKnown{texttt}\texttt{[}from to \texttt{[}inc\texttt{]]}) 
t}}\EmbracOff{}}\hfill[Special Form]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracMakeKnown{texttt}\texttt{[}from to \texttt{[}inc\texttt{]]}) 
t}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
 \ExplSyntaxOn%
 
\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
 \ExplSyntaxOff%
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracMakeKnown{texttt}\texttt{\EmbracMakeKnown{textbf}\textbf{[}}from to 
\texttt{\textbf{[}}inc\texttt{\textbf{]]}}) t:b}}\EmbracOff{}}\hfill[Special 
Form]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracMakeKnown{texttt}\texttt{\EmbracMakeKnown{textbf}\textbf{[}}from to 
\texttt{\textbf{[}}inc\texttt{\textbf{]]}}) t:b}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
 \ExplSyntaxOn%
 
\cs_undefine:N{\embrac_textbf:nn}\cs_undefine:N{\embrac_orig_textbf:n}\cs_undefine:N{\__embrac_textbf:n}%
 
\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
 \ExplSyntaxOff%
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracOff{}\textnormal{\GNUTexinfocommandstyletextvar{[}}\EmbracOn{}from to 
\EmbracOff{}\textnormal{\GNUTexinfocommandstyletextvar{[}}\EmbracOn{}inc\EmbracOff{}\textnormal{\GNUTexinfocommandstyletextvar{]]}}\EmbracOn{})
 r:var}}\EmbracOff{}}\hfill[Special Form]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracOff{}\textnormal{\GNUTexinfocommandstyletextvar{[}}\EmbracOn{}from to 
\EmbracOff{}\textnormal{\GNUTexinfocommandstyletextvar{[}}\EmbracOn{}inc\EmbracOff{}\textnormal{\GNUTexinfocommandstyletextvar{]]}}\EmbracOn{})
 r:var}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracOff{}\textnormal{\textsl{[}}\EmbracOn{}from to 
\EmbracOff{}\textnormal{\textsl{[}}\EmbracOn{}inc\EmbracOff{}\textnormal{\textsl{]]}}\EmbracOn{})
 r:slanted}}\EmbracOff{}}\hfill[Special Form]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracOff{}\textnormal{\textsl{[}}\EmbracOn{}from to 
\EmbracOff{}\textnormal{\textsl{[}}\EmbracOn{}inc\EmbracOff{}\textnormal{\textsl{]]}}\EmbracOn{})
 r:slanted}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{}from to 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{}inc\EmbracOff{}\textnormal{\texttt{]]}}\EmbracOn{})
 r:code}}\EmbracOff{}}\hfill[Special Form]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{}from to 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{}inc\EmbracOff{}\textnormal{\texttt{]]}}\EmbracOn{})
 r:code}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{}from to 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{}inc\EmbracOff{}\textnormal{\texttt{]]}}\EmbracOn{})
 r:t}}\EmbracOff{}}\hfill[Special Form]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{}from to 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{}inc\EmbracOff{}\textnormal{\texttt{]]}}\EmbracOn{})
 r:t}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 \begin{quote}
@@ -149,47 +220,102 @@ deffn r slanted for 
\GNUTexinfocommandstyletextvar{a---rg1} and \GNUTexinfocomma
 separators
 \end{quote}
 
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{va---riable 
default}}\EmbracOff{}}\hfill[Special Form]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{va---riable 
default}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\GNUTexinfocommandstyletextvar{va---riable} 
var}}\EmbracOff{}}\hfill[Special Form]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\GNUTexinfocommandstyletextvar{va---riable} 
var}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\EmbracOff{}\textnormal{va---riable}\EmbracOn{} 
r}}\EmbracOff{}}\hfill[Special Form]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\EmbracOff{}\textnormal{va---riable}\EmbracOn{} 
r}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{\textsl{va---riable} 
slanted}}\EmbracOff{}}\hfill[Special Form]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{\textsl{va---riable} 
slanted}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\EmbracMakeKnown{texttt}\texttt{va{-}{-}{-}riable}
 code}}\EmbracOff{}}\hfill[Special Form]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\EmbracMakeKnown{texttt}\texttt{va{-}{-}{-}riable}
 code}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
 \ExplSyntaxOn%
 
\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
 \ExplSyntaxOff%
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\EmbracMakeKnown{texttt}\texttt{va{-}{-}{-}riable}
 t}}\EmbracOff{}}\hfill[Special Form]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\EmbracMakeKnown{texttt}\texttt{va{-}{-}{-}riable}
 t}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
 \ExplSyntaxOn%
 
\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
 \ExplSyntaxOff%
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\EmbracMakeKnown{texttt}\texttt{\EmbracMakeKnown{textbf}\textbf{va{-}{-}{-}riable}}
 t:b}}\EmbracOff{}}\hfill[Special Form]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\EmbracMakeKnown{texttt}\texttt{\EmbracMakeKnown{textbf}\textbf{va{-}{-}{-}riable}}
 t:b}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
 \ExplSyntaxOn%
 
\cs_undefine:N{\embrac_textbf:nn}\cs_undefine:N{\embrac_orig_textbf:n}\cs_undefine:N{\__embrac_textbf:n}%
 
\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
 \ExplSyntaxOff%
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\EmbracOff{}\textnormal{\GNUTexinfocommandstyletextvar{va---riable}}\EmbracOn{}
 r:var}}\EmbracOff{}}\hfill[Special Form]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\EmbracOff{}\textnormal{\GNUTexinfocommandstyletextvar{va---riable}}\EmbracOn{}
 r:var}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\EmbracOff{}\textnormal{\textsl{va---riable}}\EmbracOn{}
 r:slanted}}\EmbracOff{}}\hfill[Special Form]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\EmbracOff{}\textnormal{\textsl{va---riable}}\EmbracOn{}
 r:slanted}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\EmbracOff{}\textnormal{\texttt{va{-}{-}{-}riable}}\EmbracOn{}
 r:code}}\EmbracOff{}}\hfill[Special Form]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\EmbracOff{}\textnormal{\texttt{va{-}{-}{-}riable}}\EmbracOn{}
 r:code}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\EmbracOff{}\textnormal{\texttt{va{-}{-}{-}riable}}\EmbracOn{}
 r:t}}\EmbracOff{}}\hfill[Special Form]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\EmbracOff{}\textnormal{\texttt{va{-}{-}{-}riable}}\EmbracOn{}
 r:t}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 \begin{quote}
@@ -197,22 +323,47 @@ separators
 name
 \end{quote}
 
-\noindent\texttt{\texttt{.ft} 
\EmbracOn{}\textnormal{\textsl{[\EmbracOff{}\textnormal{\textsl{font}}\EmbracOn{}]}}\EmbracOff{}}\hfill[Request]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{\texttt{.ft} 
\EmbracOn{}\textnormal{\textsl{[\EmbracOff{}\textnormal{\textsl{font}}\EmbracOn{}]}}\EmbracOff{}}&
 [Request]
+\end{tabularx}
 
 \index[fn]{.ft@\texttt{\texttt{.ft}}}%
-\noindent\texttt{\texttt{\textbackslash{}f}\textnormal{\textsl{f}}\texttt{}}\hfill[Escape\hbox{}sequence]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{\texttt{\textbackslash{}f}\textnormal{\textsl{f}}\texttt{}}& 
[Escape\hbox{}sequence]
+\end{tabularx}
 
 
\index[fn]{\textbackslash{}ff@\texttt{\texttt{\textbackslash{}f}\textnormal{\textsl{f}}\texttt{}}}%
-\noindent\texttt{\texttt{\textbackslash{}f(}\textnormal{\textsl{fn}}\texttt{}}\hfill[Escape\hbox{}sequence]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{\texttt{\textbackslash{}f(}\textnormal{\textsl{fn}}\texttt{}}&
 [Escape\hbox{}sequence]
+\end{tabularx}
 
 
\index[fn]{\textbackslash{}f(fn@\texttt{\texttt{\textbackslash{}f(}\textnormal{\textsl{fn}}\texttt{}}}%
-\noindent\texttt{\texttt{\textbackslash{}f[}\textnormal{\textsl{font}}\texttt{]}
 
\EmbracOn{}\textnormal{\textsl{\EmbracMakeKnown{texttt}\texttt{\textbackslash{}f[}\EmbracOff{}\textnormal{\textsl{font}}\EmbracOn{}\texttt{]}}}\EmbracOff{}}\hfill[Escape\hbox{}sequence]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{\texttt{\textbackslash{}f[}\textnormal{\textsl{font}}\texttt{]}
 
\EmbracOn{}\textnormal{\textsl{\EmbracMakeKnown{texttt}\texttt{\textbackslash{}f[}\EmbracOff{}\textnormal{\textsl{font}}\EmbracOn{}\texttt{]}}}\EmbracOff{}}&
 [Escape\hbox{}sequence]
+\end{tabularx}
 \ExplSyntaxOn%
 
\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
 \ExplSyntaxOff%
 
 
\index[fn]{\textbackslash{}f[font]@\texttt{\texttt{\textbackslash{}f[}\textnormal{\textsl{font}}\texttt{]}}}%
-\noindent\texttt{\texttt{\textbackslash{}n[.sty]}}\hfill[Register]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{\texttt{\textbackslash{}n[.sty]}}& [Register]
+\end{tabularx}
 
 \index[fn]{\textbackslash{}n[.sty]@\texttt{\texttt{\textbackslash{}n[.sty]}}}%
 \begin{quote}
@@ -222,13 +373,23 @@ to \GNUTexinfocommandstyletextvar{font} (one-character 
name\hbox{}\GNUTexinfocom
 \GNUTexinfocommandstyletextvar{fn}).
 \end{quote}
 
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{[ 
\EmbracOff{}\textnormal{[}\EmbracOn{} \textsl{[} 
\EmbracMakeKnown{texttt}\texttt{[} \texttt{[} 
\EmbracOff{}\textnormal{\textsl{[}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{\textsl{[}}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{} , 
\EmbracOff{}\textnormal{,}\EmbracOn{} \textsl{,} \texttt{,} \texttt{,} 
\EmbracOff{}\textnormal{\textsl{,}}\EmbracOn{} \EmbracOff{}\textnormal [...]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{[ 
\EmbracOff{}\textnormal{[}\EmbracOn{} \textsl{[} 
\EmbracMakeKnown{texttt}\texttt{[} \texttt{[} 
\EmbracOff{}\textnormal{\textsl{[}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{\textsl{[}}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{} , 
\EmbracOff{}\textnormal{,}\EmbracOn{} \textsl{,} \texttt{,} \texttt{,} 
\EmbracOff{}\textnormal{\textsl{,}}\EmbracOn{} \EmbracOff{}\textnormal [...]
+\end{tabularx}
 \ExplSyntaxOn%
 
\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
 \ExplSyntaxOff%
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{[] 
\EmbracOff{}\textnormal{[]}\EmbracOn{} \textsl{[]} 
\EmbracMakeKnown{texttt}\texttt{[]} \texttt{[]} 
\EmbracOff{}\textnormal{\textsl{[]}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{[]}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{\textsl{[]}}}\EmbracOn{}}}\EmbracOff{}}\hfill[Special
 Form]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{[] 
\EmbracOff{}\textnormal{[]}\EmbracOn{} \textsl{[]} 
\EmbracMakeKnown{texttt}\texttt{[]} \texttt{[]} 
\EmbracOff{}\textnormal{\textsl{[]}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{[]}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{\textsl{[]}}}\EmbracOn{}}}\EmbracOff{}}& 
[Special Form]
+\end{tabularx}
 \ExplSyntaxOn%
 
\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
 \ExplSyntaxOff%
@@ -239,7 +400,12 @@ to \GNUTexinfocommandstyletextvar{font} (one-character 
name\hbox{}\GNUTexinfocom
 test formatting of separators
 \end{quote}
 
-\noindent\texttt{int foobar (int\ \GNUTexinfocommandstyletextvar{f---oo},\ 
float\ \GNUTexinfocommandstyletextvar{b--ar})}\hfill[Library Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar (int\ \GNUTexinfocommandstyletextvar{f---oo},\ 
float\ \GNUTexinfocommandstyletextvar{b--ar})}& [Library Function]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 \begin{quote}
@@ -247,7 +413,12 @@ test formatting of separators
 \dots{}\@ with var for \GNUTexinfocommandstyletextvar{f---oo} and 
\GNUTexinfocommandstyletextvar{b--ar}
 \end{quote}
 
-\noindent\texttt{int foobar (int\ \textnormal{\textsl{f---oo}},\ float\ 
\textnormal{\textsl{b--ar}})}\hfill[Library Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar (int\ \textnormal{\textsl{f---oo}},\ float\ 
\textnormal{\textsl{b--ar}})}& [Library Function]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 \begin{quote}
@@ -256,7 +427,12 @@ test formatting of separators
 \end{quote}
 
 \noindent{}produces:
-\noindent\texttt{border-pattern}\hfill[Class Option of \texttt{Window}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{border-pattern}& [Class Option of \texttt{Window}]
+\end{tabularx}
 
 \index[vr]{border-pattern@\texttt{border-pattern}}%
 \begin{quote}
@@ -264,7 +440,12 @@ test formatting of separators
 \dots{}\@
 \end{quote}
 
-\noindent\texttt{\texttt{int} border-pattern}\hfill[Class Option of 
\texttt{Window}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{\texttt{int} border-pattern}& [Class Option of 
\texttt{Window}]
+\end{tabularx}
 
 \index[vr]{border-pattern of Window@\texttt{border-pattern\ of Window}}%
 \begin{quote}
@@ -273,7 +454,12 @@ test formatting of separators
 \end{quote}
 
 \begin{quote}
-\noindent\texttt{int foobar (int\ \GNUTexinfocommandstyletextvar{foo},\ float\ 
\GNUTexinfocommandstyletextvar{bar})}\hfill[Library Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar (int\ \GNUTexinfocommandstyletextvar{foo},\ float\ 
\GNUTexinfocommandstyletextvar{bar})}& [Library Function]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 \begin{quote}
@@ -282,7 +468,12 @@ test formatting of separators
 \end{quote}
 \end{quote}
 
-\noindent\texttt{apply \EmbracOn{}\textnormal{\textsl{function \&rest 
arguments}}\EmbracOff{}}\hfill[Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{apply \EmbracOn{}\textnormal{\textsl{function \&rest 
arguments}}\EmbracOff{}}& [Function]
+\end{tabularx}
 
 \index[fn]{apply@\texttt{apply}}%
 \begin{quote}
@@ -290,7 +481,12 @@ test formatting of separators
 \texttt{apply} calls no var \GNUTexinfocommandstyletextvar{function} with 
\GNUTexinfocommandstyletextvar{arguments}
 \end{quote}
 
-\noindent\texttt{apply \EmbracOn{}\textnormal{\textsl{function 
\EmbracOff{}\textnormal{\textbf{\&rest}}\EmbracOn{} 
argument}}\EmbracOff{}}\hfill[Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{apply \EmbracOn{}\textnormal{\textsl{function 
\EmbracOff{}\textnormal{\textbf{\&rest}}\EmbracOn{} argument}}\EmbracOff{}}& 
[Function]
+\end{tabularx}
 
 \index[fn]{apply@\texttt{apply}}%
 \begin{quote}
@@ -298,7 +494,12 @@ test formatting of separators
 explicit keyword marking, no var \GNUTexinfocommandstyletextvar{function} with 
\GNUTexinfocommandstyletextvar{arguments}
 \end{quote}
 
-\noindent\texttt{name \EmbracOn{}\textnormal{\textsl{argument 
\EmbracMakeKnown{texttt}\texttt{int} \texttt{a{-}{-}b} 
\GNUTexinfocommandstyletextvar{v--ar1}, word \texttt{{-}{-}} (\texttt{type 
o{-}{-}ther}, \GNUTexinfocommandstyletextvar{v---ar2}  [\texttt{float} 
[\GNUTexinfocommandstyletextvar{var4}]])}}\EmbracOff{}}\hfill[Category]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{name \EmbracOn{}\textnormal{\textsl{argument 
\EmbracMakeKnown{texttt}\texttt{int} \texttt{a{-}{-}b} 
\GNUTexinfocommandstyletextvar{v--ar1}, word \texttt{{-}{-}} (\texttt{type 
o{-}{-}ther}, \GNUTexinfocommandstyletextvar{v---ar2}  [\texttt{float} 
[\GNUTexinfocommandstyletextvar{var4}]])}}\EmbracOff{}}& [Category]
+\end{tabularx}
 \ExplSyntaxOn%
 
\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
 \ExplSyntaxOff%
@@ -309,37 +510,92 @@ explicit keyword marking, no var 
\GNUTexinfocommandstyletextvar{function} with \
 In deffn with code and var used
 \end{quote}
 
-\noindent\texttt{int foobar (int\ \GNUTexinfocommandstyletextvar{f---oo}[,\ 
float\ \GNUTexinfocommandstyletextvar{b--ar}])\ default}\hfill[Library Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar (int\ \GNUTexinfocommandstyletextvar{f---oo}[,\ 
float\ \GNUTexinfocommandstyletextvar{b--ar}])\ default}& [Library Function]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\textnormal{[},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}\textnormal{]})\ r}\hfill[Library Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\textnormal{[},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}\textnormal{]})\ r}& [Library Function]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\GNUTexinfocommandstyletextvar{[},\ 
float\ \GNUTexinfocommandstyletextvar{b--ar}\GNUTexinfocommandstyletextvar{]})\ 
var}\hfill[Library Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\GNUTexinfocommandstyletextvar{[},\ 
float\ \GNUTexinfocommandstyletextvar{b--ar}\GNUTexinfocommandstyletextvar{]})\ 
var}& [Library Function]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\textsl{[},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}\textsl{]})\ slanted}\hfill[Library 
Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\textsl{[},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}\textsl{]})\ slanted}& [Library Function]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\texttt{[},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}\texttt{]})\ code}\hfill[Library Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\texttt{[},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}\texttt{]})\ code}& [Library Function]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\texttt{[},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}\texttt{]})\ t}\hfill[Library Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\texttt{[},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}\texttt{]})\ t}& [Library Function]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\texttt{\textbf{[}},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}\texttt{\textbf{]}})\ t:b}\hfill[Library 
Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\texttt{\textbf{[}},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}\texttt{\textbf{]}})\ t:b}& [Library 
Function]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\textnormal{\GNUTexinfocommandstyletextvar{[}},\
 float\ 
\GNUTexinfocommandstyletextvar{b--ar}\textnormal{\GNUTexinfocommandstyletextvar{]}})\
 r:var}\hfill[Library Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\textnormal{\GNUTexinfocommandstyletextvar{[}},\
 float\ 
\GNUTexinfocommandstyletextvar{b--ar}\textnormal{\GNUTexinfocommandstyletextvar{]}})\
 r:var}& [Library Function]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\textnormal{\textsl{[}},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}\textnormal{\textsl{]}})\ 
r:slanted}\hfill[Library Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\textnormal{\textsl{[}},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}\textnormal{\textsl{]}})\ r:slanted}& 
[Library Function]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\textnormal{\texttt{[}},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}\textnormal{\texttt{]}})\ 
r:code}\hfill[Library Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\textnormal{\texttt{[}},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}\textnormal{\texttt{]}})\ r:code}& 
[Library Function]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\textnormal{\texttt{[}},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}\textnormal{\texttt{]}})\ 
r:t}\hfill[Library Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\textnormal{\texttt{[}},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}\textnormal{\texttt{]}})\ r:t}& [Library 
Function]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 \begin{quote}
@@ -347,37 +603,92 @@ In deffn with code and var used
 separators
 \end{quote}
 
-\noindent\texttt{int foobar (i{-}{-}nt\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ default}\hfill[Library Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar (i{-}{-}nt\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ default}& [Library Function]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (\textnormal{i--nt}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ r}\hfill[Library Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar (\textnormal{i--nt}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ r}& [Library Function]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (\GNUTexinfocommandstyletextvar{i--nt}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ var}\hfill[Library Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar (\GNUTexinfocommandstyletextvar{i--nt}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ var}& [Library Function]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (\textsl{i{-}{-}nt}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ slanted}\hfill[Library Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar (\textsl{i{-}{-}nt}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ slanted}& [Library Function]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (\texttt{i{-}{-}nt}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ code}\hfill[Library Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar (\texttt{i{-}{-}nt}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ code}& [Library Function]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (\texttt{i{-}{-}nt}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ t}\hfill[Library Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar (\texttt{i{-}{-}nt}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ t}& [Library Function]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (\texttt{\textbf{i{-}{-}nt}}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ t:b}\hfill[Library Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar (\texttt{\textbf{i{-}{-}nt}}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ t:b}& [Library Function]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar 
(\textnormal{\GNUTexinfocommandstyletextvar{i--nt}}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ r:var}\hfill[Library Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar 
(\textnormal{\GNUTexinfocommandstyletextvar{i--nt}}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ r:var}& [Library Function]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (\textnormal{\textsl{i--nt}}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ r:slanted}\hfill[Library Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar (\textnormal{\textsl{i--nt}}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ r:slanted}& [Library Function]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (\textnormal{\texttt{i{-}{-}nt}}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ r:code}\hfill[Library Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar (\textnormal{\texttt{i{-}{-}nt}}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ r:code}& [Library Function]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (\textnormal{\texttt{i{-}{-}nt}}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ r:t}\hfill[Library Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{int foobar (\textnormal{\texttt{i{-}{-}nt}}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ r:t}& [Library Function]
+\end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 \begin{quote}
diff --git a/tp/t/results/converters_tests/frenchspacing_and_code.pl 
b/tp/t/results/converters_tests/frenchspacing_and_code.pl
index 7feacb731f..c2fd224568 100644
--- a/tp/t/results/converters_tests/frenchspacing_and_code.pl
+++ b/tp/t/results/converters_tests/frenchspacing_and_code.pl
@@ -2533,7 +2533,12 @@ In text w: z? n; p. f
 c:\\ d?\\ j
 \\end{GNUTexinfopreformatted}
 
-\\noindent\\texttt{type:\\ t.\\ c name?\\ n.\\ d arg?\\ e:\\ f.\\  
\\GNUTexinfocommandstyletextvar{v: g. h}\\ \\texttt{code?\\ is:\\ 
k}}\\hfill[cat: r. a on \\texttt{class:\\ MyC.\\ b}]
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill
+\\hangindent=2em
+\\noindent\\texttt{type:\\ t.\\ c name?\\ n.\\ d arg?\\ e:\\ f.\\  
\\GNUTexinfocommandstyletextvar{v: g. h}\\ \\texttt{code?\\ is:\\ k}}& [cat: r. 
a on \\texttt{class:\\ MyC.\\ b}]
+\\end{tabularx}
 
 \\index[fn]{name? n. d on class: MyC. b@\\texttt{name?\\ n.\\ d\\ on class:\\ 
MyC.\\ b}}%
 \\begin{quote}
@@ -2541,7 +2546,12 @@ c:\\ d?\\ j
 deftypeop
 \\end{quote}
 
-\\noindent\\texttt{vname?\\ n;\\ d \\EmbracOn{}\\textnormal{\\textsl{varg? ve: 
f. \\GNUTexinfocommandstyletextvar{vv: g? b} 
\\EmbracMakeKnown{texttt}\\texttt{vcode?\\ is:\\ 
a}}}\\EmbracOff{}}\\hfill[vcat: r. z on \\texttt{vclass:\\ MyC.\\ u}]
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill
+\\hangindent=2em
+\\noindent\\texttt{vname?\\ n;\\ d \\EmbracOn{}\\textnormal{\\textsl{varg? ve: 
f. \\GNUTexinfocommandstyletextvar{vv: g? b} 
\\EmbracMakeKnown{texttt}\\texttt{vcode?\\ is:\\ a}}}\\EmbracOff{}}& [vcat: r. 
z on \\texttt{vclass:\\ MyC.\\ u}]
+\\end{tabularx}
 \\ExplSyntaxOn%
 
\\cs_undefine:N{\\embrac_texttt:nn}\\cs_undefine:N{\\embrac_orig_texttt:n}\\cs_undefine:N{\\__embrac_texttt:n}%
 \\ExplSyntaxOff%
@@ -2565,7 +2575,12 @@ In text w: z? n; p. fn
 c:\\ d?\\ jn
 \\end{GNUTexinfopreformatted}
 
-\\noindent\\texttt{type:\\ t.\\ c name?\\ n.\\ d narg?\\ e:\\ f.\\  
\\GNUTexinfocommandstyletextvar{v: g. h}\\ \\texttt{code?\\ is:\\ 
k}}\\hfill[cat: r. a on \\texttt{class:\\ MyC.\\ b}]
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill
+\\hangindent=2em
+\\noindent\\texttt{type:\\ t.\\ c name?\\ n.\\ d narg?\\ e:\\ f.\\  
\\GNUTexinfocommandstyletextvar{v: g. h}\\ \\texttt{code?\\ is:\\ k}}& [cat: r. 
a on \\texttt{class:\\ MyC.\\ b}]
+\\end{tabularx}
 
 \\index[fn]{name? n. d on class: MyC. b@\\texttt{name?\\ n.\\ d\\ on class:\\ 
MyC.\\ b}}%
 \\begin{quote}
@@ -2573,7 +2588,12 @@ c:\\ d?\\ jn
 deftypeop n
 \\end{quote}
 
-\\noindent\\texttt{vname?\\ n;\\ d \\EmbracOn{}\\textnormal{\\textsl{varg? ve: 
f. \\GNUTexinfocommandstyletextvar{vv: g? b} 
\\EmbracMakeKnown{texttt}\\texttt{vcode?\\ is:\\ 
a}}}\\EmbracOff{}}\\hfill[vcat: r. z on \\texttt{nvclass:\\ MyC.\\ u}]
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill
+\\hangindent=2em
+\\noindent\\texttt{vname?\\ n;\\ d \\EmbracOn{}\\textnormal{\\textsl{varg? ve: 
f. \\GNUTexinfocommandstyletextvar{vv: g? b} 
\\EmbracMakeKnown{texttt}\\texttt{vcode?\\ is:\\ a}}}\\EmbracOff{}}& [vcat: r. 
z on \\texttt{nvclass:\\ MyC.\\ u}]
+\\end{tabularx}
 \\ExplSyntaxOn%
 
\\cs_undefine:N{\\embrac_texttt:nn}\\cs_undefine:N{\\embrac_orig_texttt:n}\\cs_undefine:N{\\__embrac_texttt:n}%
 \\ExplSyntaxOff%
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl 
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index 09a5c4966c..ee363a1efd 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -3623,7 +3623,12 @@ $result_converted{'latex'}->{'test_deftypefnnewline'} = '
 \\chapter{{chap}}
 \\label{anchor:chapter}%
 
-\\noindent\\texttt{data-type\\leavevmode{}\\\\name 
arguments...}\\hfill[Function]
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill
+\\hangindent=2em
+\\noindent\\texttt{data-type\\leavevmode{}\\\\name arguments...}& [Function]
+\\end{tabularx}
 
 \\index[fn]{name@\\texttt{name}}%
 \\begin{quote}
@@ -3631,7 +3636,12 @@ $result_converted{'latex'}->{'test_deftypefnnewline'} = '
 aaa
 \\end{quote}
 
-\\noindent\\texttt{t{-}{-}ype\\leavevmode{}\\\\d{-}{-}eftypefn\\_name}\\hfill[c--ategory]
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill
+\\hangindent=2em
+\\noindent\\texttt{t{-}{-}ype\\leavevmode{}\\\\d{-}{-}eftypefn\\_name}& 
[c--ategory]
+\\end{tabularx}
 
 \\index[fn]{d--eftypefn\\_name@\\texttt{d{-}{-}eftypefn\\_name}}%
 \\begin{quote}
@@ -3639,7 +3649,12 @@ aaa
 d--eftypefn no arg
 \\end{quote}
 
-\\noindent\\texttt{t{-}{-}ype\\leavevmode{}\\\\d{-}{-}eftypeop\\_name 
a{-}{-}rguments...}\\hfill[c--ategory on \\texttt{c{-}{-}lass}]
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill
+\\hangindent=2em
+\\noindent\\texttt{t{-}{-}ype\\leavevmode{}\\\\d{-}{-}eftypeop\\_name 
a{-}{-}rguments...}& [c--ategory on \\texttt{c{-}{-}lass}]
+\\end{tabularx}
 
 \\index[fn]{d--eftypeop\\_name on c--lass@\\texttt{d{-}{-}eftypeop\\_name\\ on 
c{-}{-}lass}}%
 \\begin{quote}
@@ -3647,7 +3662,12 @@ d--eftypefn no arg
 d--eftypeop
 \\end{quote}
 
-\\noindent\\texttt{t{-}{-}ype\\leavevmode{}\\\\d{-}{-}eftypeop\\_name}\\hfill[c--ategory
 on \\texttt{c{-}{-}lass}]
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill
+\\hangindent=2em
+\\noindent\\texttt{t{-}{-}ype\\leavevmode{}\\\\d{-}{-}eftypeop\\_name}& 
[c--ategory on \\texttt{c{-}{-}lass}]
+\\end{tabularx}
 
 \\index[fn]{d--eftypeop\\_name on c--lass@\\texttt{d{-}{-}eftypeop\\_name\\ on 
c{-}{-}lass}}%
 \\begin{quote}
@@ -3655,7 +3675,12 @@ d--eftypeop
 d--eftypeop no arg
 \\end{quote}
 
-\\noindent\\texttt{t{-}{-}ype d{-}{-}eftypecv\\_name}\\hfill[c--ategory of 
\\texttt{c{-}{-}lass}]
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill
+\\hangindent=2em
+\\noindent\\texttt{t{-}{-}ype d{-}{-}eftypecv\\_name}& [c--ategory of 
\\texttt{c{-}{-}lass}]
+\\end{tabularx}
 
 \\index[vr]{d--eftypecv\\_name of c--lass@\\texttt{d{-}{-}eftypecv\\_name\\ of 
c{-}{-}lass}}%
 \\begin{quote}
@@ -3663,7 +3688,12 @@ d--eftypeop no arg
 d--eftypecv
 \\end{quote}
 
-\\noindent\\texttt{t{-}{-}ype d{-}{-}eftypecv\\_name 
a{-}{-}rguments...}\\hfill[c--ategory of \\texttt{c{-}{-}lass}]
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill
+\\hangindent=2em
+\\noindent\\texttt{t{-}{-}ype d{-}{-}eftypecv\\_name a{-}{-}rguments...}& 
[c--ategory of \\texttt{c{-}{-}lass}]
+\\end{tabularx}
 
 \\index[vr]{d--eftypecv\\_name of c--lass@\\texttt{d{-}{-}eftypecv\\_name\\ of 
c{-}{-}lass}}%
 \\begin{quote}
@@ -3671,7 +3701,12 @@ d--eftypecv
 d--eftypecv with arguments
 \\end{quote}
 
-\\noindent\\texttt{arg}\\hfill[fun]
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill
+\\hangindent=2em
+\\noindent\\texttt{arg}& [fun]
+\\end{tabularx}
 
 \\index[fn]{arg@\\texttt{arg}}%
 \\begin{quote}
@@ -3680,7 +3715,12 @@ fff
 \\end{quote}
 
 
-\\noindent\\texttt{data-type2 name2 arguments2...}\\hfill[Function]
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill
+\\hangindent=2em
+\\noindent\\texttt{data-type2 name2 arguments2...}& [Function]
+\\end{tabularx}
 
 \\index[fn]{name2@\\texttt{name2}}%
 \\begin{quote}
@@ -3688,7 +3728,12 @@ fff
 aaa2
 \\end{quote}
 
-\\noindent\\texttt{t{-}{-}ype2 d{-}{-}eftypefn\\_name2}\\hfill[c--ategory2]
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill
+\\hangindent=2em
+\\noindent\\texttt{t{-}{-}ype2 d{-}{-}eftypefn\\_name2}& [c--ategory2]
+\\end{tabularx}
 
 \\index[fn]{d--eftypefn\\_name2@\\texttt{d{-}{-}eftypefn\\_name2}}%
 \\begin{quote}
@@ -3696,7 +3741,12 @@ aaa2
 d--eftypefn no arg2
 \\end{quote}
 
-\\noindent\\texttt{t{-}{-}ype2 d{-}{-}eftypeop\\_name2 
a{-}{-}rguments2...}\\hfill[c--ategory2 on \\texttt{c{-}{-}lass2}]
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill
+\\hangindent=2em
+\\noindent\\texttt{t{-}{-}ype2 d{-}{-}eftypeop\\_name2 a{-}{-}rguments2...}& 
[c--ategory2 on \\texttt{c{-}{-}lass2}]
+\\end{tabularx}
 
 \\index[fn]{d--eftypeop\\_name2 on c--lass2@\\texttt{d{-}{-}eftypeop\\_name2\\ 
on c{-}{-}lass2}}%
 \\begin{quote}
@@ -3704,7 +3754,12 @@ d--eftypefn no arg2
 d--eftypeop2
 \\end{quote}
 
-\\noindent\\texttt{t{-}{-}ype2 d{-}{-}eftypeop\\_name2}\\hfill[c--ategory2 on 
\\texttt{c{-}{-}lass2}]
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill
+\\hangindent=2em
+\\noindent\\texttt{t{-}{-}ype2 d{-}{-}eftypeop\\_name2}& [c--ategory2 on 
\\texttt{c{-}{-}lass2}]
+\\end{tabularx}
 
 \\index[fn]{d--eftypeop\\_name2 on c--lass2@\\texttt{d{-}{-}eftypeop\\_name2\\ 
on c{-}{-}lass2}}%
 \\begin{quote}
@@ -3712,7 +3767,12 @@ d--eftypeop2
 d--eftypeop no arg2
 \\end{quote}
 
-\\noindent\\texttt{t{-}{-}ype2 d{-}{-}eftypecv\\_name2}\\hfill[c--ategory2 of 
\\texttt{c{-}{-}lass2}]
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill
+\\hangindent=2em
+\\noindent\\texttt{t{-}{-}ype2 d{-}{-}eftypecv\\_name2}& [c--ategory2 of 
\\texttt{c{-}{-}lass2}]
+\\end{tabularx}
 
 \\index[vr]{d--eftypecv\\_name2 of c--lass2@\\texttt{d{-}{-}eftypecv\\_name2\\ 
of c{-}{-}lass2}}%
 \\begin{quote}
@@ -3720,7 +3780,12 @@ d--eftypeop no arg2
 d--eftypecv2
 \\end{quote}
 
-\\noindent\\texttt{t{-}{-}ype2 d{-}{-}eftypecv\\_name2 
a{-}{-}rguments2...}\\hfill[c--ategory2 of \\texttt{c{-}{-}lass2}]
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill
+\\hangindent=2em
+\\noindent\\texttt{t{-}{-}ype2 d{-}{-}eftypecv\\_name2 a{-}{-}rguments2...}& 
[c--ategory2 of \\texttt{c{-}{-}lass2}]
+\\end{tabularx}
 
 \\index[vr]{d--eftypecv\\_name2 of c--lass2@\\texttt{d{-}{-}eftypecv\\_name2\\ 
of c{-}{-}lass2}}%
 \\begin{quote}
@@ -3728,7 +3793,12 @@ d--eftypecv2
 d--eftypecv with arguments2
 \\end{quote}
 
-\\noindent\\texttt{arg2}\\hfill[fun2]
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill
+\\hangindent=2em
+\\noindent\\texttt{arg2}& [fun2]
+\\end{tabularx}
 
 \\index[fn]{arg2@\\texttt{arg2}}%
 \\begin{quote}
diff --git a/tp/t/results/def/omit_def_space.pl 
b/tp/t/results/def/omit_def_space.pl
index 923b8508f6..e50706f5cb 100644
--- a/tp/t/results/def/omit_def_space.pl
+++ b/tp/t/results/def/omit_def_space.pl
@@ -647,10 +647,20 @@ $result_converted{'latex'}->{'omit_def_space'} = 
'\\label{anchor:Top}%
 \\label{anchor:first}%
 
 
-\\noindent\\texttt{function\\EmbracOn{}\\textnormal{\\textsl{(arg1, 
arg2)}}\\EmbracOff{}}\\hfill[Function]
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill
+\\hangindent=2em
+\\noindent\\texttt{function\\EmbracOn{}\\textnormal{\\textsl{(arg1, 
arg2)}}\\EmbracOff{}}& [Function]
+\\end{tabularx}
 
 \\index[fn]{function@\\texttt{function}}%
-\\noindent\\texttt{another\\EmbracOn{}\\textnormal{\\textsl{(aarg)}}\\EmbracOff{}}\\hfill[Function]
+
+\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
+\\rightskip=5em plus 1 fill
+\\hangindent=2em
+\\noindent\\texttt{another\\EmbracOn{}\\textnormal{\\textsl{(aarg)}}\\EmbracOff{}}&
 [Function]
+\\end{tabularx}
 
 \\index[fn]{another@\\texttt{another}}%
 \\begin{quote}
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 3e79828ba2..7bc9b07934 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
@@ -9,6 +9,7 @@
 \usepackage{etoolbox}
 \usepackage{embrac}
 \usepackage{expl3}
+\usepackage{tabularx}
 \usepackage{titleps}
 \usepackage{float}
 \usepackage{babel}
@@ -85,7 +86,12 @@
 \label{anchor:chapter-ja}%
 
 In japanese. See 
\hyperref[anchor:chapter-ja]{\chaptername~\ref*{anchor:chapter-ja} [chapter 
ja], page~\pageref*{anchor:chapter-ja}}.
-\noindent\texttt{BBB 
\EmbracOn{}\textnormal{\textsl{CCC}}\EmbracOff{}}\hfill[Instance Variable of 
\texttt{AAA}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{BBB \EmbracOn{}\textnormal{\textsl{CCC}}\EmbracOff{}}& 
[Instance Variable of \texttt{AAA}]
+\end{tabularx}
 
 \index[vr]{BBB of AAA@\texttt{BBB\ of AAA}}%
 
@@ -94,7 +100,12 @@ In japanese. See 
\hyperref[anchor:chapter-ja]{\chaptername~\ref*{anchor:chapter-
 \label{anchor:chapter-en}%
 
 In english. See 
\hyperref[anchor:chapter-ja]{\chaptername~\ref*{anchor:chapter-ja} [chapter 
ja], page~\pageref*{anchor:chapter-ja}}.
-\noindent\texttt{BBB 
\EmbracOn{}\textnormal{\textsl{CCC}}\EmbracOff{}}\hfill[Instance Variable of 
\texttt{AAA}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{BBB \EmbracOn{}\textnormal{\textsl{CCC}}\EmbracOff{}}& 
[Instance Variable of \texttt{AAA}]
+\end{tabularx}
 
 \index[vr]{BBB of AAA@\texttt{BBB\ of AAA}}%
 
@@ -102,7 +113,12 @@ In english. See 
\hyperref[anchor:chapter-ja]{\chaptername~\ref*{anchor:chapter-j
 \chapter{{fr\_FR}}
 \label{anchor:chapter-fr_005fFR}%
 
-\noindent\texttt{BBB 
\EmbracOn{}\textnormal{\textsl{CCC}}\EmbracOff{}}\hfill[Variable d'instance of 
\texttt{AAA}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{BBB \EmbracOn{}\textnormal{\textsl{CCC}}\EmbracOff{}}& 
[Variable d'instance of \texttt{AAA}]
+\end{tabularx}
 
 \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 e540c804d3..2a1f82d69b 100644
--- a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
+++ b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
@@ -11,6 +11,7 @@
 \usepackage{array}
 \usepackage{embrac}
 \usepackage{expl3}
+\usepackage{tabularx}
 \usepackage[framemethod=tikz]{mdframed}
 \usepackage{enumitem}
 \usepackage{titleps}
@@ -755,7 +756,12 @@ f--ormat
 s--mallformat
 \end{GNUTexinfopreformatted}
 
-\noindent\texttt{d{-}{-}effn\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}effn\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory]
+\end{tabularx}
 
 \index[fn]{d--effn\_name@\texttt{d{-}{-}effn\_name}}%
 \begin{quote}
@@ -763,7 +769,12 @@ s--mallformat
 d--effn
 \end{quote}
 
-\noindent\texttt{de{-}{-}ffn\_name \EmbracOn{}\textnormal{\textsl{ar--guments  
  more args \leavevmode{}\\ even more so}}\EmbracOff{}}\hfill[cate--gory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{de{-}{-}ffn\_name \EmbracOn{}\textnormal{\textsl{ar--guments  
  more args \leavevmode{}\\ even more so}}\EmbracOff{}}& [cate--gory]
+\end{tabularx}
 
 \index[fn]{de--ffn\_name@\texttt{de{-}{-}ffn\_name}}%
 \begin{quote}
@@ -771,72 +782,177 @@ d--effn
 def--fn
 \end{quote}
 
-\noindent\texttt{\GNUTexinfocommandstyletextvar{i} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}\hfill[fset]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{\GNUTexinfocommandstyletextvar{i} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fset]
+\end{tabularx}
 
 \index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
 \index[cp]{index entry within deffn}%
-\noindent\texttt{truc 
\EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}\hfill[cmde]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{truc \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [cmde]
+\end{tabularx}
 
 \index[fn]{truc@\texttt{truc}}%
-\noindent\texttt{log trap 
\EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}\hfill[Command]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{log trap \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& 
[Command]
+\end{tabularx}
 
 \index[fn]{log trap@\texttt{log trap}}%
-\noindent\texttt{log trap1 
\EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}\hfill[Command]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{log trap1 \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& 
[Command]
+\end{tabularx}
 
 \index[fn]{log trap1@\texttt{log trap1}}%
-\noindent\texttt{log trap2 
\EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}\hfill[Command]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{log trap2 \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& 
[Command]
+\end{tabularx}
 
 \index[fn]{log trap2@\texttt{log trap2}}%
-\noindent\texttt{\textbf{id ule} 
\EmbracOn{}\textnormal{\textsl{truc}}\EmbracOff{}}\hfill[cmde]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{\textbf{id ule} 
\EmbracOn{}\textnormal{\textsl{truc}}\EmbracOff{}}& [cmde]
+\end{tabularx}
 
 \index[fn]{id ule@\texttt{\textbf{id ule}}}%
-\noindent\texttt{\textbf{id `\texttt{i}'\ ule} 
\EmbracOn{}\textnormal{\textsl{truc}}\EmbracOff{}}\hfill[cmde2]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{\textbf{id `\texttt{i}'\ ule} 
\EmbracOn{}\textnormal{\textsl{truc}}\EmbracOff{}}& [cmde2]
+\end{tabularx}
 
 \index[fn]{id i ule@\texttt{\textbf{id `\texttt{i}'\ ule}}}%
-\noindent\texttt{}\hfill[]
 
-\noindent\texttt{machin}\hfill[]
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& []
+\end{tabularx}
+
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{machin}& []
+\end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{bidule machin}\hfill[]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{bidule machin}& []
+\end{tabularx}
 
 \index[fn]{bidule machin@\texttt{bidule machin}}%
-\noindent\texttt{machin}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{machin}& [truc]
+\end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{}\hfill[truc]
 
-\noindent\texttt{followed \EmbracOn{}\textnormal{\textsl{by a 
comment}}\EmbracOff{}}\hfill[truc]
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& [truc]
+\end{tabularx}
+
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{followed \EmbracOn{}\textnormal{\textsl{by a 
comment}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{followed@\texttt{followed}}%
-\noindent\texttt{}\hfill[]
 
-\noindent\texttt{a \EmbracOn{}\textnormal{\textsl{b c d e 
\EmbracMakeKnown{textbf}\textbf{f g} h i}}\EmbracOff{}}\hfill[truc]
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& []
+\end{tabularx}
+
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{a \EmbracOn{}\textnormal{\textsl{b c d e 
\EmbracMakeKnown{textbf}\textbf{f g} h i}}\EmbracOff{}}& [truc]
+\end{tabularx}
 \ExplSyntaxOn%
 
\cs_undefine:N{\embrac_textbf:nn}\cs_undefine:N{\embrac_orig_textbf:n}\cs_undefine:N{\__embrac_textbf:n}%
 \ExplSyntaxOff%
 
 \index[fn]{a@\texttt{a}}%
-\noindent\texttt{deffnx \EmbracOn{}\textnormal{\textsl{before end 
deffn}}\EmbracOff{}}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{deffnx \EmbracOn{}\textnormal{\textsl{before end 
deffn}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{deffnx@\texttt{deffnx}}%
 
 
-\noindent\texttt{deffn}\hfill[empty]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{deffn}& [empty]
+\end{tabularx}
 
 \index[fn]{deffn@\texttt{deffn}}%
 
-\noindent\texttt{deffn \EmbracOn{}\textnormal{\textsl{with 
deffnx}}\EmbracOff{}}\hfill[empty]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{deffn \EmbracOn{}\textnormal{\textsl{with 
deffnx}}\EmbracOff{}}& [empty]
+\end{tabularx}
 
 \index[fn]{deffn@\texttt{deffn}}%
-\noindent\texttt{deffnx}\hfill[empty]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{deffnx}& [empty]
+\end{tabularx}
 
 \index[fn]{deffnx@\texttt{deffnx}}%
 
-\noindent\texttt{\GNUTexinfocommandstyletextvar{i} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}\hfill[fset]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{\GNUTexinfocommandstyletextvar{i} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fset]
+\end{tabularx}
 
 \index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
-\noindent\texttt{truc 
\EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}\hfill[cmde]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{truc \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [cmde]
+\end{tabularx}
 
 \index[fn]{truc@\texttt{truc}}%
 \begin{quote}
@@ -845,7 +961,12 @@ text in def item for second def item
 \end{quote}
 
 
-\noindent\texttt{d{-}{-}efvr\_name}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efvr\_name}& [c--ategory]
+\end{tabularx}
 
 \index[cp]{d--efvr\_name@\texttt{d{-}{-}efvr\_name}}%
 \begin{quote}
@@ -853,7 +974,12 @@ text in def item for second def item
 d--efvr
 \end{quote}
 
-\noindent\texttt{n{-}{-}ame 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{n{-}{-}ame 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory]
+\end{tabularx}
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
 \begin{quote}
@@ -861,7 +987,12 @@ d--efvr
 d--effn
 \end{quote}
 
-\noindent\texttt{n{-}{-}ame}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{n{-}{-}ame}& [c--ategory]
+\end{tabularx}
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
 \begin{quote}
@@ -869,7 +1000,12 @@ d--effn
 d--effn no arg
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name 
a{-}{-}rguments...}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name a{-}{-}rguments...}& 
[c--ategory]
+\end{tabularx}
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
 \begin{quote}
@@ -877,7 +1013,12 @@ d--effn no arg
 d--eftypefn
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name}& [c--ategory]
+\end{tabularx}
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
 \begin{quote}
@@ -885,7 +1026,12 @@ d--eftypefn
 d--eftypefn no arg
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypeop\_name 
a{-}{-}rguments...}\hfill[c--ategory on \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypeop\_name a{-}{-}rguments...}& 
[c--ategory on \texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[fn]{d--eftypeop\_name on c--lass@\texttt{d{-}{-}eftypeop\_name\ on 
c{-}{-}lass}}%
 \begin{quote}
@@ -893,7 +1039,12 @@ d--eftypefn no arg
 d--eftypeop
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypeop\_name}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypeop\_name}& [c--ategory on 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[fn]{d--eftypeop\_name on c--lass@\texttt{d{-}{-}eftypeop\_name\ on 
c{-}{-}lass}}%
 \begin{quote}
@@ -901,7 +1052,12 @@ d--eftypeop
 d--eftypeop no arg
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypevr\_name}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypevr\_name}& [c--ategory]
+\end{tabularx}
 
 \index[cp]{d--eftypevr\_name@\texttt{d{-}{-}eftypevr\_name}}%
 \begin{quote}
@@ -909,7 +1065,12 @@ d--eftypeop no arg
 d--eftypevr
 \end{quote}
 
-\noindent\texttt{d{-}{-}efcv\_name}\hfill[c--ategory of \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efcv\_name}& [c--ategory of \texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
 \begin{quote}
@@ -917,7 +1078,12 @@ d--eftypevr
 d--efcv
 \end{quote}
 
-\noindent\texttt{d{-}{-}efcv\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[c--ategory 
of \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efcv\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory of 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
 \begin{quote}
@@ -925,7 +1091,12 @@ d--efcv
 d--efcv with arguments
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypecv\_name}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypecv\_name}& [c--ategory of 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name\ of 
c{-}{-}lass}}%
 \begin{quote}
@@ -933,7 +1104,12 @@ d--efcv with arguments
 d--eftypecv
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypecv\_name 
a{-}{-}rguments...}\hfill[c--ategory of \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypecv\_name a{-}{-}rguments...}& 
[c--ategory of \texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name\ of 
c{-}{-}lass}}%
 \begin{quote}
@@ -941,7 +1117,12 @@ d--eftypecv
 d--eftypecv with arguments
 \end{quote}
 
-\noindent\texttt{d{-}{-}efop\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[c--ategory 
on \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efop\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory on 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name\ on 
c{-}{-}lass}}%
 \begin{quote}
@@ -949,7 +1130,12 @@ d--eftypecv with arguments
 d--efop
 \end{quote}
 
-\noindent\texttt{d{-}{-}efop\_name}\hfill[c--ategory on \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efop\_name}& [c--ategory on \texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name\ on 
c{-}{-}lass}}%
 \begin{quote}
@@ -957,7 +1143,12 @@ d--efop
 d--efop no arg
 \end{quote}
 
-\noindent\texttt{d{-}{-}eftp\_name 
\EmbracOn{}\textnormal{\textsl{a--ttributes...}}\EmbracOff{}}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}eftp\_name 
\EmbracOn{}\textnormal{\textsl{a--ttributes...}}\EmbracOff{}}& [c--ategory]
+\end{tabularx}
 
 \index[tp]{d--eftp\_name@\texttt{d{-}{-}eftp\_name}}%
 \begin{quote}
@@ -965,7 +1156,12 @@ d--efop no arg
 d--eftp
 \end{quote}
 
-\noindent\texttt{d{-}{-}efun\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efun\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Function]
+\end{tabularx}
 
 \index[fn]{d--efun\_name@\texttt{d{-}{-}efun\_name}}%
 \begin{quote}
@@ -973,7 +1169,12 @@ d--eftp
 d--efun
 \end{quote}
 
-\noindent\texttt{d{-}{-}efmac\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[Macro]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efmac\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Macro]
+\end{tabularx}
 
 \index[fn]{d--efmac\_name@\texttt{d{-}{-}efmac\_name}}%
 \begin{quote}
@@ -981,7 +1182,12 @@ d--efun
 d--efmac
 \end{quote}
 
-\noindent\texttt{d{-}{-}efspec\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[Special Form]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efspec\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
 
 \index[fn]{d--efspec\_name@\texttt{d{-}{-}efspec\_name}}%
 \begin{quote}
@@ -989,7 +1195,12 @@ d--efmac
 d--efspec
 \end{quote}
 
-\noindent\texttt{d{-}{-}efvar\_name}\hfill[Variable]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efvar\_name}& [Variable]
+\end{tabularx}
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
 \begin{quote}
@@ -997,7 +1208,12 @@ d--efspec
 d--efvar
 \end{quote}
 
-\noindent\texttt{d{-}{-}efvar\_name \EmbracOn{}\textnormal{\textsl{arg--var 
arg--var1}}\EmbracOff{}}\hfill[Variable]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efvar\_name \EmbracOn{}\textnormal{\textsl{arg--var 
arg--var1}}\EmbracOff{}}& [Variable]
+\end{tabularx}
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
 \begin{quote}
@@ -1005,7 +1221,12 @@ d--efvar
 d--efvar with args
 \end{quote}
 
-\noindent\texttt{d{-}{-}efopt\_name}\hfill[User Option]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efopt\_name}& [User Option]
+\end{tabularx}
 
 \index[cp]{d--efopt\_name@\texttt{d{-}{-}efopt\_name}}%
 \begin{quote}
@@ -1013,7 +1234,12 @@ d--efvar with args
 d--efopt
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypefun\_name 
a{-}{-}rguments...}\hfill[Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypefun\_name a{-}{-}rguments...}& 
[Function]
+\end{tabularx}
 
 \index[fn]{d--eftypefun\_name@\texttt{d{-}{-}eftypefun\_name}}%
 \begin{quote}
@@ -1021,7 +1247,12 @@ d--efopt
 d--eftypefun
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypevar\_name}\hfill[Variable]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypevar\_name}& [Variable]
+\end{tabularx}
 
 \index[cp]{d--eftypevar\_name@\texttt{d{-}{-}eftypevar\_name}}%
 \begin{quote}
@@ -1029,7 +1260,12 @@ d--eftypefun
 d--eftypevar
 \end{quote}
 
-\noindent\texttt{d{-}{-}efivar\_name}\hfill[Instance Variable of 
\texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efivar\_name}& [Instance Variable of 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[cp]{d--efivar\_name of c--lass@\texttt{d{-}{-}efivar\_name\ of 
c{-}{-}lass}}%
 \begin{quote}
@@ -1037,7 +1273,12 @@ d--eftypevar
 d--efivar
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypeivar\_name}\hfill[Instance Variable 
of \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypeivar\_name}& [Instance Variable of 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[cp]{d--eftypeivar\_name of c--lass@\texttt{d{-}{-}eftypeivar\_name\ of 
c{-}{-}lass}}%
 \begin{quote}
@@ -1045,7 +1286,12 @@ d--efivar
 d--eftypeivar
 \end{quote}
 
-\noindent\texttt{d{-}{-}efmethod\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[Method on 
\texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efmethod\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Method on 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[fn]{d--efmethod\_name on c--lass@\texttt{d{-}{-}efmethod\_name\ on 
c{-}{-}lass}}%
 \begin{quote}
@@ -1053,7 +1299,12 @@ d--eftypeivar
 d--efmethod
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypemethod\_name 
a{-}{-}rguments...}\hfill[Method on \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypemethod\_name a{-}{-}rguments...}& 
[Method on \texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[fn]{d--eftypemethod\_name on c--lass@\texttt{d{-}{-}eftypemethod\_name\ 
on c{-}{-}lass}}%
 \begin{quote}
@@ -1062,7 +1313,12 @@ d--eftypemethod
 \end{quote}
 
 
-\noindent\texttt{data-type2\leavevmode{}\\name2 arguments2...}\hfill[Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{data-type2\leavevmode{}\\name2 arguments2...}& [Function]
+\end{tabularx}
 
 \index[fn]{name2@\texttt{name2}}%
 \begin{quote}
@@ -1070,7 +1326,12 @@ d--eftypemethod
 aaa2
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypefn\_name2}\hfill[c--ategory2]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypefn\_name2}& 
[c--ategory2]
+\end{tabularx}
 
 \index[fn]{d--eftypefn\_name2@\texttt{d{-}{-}eftypefn\_name2}}%
 \begin{quote}
@@ -1078,7 +1339,12 @@ aaa2
 d--eftypefn no arg2
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2 
a{-}{-}rguments2...}\hfill[c--ategory2 on \texttt{c{-}{-}lass2}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2 
a{-}{-}rguments2...}& [c--ategory2 on \texttt{c{-}{-}lass2}]
+\end{tabularx}
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2\ on 
c{-}{-}lass2}}%
 \begin{quote}
@@ -1086,7 +1352,12 @@ d--eftypefn no arg2
 d--eftypeop2
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2}\hfill[c--ategory2
 on \texttt{c{-}{-}lass2}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2}& 
[c--ategory2 on \texttt{c{-}{-}lass2}]
+\end{tabularx}
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2\ on 
c{-}{-}lass2}}%
 \begin{quote}
@@ -1094,7 +1365,12 @@ d--eftypeop2
 d--eftypeop no arg2
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype2 d{-}{-}eftypecv\_name2}\hfill[c--ategory2 of 
\texttt{c{-}{-}lass2}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype2 d{-}{-}eftypecv\_name2}& [c--ategory2 of 
\texttt{c{-}{-}lass2}]
+\end{tabularx}
 
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2\ of 
c{-}{-}lass2}}%
 \begin{quote}
@@ -1102,7 +1378,12 @@ d--eftypeop no arg2
 d--eftypecv2
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype2 d{-}{-}eftypecv\_name2 
a{-}{-}rguments2...}\hfill[c--ategory2 of \texttt{c{-}{-}lass2}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype2 d{-}{-}eftypecv\_name2 a{-}{-}rguments2...}& 
[c--ategory2 of \texttt{c{-}{-}lass2}]
+\end{tabularx}
 
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2\ of 
c{-}{-}lass2}}%
 \begin{quote}
@@ -1110,7 +1391,12 @@ d--eftypecv2
 d--eftypecv with arguments2
 \end{quote}
 
-\noindent\texttt{arg2}\hfill[fun2]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{arg2}& [fun2]
+\end{tabularx}
 
 \index[fn]{arg2@\texttt{arg2}}%
 \begin{quote}
@@ -1392,39 +1678,99 @@ b
 l--ine
 \end{description}
 
-\noindent\texttt{}\hfill[fun]
 
-\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose 
and}}\EmbracOff{}}\hfill[truc]
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& [fun]
+\end{tabularx}
+
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose 
and}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and  
after}}\EmbracOff{}}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and  
after}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and 
}}\EmbracOff{}}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and 
}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and and 
after}}\EmbracOff{}}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and and 
after}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{followed \EmbracOn{}\textnormal{\textsl{by a 
comment}}\EmbracOff{}}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{followed \EmbracOn{}\textnormal{\textsl{by a 
comment}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{followed@\texttt{followed}}%
 Various deff lines
-\noindent\texttt{after \EmbracOn{}\textnormal{\textsl{a deff 
item}}\EmbracOff{}}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{after \EmbracOn{}\textnormal{\textsl{a deff 
item}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{after@\texttt{after}}%
 
-\noindent\texttt{\GNUTexinfocommandstyletextvar{invalid} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}\hfill[fsetinv]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{\GNUTexinfocommandstyletextvar{invalid} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fsetinv]
+\end{tabularx}
 
 \index[fn]{invalid@\texttt{\GNUTexinfocommandstyletextvar{invalid}}}%
-\noindent\texttt{}\hfill[\textbf{id `\texttt{i}' ule}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& [\textbf{id `\texttt{i}' ule}]
+\end{tabularx}
 
 
-\noindent\texttt{}\hfill[aaa]
 
-\noindent\texttt{}\hfill[]
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& [aaa]
+\end{tabularx}
 
-\noindent\texttt{}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& []
+\end{tabularx}
+
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& [truc]
+\end{tabularx}
 
 
 g--roupe
@@ -2100,7 +2446,12 @@ f--ormat
 s--mallformat
 \end{GNUTexinfopreformatted}
 
-\noindent\texttt{d{-}{-}effn\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}effn\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory]
+\end{tabularx}
 
 \index[fn]{d--effn\_name@\texttt{d{-}{-}effn\_name}}%
 \begin{quote}
@@ -2108,7 +2459,12 @@ s--mallformat
 d--effn
 \end{quote}
 
-\noindent\texttt{de{-}{-}ffn\_name \EmbracOn{}\textnormal{\textsl{ar--guments  
  more args \leavevmode{}\\ even more so}}\EmbracOff{}}\hfill[cate--gory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{de{-}{-}ffn\_name \EmbracOn{}\textnormal{\textsl{ar--guments  
  more args \leavevmode{}\\ even more so}}\EmbracOff{}}& [cate--gory]
+\end{tabularx}
 
 \index[fn]{de--ffn\_name@\texttt{de{-}{-}ffn\_name}}%
 \begin{quote}
@@ -2116,72 +2472,177 @@ d--effn
 def--fn
 \end{quote}
 
-\noindent\texttt{\GNUTexinfocommandstyletextvar{i} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}\hfill[fset]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{\GNUTexinfocommandstyletextvar{i} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fset]
+\end{tabularx}
 
 \index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
 \index[cp]{index entry within deffn}%
-\noindent\texttt{truc 
\EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}\hfill[cmde]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{truc \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [cmde]
+\end{tabularx}
 
 \index[fn]{truc@\texttt{truc}}%
-\noindent\texttt{log trap 
\EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}\hfill[Command]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{log trap \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& 
[Command]
+\end{tabularx}
 
 \index[fn]{log trap@\texttt{log trap}}%
-\noindent\texttt{log trap1 
\EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}\hfill[Command]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{log trap1 \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& 
[Command]
+\end{tabularx}
 
 \index[fn]{log trap1@\texttt{log trap1}}%
-\noindent\texttt{log trap2 
\EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}\hfill[Command]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{log trap2 \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& 
[Command]
+\end{tabularx}
 
 \index[fn]{log trap2@\texttt{log trap2}}%
-\noindent\texttt{\textbf{id ule} 
\EmbracOn{}\textnormal{\textsl{truc}}\EmbracOff{}}\hfill[cmde]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{\textbf{id ule} 
\EmbracOn{}\textnormal{\textsl{truc}}\EmbracOff{}}& [cmde]
+\end{tabularx}
 
 \index[fn]{id ule@\texttt{\textbf{id ule}}}%
-\noindent\texttt{\textbf{id `\texttt{i}'\ ule} 
\EmbracOn{}\textnormal{\textsl{truc}}\EmbracOff{}}\hfill[cmde2]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{\textbf{id `\texttt{i}'\ ule} 
\EmbracOn{}\textnormal{\textsl{truc}}\EmbracOff{}}& [cmde2]
+\end{tabularx}
 
 \index[fn]{id i ule@\texttt{\textbf{id `\texttt{i}'\ ule}}}%
-\noindent\texttt{}\hfill[]
 
-\noindent\texttt{machin}\hfill[]
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& []
+\end{tabularx}
+
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{machin}& []
+\end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{bidule machin}\hfill[]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{bidule machin}& []
+\end{tabularx}
 
 \index[fn]{bidule machin@\texttt{bidule machin}}%
-\noindent\texttt{machin}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{machin}& [truc]
+\end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{}\hfill[truc]
 
-\noindent\texttt{followed \EmbracOn{}\textnormal{\textsl{by a 
comment}}\EmbracOff{}}\hfill[truc]
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& [truc]
+\end{tabularx}
+
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{followed \EmbracOn{}\textnormal{\textsl{by a 
comment}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{followed@\texttt{followed}}%
-\noindent\texttt{}\hfill[]
 
-\noindent\texttt{a \EmbracOn{}\textnormal{\textsl{b c d e 
\EmbracMakeKnown{textbf}\textbf{f g} h i}}\EmbracOff{}}\hfill[truc]
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& []
+\end{tabularx}
+
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{a \EmbracOn{}\textnormal{\textsl{b c d e 
\EmbracMakeKnown{textbf}\textbf{f g} h i}}\EmbracOff{}}& [truc]
+\end{tabularx}
 \ExplSyntaxOn%
 
\cs_undefine:N{\embrac_textbf:nn}\cs_undefine:N{\embrac_orig_textbf:n}\cs_undefine:N{\__embrac_textbf:n}%
 \ExplSyntaxOff%
 
 \index[fn]{a@\texttt{a}}%
-\noindent\texttt{deffnx \EmbracOn{}\textnormal{\textsl{before end 
deffn}}\EmbracOff{}}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{deffnx \EmbracOn{}\textnormal{\textsl{before end 
deffn}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{deffnx@\texttt{deffnx}}%
 
 
-\noindent\texttt{deffn}\hfill[empty]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{deffn}& [empty]
+\end{tabularx}
 
 \index[fn]{deffn@\texttt{deffn}}%
 
-\noindent\texttt{deffn \EmbracOn{}\textnormal{\textsl{with 
deffnx}}\EmbracOff{}}\hfill[empty]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{deffn \EmbracOn{}\textnormal{\textsl{with 
deffnx}}\EmbracOff{}}& [empty]
+\end{tabularx}
 
 \index[fn]{deffn@\texttt{deffn}}%
-\noindent\texttt{deffnx}\hfill[empty]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{deffnx}& [empty]
+\end{tabularx}
 
 \index[fn]{deffnx@\texttt{deffnx}}%
 
-\noindent\texttt{\GNUTexinfocommandstyletextvar{i} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}\hfill[fset]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{\GNUTexinfocommandstyletextvar{i} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fset]
+\end{tabularx}
 
 \index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
-\noindent\texttt{truc 
\EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}\hfill[cmde]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{truc \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [cmde]
+\end{tabularx}
 
 \index[fn]{truc@\texttt{truc}}%
 \begin{quote}
@@ -2190,7 +2651,12 @@ text in def item for second def item
 \end{quote}
 
 
-\noindent\texttt{d{-}{-}efvr\_name}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efvr\_name}& [c--ategory]
+\end{tabularx}
 
 \index[cp]{d--efvr\_name@\texttt{d{-}{-}efvr\_name}}%
 \begin{quote}
@@ -2198,7 +2664,12 @@ text in def item for second def item
 d--efvr
 \end{quote}
 
-\noindent\texttt{n{-}{-}ame 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{n{-}{-}ame 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory]
+\end{tabularx}
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
 \begin{quote}
@@ -2206,7 +2677,12 @@ d--efvr
 d--effn
 \end{quote}
 
-\noindent\texttt{n{-}{-}ame}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{n{-}{-}ame}& [c--ategory]
+\end{tabularx}
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
 \begin{quote}
@@ -2214,7 +2690,12 @@ d--effn
 d--effn no arg
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name 
a{-}{-}rguments...}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name a{-}{-}rguments...}& 
[c--ategory]
+\end{tabularx}
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
 \begin{quote}
@@ -2222,7 +2703,12 @@ d--effn no arg
 d--eftypefn
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name}& [c--ategory]
+\end{tabularx}
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
 \begin{quote}
@@ -2230,7 +2716,12 @@ d--eftypefn
 d--eftypefn no arg
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypeop\_name 
a{-}{-}rguments...}\hfill[c--ategory on \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypeop\_name a{-}{-}rguments...}& 
[c--ategory on \texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[fn]{d--eftypeop\_name on c--lass@\texttt{d{-}{-}eftypeop\_name\ on 
c{-}{-}lass}}%
 \begin{quote}
@@ -2238,7 +2729,12 @@ d--eftypefn no arg
 d--eftypeop
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypeop\_name}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypeop\_name}& [c--ategory on 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[fn]{d--eftypeop\_name on c--lass@\texttt{d{-}{-}eftypeop\_name\ on 
c{-}{-}lass}}%
 \begin{quote}
@@ -2246,7 +2742,12 @@ d--eftypeop
 d--eftypeop no arg
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypevr\_name}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypevr\_name}& [c--ategory]
+\end{tabularx}
 
 \index[cp]{d--eftypevr\_name@\texttt{d{-}{-}eftypevr\_name}}%
 \begin{quote}
@@ -2254,7 +2755,12 @@ d--eftypeop no arg
 d--eftypevr
 \end{quote}
 
-\noindent\texttt{d{-}{-}efcv\_name}\hfill[c--ategory of \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efcv\_name}& [c--ategory of \texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
 \begin{quote}
@@ -2262,7 +2768,12 @@ d--eftypevr
 d--efcv
 \end{quote}
 
-\noindent\texttt{d{-}{-}efcv\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[c--ategory 
of \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efcv\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory of 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
 \begin{quote}
@@ -2270,7 +2781,12 @@ d--efcv
 d--efcv with arguments
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypecv\_name}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypecv\_name}& [c--ategory of 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name\ of 
c{-}{-}lass}}%
 \begin{quote}
@@ -2278,7 +2794,12 @@ d--efcv with arguments
 d--eftypecv
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypecv\_name 
a{-}{-}rguments...}\hfill[c--ategory of \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypecv\_name a{-}{-}rguments...}& 
[c--ategory of \texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name\ of 
c{-}{-}lass}}%
 \begin{quote}
@@ -2286,7 +2807,12 @@ d--eftypecv
 d--eftypecv with arguments
 \end{quote}
 
-\noindent\texttt{d{-}{-}efop\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[c--ategory 
on \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efop\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory on 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name\ on 
c{-}{-}lass}}%
 \begin{quote}
@@ -2294,7 +2820,12 @@ d--eftypecv with arguments
 d--efop
 \end{quote}
 
-\noindent\texttt{d{-}{-}efop\_name}\hfill[c--ategory on \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efop\_name}& [c--ategory on \texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name\ on 
c{-}{-}lass}}%
 \begin{quote}
@@ -2302,7 +2833,12 @@ d--efop
 d--efop no arg
 \end{quote}
 
-\noindent\texttt{d{-}{-}eftp\_name 
\EmbracOn{}\textnormal{\textsl{a--ttributes...}}\EmbracOff{}}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}eftp\_name 
\EmbracOn{}\textnormal{\textsl{a--ttributes...}}\EmbracOff{}}& [c--ategory]
+\end{tabularx}
 
 \index[tp]{d--eftp\_name@\texttt{d{-}{-}eftp\_name}}%
 \begin{quote}
@@ -2310,7 +2846,12 @@ d--efop no arg
 d--eftp
 \end{quote}
 
-\noindent\texttt{d{-}{-}efun\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efun\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Function]
+\end{tabularx}
 
 \index[fn]{d--efun\_name@\texttt{d{-}{-}efun\_name}}%
 \begin{quote}
@@ -2318,7 +2859,12 @@ d--eftp
 d--efun
 \end{quote}
 
-\noindent\texttt{d{-}{-}efmac\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[Macro]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efmac\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Macro]
+\end{tabularx}
 
 \index[fn]{d--efmac\_name@\texttt{d{-}{-}efmac\_name}}%
 \begin{quote}
@@ -2326,7 +2872,12 @@ d--efun
 d--efmac
 \end{quote}
 
-\noindent\texttt{d{-}{-}efspec\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[Special Form]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efspec\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
 
 \index[fn]{d--efspec\_name@\texttt{d{-}{-}efspec\_name}}%
 \begin{quote}
@@ -2334,7 +2885,12 @@ d--efmac
 d--efspec
 \end{quote}
 
-\noindent\texttt{d{-}{-}efvar\_name}\hfill[Variable]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efvar\_name}& [Variable]
+\end{tabularx}
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
 \begin{quote}
@@ -2342,7 +2898,12 @@ d--efspec
 d--efvar
 \end{quote}
 
-\noindent\texttt{d{-}{-}efvar\_name \EmbracOn{}\textnormal{\textsl{arg--var 
arg--var1}}\EmbracOff{}}\hfill[Variable]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efvar\_name \EmbracOn{}\textnormal{\textsl{arg--var 
arg--var1}}\EmbracOff{}}& [Variable]
+\end{tabularx}
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
 \begin{quote}
@@ -2350,7 +2911,12 @@ d--efvar
 d--efvar with args
 \end{quote}
 
-\noindent\texttt{d{-}{-}efopt\_name}\hfill[User Option]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efopt\_name}& [User Option]
+\end{tabularx}
 
 \index[cp]{d--efopt\_name@\texttt{d{-}{-}efopt\_name}}%
 \begin{quote}
@@ -2358,7 +2924,12 @@ d--efvar with args
 d--efopt
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypefun\_name 
a{-}{-}rguments...}\hfill[Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypefun\_name a{-}{-}rguments...}& 
[Function]
+\end{tabularx}
 
 \index[fn]{d--eftypefun\_name@\texttt{d{-}{-}eftypefun\_name}}%
 \begin{quote}
@@ -2366,7 +2937,12 @@ d--efopt
 d--eftypefun
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypevar\_name}\hfill[Variable]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypevar\_name}& [Variable]
+\end{tabularx}
 
 \index[cp]{d--eftypevar\_name@\texttt{d{-}{-}eftypevar\_name}}%
 \begin{quote}
@@ -2374,7 +2950,12 @@ d--eftypefun
 d--eftypevar
 \end{quote}
 
-\noindent\texttt{d{-}{-}efivar\_name}\hfill[Instance Variable of 
\texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efivar\_name}& [Instance Variable of 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[cp]{d--efivar\_name of c--lass@\texttt{d{-}{-}efivar\_name\ of 
c{-}{-}lass}}%
 \begin{quote}
@@ -2382,7 +2963,12 @@ d--eftypevar
 d--efivar
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypeivar\_name}\hfill[Instance Variable 
of \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypeivar\_name}& [Instance Variable of 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[cp]{d--eftypeivar\_name of c--lass@\texttt{d{-}{-}eftypeivar\_name\ of 
c{-}{-}lass}}%
 \begin{quote}
@@ -2390,7 +2976,12 @@ d--efivar
 d--eftypeivar
 \end{quote}
 
-\noindent\texttt{d{-}{-}efmethod\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[Method on 
\texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efmethod\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Method on 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[fn]{d--efmethod\_name on c--lass@\texttt{d{-}{-}efmethod\_name\ on 
c{-}{-}lass}}%
 \begin{quote}
@@ -2398,7 +2989,12 @@ d--eftypeivar
 d--efmethod
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypemethod\_name 
a{-}{-}rguments...}\hfill[Method on \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypemethod\_name a{-}{-}rguments...}& 
[Method on \texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[fn]{d--eftypemethod\_name on c--lass@\texttt{d{-}{-}eftypemethod\_name\ 
on c{-}{-}lass}}%
 \begin{quote}
@@ -2407,7 +3003,12 @@ d--eftypemethod
 \end{quote}
 
 
-\noindent\texttt{data-type2\leavevmode{}\\name2 arguments2...}\hfill[Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{data-type2\leavevmode{}\\name2 arguments2...}& [Function]
+\end{tabularx}
 
 \index[fn]{name2@\texttt{name2}}%
 \begin{quote}
@@ -2415,7 +3016,12 @@ d--eftypemethod
 aaa2
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypefn\_name2}\hfill[c--ategory2]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypefn\_name2}& 
[c--ategory2]
+\end{tabularx}
 
 \index[fn]{d--eftypefn\_name2@\texttt{d{-}{-}eftypefn\_name2}}%
 \begin{quote}
@@ -2423,7 +3029,12 @@ aaa2
 d--eftypefn no arg2
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2 
a{-}{-}rguments2...}\hfill[c--ategory2 on \texttt{c{-}{-}lass2}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2 
a{-}{-}rguments2...}& [c--ategory2 on \texttt{c{-}{-}lass2}]
+\end{tabularx}
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2\ on 
c{-}{-}lass2}}%
 \begin{quote}
@@ -2431,7 +3042,12 @@ d--eftypefn no arg2
 d--eftypeop2
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2}\hfill[c--ategory2
 on \texttt{c{-}{-}lass2}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2}& 
[c--ategory2 on \texttt{c{-}{-}lass2}]
+\end{tabularx}
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2\ on 
c{-}{-}lass2}}%
 \begin{quote}
@@ -2439,7 +3055,12 @@ d--eftypeop2
 d--eftypeop no arg2
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype2 d{-}{-}eftypecv\_name2}\hfill[c--ategory2 of 
\texttt{c{-}{-}lass2}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype2 d{-}{-}eftypecv\_name2}& [c--ategory2 of 
\texttt{c{-}{-}lass2}]
+\end{tabularx}
 
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2\ of 
c{-}{-}lass2}}%
 \begin{quote}
@@ -2447,7 +3068,12 @@ d--eftypeop no arg2
 d--eftypecv2
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype2 d{-}{-}eftypecv\_name2 
a{-}{-}rguments2...}\hfill[c--ategory2 of \texttt{c{-}{-}lass2}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype2 d{-}{-}eftypecv\_name2 a{-}{-}rguments2...}& 
[c--ategory2 of \texttt{c{-}{-}lass2}]
+\end{tabularx}
 
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2\ of 
c{-}{-}lass2}}%
 \begin{quote}
@@ -2455,7 +3081,12 @@ d--eftypecv2
 d--eftypecv with arguments2
 \end{quote}
 
-\noindent\texttt{arg2}\hfill[fun2]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{arg2}& [fun2]
+\end{tabularx}
 
 \index[fn]{arg2@\texttt{arg2}}%
 \begin{quote}
@@ -2737,39 +3368,99 @@ b
 l--ine
 \end{description}
 
-\noindent\texttt{}\hfill[fun]
 
-\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose 
and}}\EmbracOff{}}\hfill[truc]
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& [fun]
+\end{tabularx}
+
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose 
and}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and  
after}}\EmbracOff{}}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and  
after}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and 
}}\EmbracOff{}}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and 
}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and and 
after}}\EmbracOff{}}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and and 
after}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{followed \EmbracOn{}\textnormal{\textsl{by a 
comment}}\EmbracOff{}}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{followed \EmbracOn{}\textnormal{\textsl{by a 
comment}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{followed@\texttt{followed}}%
 Various deff lines
-\noindent\texttt{after \EmbracOn{}\textnormal{\textsl{a deff 
item}}\EmbracOff{}}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{after \EmbracOn{}\textnormal{\textsl{a deff 
item}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{after@\texttt{after}}%
 
-\noindent\texttt{\GNUTexinfocommandstyletextvar{invalid} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}\hfill[fsetinv]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{\GNUTexinfocommandstyletextvar{invalid} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fsetinv]
+\end{tabularx}
 
 \index[fn]{invalid@\texttt{\GNUTexinfocommandstyletextvar{invalid}}}%
-\noindent\texttt{}\hfill[\textbf{id `\texttt{i}' ule}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& [\textbf{id `\texttt{i}' ule}]
+\end{tabularx}
+
 
 
-\noindent\texttt{}\hfill[aaa]
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& [aaa]
+\end{tabularx}
 
-\noindent\texttt{}\hfill[]
 
-\noindent\texttt{}\hfill[truc]
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& []
+\end{tabularx}
+
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& [truc]
+\end{tabularx}
 
 
 g--roupe
@@ -3466,7 +4157,12 @@ f--ormat
 s--mallformat
 \end{GNUTexinfopreformatted}
 
-\noindent\texttt{d{-}{-}effn\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}effn\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory]
+\end{tabularx}
 
 \index[fn]{d--effn\_name@\texttt{d{-}{-}effn\_name}}%
 \begin{quote}
@@ -3474,7 +4170,12 @@ s--mallformat
 d--effn
 \end{quote}
 
-\noindent\texttt{de{-}{-}ffn\_name \EmbracOn{}\textnormal{\textsl{ar--guments  
  more args \leavevmode{}\\ even more so}}\EmbracOff{}}\hfill[cate--gory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{de{-}{-}ffn\_name \EmbracOn{}\textnormal{\textsl{ar--guments  
  more args \leavevmode{}\\ even more so}}\EmbracOff{}}& [cate--gory]
+\end{tabularx}
 
 \index[fn]{de--ffn\_name@\texttt{de{-}{-}ffn\_name}}%
 \begin{quote}
@@ -3482,72 +4183,177 @@ d--effn
 def--fn
 \end{quote}
 
-\noindent\texttt{\GNUTexinfocommandstyletextvar{i} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}\hfill[fset]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{\GNUTexinfocommandstyletextvar{i} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fset]
+\end{tabularx}
 
 \index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
 \index[cp]{index entry within deffn}%
-\noindent\texttt{truc 
\EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}\hfill[cmde]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{truc \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [cmde]
+\end{tabularx}
 
 \index[fn]{truc@\texttt{truc}}%
-\noindent\texttt{log trap 
\EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}\hfill[Command]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{log trap \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& 
[Command]
+\end{tabularx}
 
 \index[fn]{log trap@\texttt{log trap}}%
-\noindent\texttt{log trap1 
\EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}\hfill[Command]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{log trap1 \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& 
[Command]
+\end{tabularx}
 
 \index[fn]{log trap1@\texttt{log trap1}}%
-\noindent\texttt{log trap2 
\EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}\hfill[Command]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{log trap2 \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& 
[Command]
+\end{tabularx}
 
 \index[fn]{log trap2@\texttt{log trap2}}%
-\noindent\texttt{\textbf{id ule} 
\EmbracOn{}\textnormal{\textsl{truc}}\EmbracOff{}}\hfill[cmde]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{\textbf{id ule} 
\EmbracOn{}\textnormal{\textsl{truc}}\EmbracOff{}}& [cmde]
+\end{tabularx}
 
 \index[fn]{id ule@\texttt{\textbf{id ule}}}%
-\noindent\texttt{\textbf{id `\texttt{i}'\ ule} 
\EmbracOn{}\textnormal{\textsl{truc}}\EmbracOff{}}\hfill[cmde2]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{\textbf{id `\texttt{i}'\ ule} 
\EmbracOn{}\textnormal{\textsl{truc}}\EmbracOff{}}& [cmde2]
+\end{tabularx}
 
 \index[fn]{id i ule@\texttt{\textbf{id `\texttt{i}'\ ule}}}%
-\noindent\texttt{}\hfill[]
 
-\noindent\texttt{machin}\hfill[]
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& []
+\end{tabularx}
+
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{machin}& []
+\end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{bidule machin}\hfill[]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{bidule machin}& []
+\end{tabularx}
 
 \index[fn]{bidule machin@\texttt{bidule machin}}%
-\noindent\texttt{machin}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{machin}& [truc]
+\end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{}\hfill[truc]
 
-\noindent\texttt{followed \EmbracOn{}\textnormal{\textsl{by a 
comment}}\EmbracOff{}}\hfill[truc]
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& [truc]
+\end{tabularx}
+
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{followed \EmbracOn{}\textnormal{\textsl{by a 
comment}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{followed@\texttt{followed}}%
-\noindent\texttt{}\hfill[]
 
-\noindent\texttt{a \EmbracOn{}\textnormal{\textsl{b c d e 
\EmbracMakeKnown{textbf}\textbf{f g} h i}}\EmbracOff{}}\hfill[truc]
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& []
+\end{tabularx}
+
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{a \EmbracOn{}\textnormal{\textsl{b c d e 
\EmbracMakeKnown{textbf}\textbf{f g} h i}}\EmbracOff{}}& [truc]
+\end{tabularx}
 \ExplSyntaxOn%
 
\cs_undefine:N{\embrac_textbf:nn}\cs_undefine:N{\embrac_orig_textbf:n}\cs_undefine:N{\__embrac_textbf:n}%
 \ExplSyntaxOff%
 
 \index[fn]{a@\texttt{a}}%
-\noindent\texttt{deffnx \EmbracOn{}\textnormal{\textsl{before end 
deffn}}\EmbracOff{}}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{deffnx \EmbracOn{}\textnormal{\textsl{before end 
deffn}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{deffnx@\texttt{deffnx}}%
 
 
-\noindent\texttt{deffn}\hfill[empty]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{deffn}& [empty]
+\end{tabularx}
 
 \index[fn]{deffn@\texttt{deffn}}%
 
-\noindent\texttt{deffn \EmbracOn{}\textnormal{\textsl{with 
deffnx}}\EmbracOff{}}\hfill[empty]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{deffn \EmbracOn{}\textnormal{\textsl{with 
deffnx}}\EmbracOff{}}& [empty]
+\end{tabularx}
 
 \index[fn]{deffn@\texttt{deffn}}%
-\noindent\texttt{deffnx}\hfill[empty]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{deffnx}& [empty]
+\end{tabularx}
 
 \index[fn]{deffnx@\texttt{deffnx}}%
 
-\noindent\texttt{\GNUTexinfocommandstyletextvar{i} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}\hfill[fset]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{\GNUTexinfocommandstyletextvar{i} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fset]
+\end{tabularx}
 
 \index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
-\noindent\texttt{truc 
\EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}\hfill[cmde]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{truc \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [cmde]
+\end{tabularx}
 
 \index[fn]{truc@\texttt{truc}}%
 \begin{quote}
@@ -3556,7 +4362,12 @@ text in def item for second def item
 \end{quote}
 
 
-\noindent\texttt{d{-}{-}efvr\_name}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efvr\_name}& [c--ategory]
+\end{tabularx}
 
 \index[cp]{d--efvr\_name@\texttt{d{-}{-}efvr\_name}}%
 \begin{quote}
@@ -3564,7 +4375,12 @@ text in def item for second def item
 d--efvr
 \end{quote}
 
-\noindent\texttt{n{-}{-}ame 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{n{-}{-}ame 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory]
+\end{tabularx}
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
 \begin{quote}
@@ -3572,7 +4388,12 @@ d--efvr
 d--effn
 \end{quote}
 
-\noindent\texttt{n{-}{-}ame}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{n{-}{-}ame}& [c--ategory]
+\end{tabularx}
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
 \begin{quote}
@@ -3580,7 +4401,12 @@ d--effn
 d--effn no arg
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name 
a{-}{-}rguments...}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name a{-}{-}rguments...}& 
[c--ategory]
+\end{tabularx}
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
 \begin{quote}
@@ -3588,7 +4414,12 @@ d--effn no arg
 d--eftypefn
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name}& [c--ategory]
+\end{tabularx}
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
 \begin{quote}
@@ -3596,7 +4427,12 @@ d--eftypefn
 d--eftypefn no arg
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypeop\_name 
a{-}{-}rguments...}\hfill[c--ategory on \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypeop\_name a{-}{-}rguments...}& 
[c--ategory on \texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[fn]{d--eftypeop\_name on c--lass@\texttt{d{-}{-}eftypeop\_name\ on 
c{-}{-}lass}}%
 \begin{quote}
@@ -3604,7 +4440,12 @@ d--eftypefn no arg
 d--eftypeop
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypeop\_name}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypeop\_name}& [c--ategory on 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[fn]{d--eftypeop\_name on c--lass@\texttt{d{-}{-}eftypeop\_name\ on 
c{-}{-}lass}}%
 \begin{quote}
@@ -3612,7 +4453,12 @@ d--eftypeop
 d--eftypeop no arg
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypevr\_name}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypevr\_name}& [c--ategory]
+\end{tabularx}
 
 \index[cp]{d--eftypevr\_name@\texttt{d{-}{-}eftypevr\_name}}%
 \begin{quote}
@@ -3620,7 +4466,12 @@ d--eftypeop no arg
 d--eftypevr
 \end{quote}
 
-\noindent\texttt{d{-}{-}efcv\_name}\hfill[c--ategory of \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efcv\_name}& [c--ategory of \texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
 \begin{quote}
@@ -3628,7 +4479,12 @@ d--eftypevr
 d--efcv
 \end{quote}
 
-\noindent\texttt{d{-}{-}efcv\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[c--ategory 
of \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efcv\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory of 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
 \begin{quote}
@@ -3636,7 +4492,12 @@ d--efcv
 d--efcv with arguments
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypecv\_name}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypecv\_name}& [c--ategory of 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name\ of 
c{-}{-}lass}}%
 \begin{quote}
@@ -3644,7 +4505,12 @@ d--efcv with arguments
 d--eftypecv
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypecv\_name 
a{-}{-}rguments...}\hfill[c--ategory of \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypecv\_name a{-}{-}rguments...}& 
[c--ategory of \texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name\ of 
c{-}{-}lass}}%
 \begin{quote}
@@ -3652,7 +4518,12 @@ d--eftypecv
 d--eftypecv with arguments
 \end{quote}
 
-\noindent\texttt{d{-}{-}efop\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[c--ategory 
on \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efop\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory on 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name\ on 
c{-}{-}lass}}%
 \begin{quote}
@@ -3660,7 +4531,12 @@ d--eftypecv with arguments
 d--efop
 \end{quote}
 
-\noindent\texttt{d{-}{-}efop\_name}\hfill[c--ategory on \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efop\_name}& [c--ategory on \texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name\ on 
c{-}{-}lass}}%
 \begin{quote}
@@ -3668,7 +4544,12 @@ d--efop
 d--efop no arg
 \end{quote}
 
-\noindent\texttt{d{-}{-}eftp\_name 
\EmbracOn{}\textnormal{\textsl{a--ttributes...}}\EmbracOff{}}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}eftp\_name 
\EmbracOn{}\textnormal{\textsl{a--ttributes...}}\EmbracOff{}}& [c--ategory]
+\end{tabularx}
 
 \index[tp]{d--eftp\_name@\texttt{d{-}{-}eftp\_name}}%
 \begin{quote}
@@ -3676,7 +4557,12 @@ d--efop no arg
 d--eftp
 \end{quote}
 
-\noindent\texttt{d{-}{-}efun\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efun\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Function]
+\end{tabularx}
 
 \index[fn]{d--efun\_name@\texttt{d{-}{-}efun\_name}}%
 \begin{quote}
@@ -3684,7 +4570,12 @@ d--eftp
 d--efun
 \end{quote}
 
-\noindent\texttt{d{-}{-}efmac\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[Macro]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efmac\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Macro]
+\end{tabularx}
 
 \index[fn]{d--efmac\_name@\texttt{d{-}{-}efmac\_name}}%
 \begin{quote}
@@ -3692,7 +4583,12 @@ d--efun
 d--efmac
 \end{quote}
 
-\noindent\texttt{d{-}{-}efspec\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[Special Form]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efspec\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
 
 \index[fn]{d--efspec\_name@\texttt{d{-}{-}efspec\_name}}%
 \begin{quote}
@@ -3700,7 +4596,12 @@ d--efmac
 d--efspec
 \end{quote}
 
-\noindent\texttt{d{-}{-}efvar\_name}\hfill[Variable]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efvar\_name}& [Variable]
+\end{tabularx}
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
 \begin{quote}
@@ -3708,7 +4609,12 @@ d--efspec
 d--efvar
 \end{quote}
 
-\noindent\texttt{d{-}{-}efvar\_name \EmbracOn{}\textnormal{\textsl{arg--var 
arg--var1}}\EmbracOff{}}\hfill[Variable]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efvar\_name \EmbracOn{}\textnormal{\textsl{arg--var 
arg--var1}}\EmbracOff{}}& [Variable]
+\end{tabularx}
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
 \begin{quote}
@@ -3716,7 +4622,12 @@ d--efvar
 d--efvar with args
 \end{quote}
 
-\noindent\texttt{d{-}{-}efopt\_name}\hfill[User Option]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efopt\_name}& [User Option]
+\end{tabularx}
 
 \index[cp]{d--efopt\_name@\texttt{d{-}{-}efopt\_name}}%
 \begin{quote}
@@ -3724,7 +4635,12 @@ d--efvar with args
 d--efopt
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypefun\_name 
a{-}{-}rguments...}\hfill[Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypefun\_name a{-}{-}rguments...}& 
[Function]
+\end{tabularx}
 
 \index[fn]{d--eftypefun\_name@\texttt{d{-}{-}eftypefun\_name}}%
 \begin{quote}
@@ -3732,7 +4648,12 @@ d--efopt
 d--eftypefun
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypevar\_name}\hfill[Variable]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypevar\_name}& [Variable]
+\end{tabularx}
 
 \index[cp]{d--eftypevar\_name@\texttt{d{-}{-}eftypevar\_name}}%
 \begin{quote}
@@ -3740,7 +4661,12 @@ d--eftypefun
 d--eftypevar
 \end{quote}
 
-\noindent\texttt{d{-}{-}efivar\_name}\hfill[Instance Variable of 
\texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efivar\_name}& [Instance Variable of 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[cp]{d--efivar\_name of c--lass@\texttt{d{-}{-}efivar\_name\ of 
c{-}{-}lass}}%
 \begin{quote}
@@ -3748,7 +4674,12 @@ d--eftypevar
 d--efivar
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypeivar\_name}\hfill[Instance Variable 
of \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypeivar\_name}& [Instance Variable of 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[cp]{d--eftypeivar\_name of c--lass@\texttt{d{-}{-}eftypeivar\_name\ of 
c{-}{-}lass}}%
 \begin{quote}
@@ -3756,7 +4687,12 @@ d--efivar
 d--eftypeivar
 \end{quote}
 
-\noindent\texttt{d{-}{-}efmethod\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[Method on 
\texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efmethod\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Method on 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[fn]{d--efmethod\_name on c--lass@\texttt{d{-}{-}efmethod\_name\ on 
c{-}{-}lass}}%
 \begin{quote}
@@ -3764,7 +4700,12 @@ d--eftypeivar
 d--efmethod
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypemethod\_name 
a{-}{-}rguments...}\hfill[Method on \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypemethod\_name a{-}{-}rguments...}& 
[Method on \texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[fn]{d--eftypemethod\_name on c--lass@\texttt{d{-}{-}eftypemethod\_name\ 
on c{-}{-}lass}}%
 \begin{quote}
@@ -3773,7 +4714,12 @@ d--eftypemethod
 \end{quote}
 
 
-\noindent\texttt{data-type2\leavevmode{}\\name2 arguments2...}\hfill[Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{data-type2\leavevmode{}\\name2 arguments2...}& [Function]
+\end{tabularx}
 
 \index[fn]{name2@\texttt{name2}}%
 \begin{quote}
@@ -3781,7 +4727,12 @@ d--eftypemethod
 aaa2
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypefn\_name2}\hfill[c--ategory2]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypefn\_name2}& 
[c--ategory2]
+\end{tabularx}
 
 \index[fn]{d--eftypefn\_name2@\texttt{d{-}{-}eftypefn\_name2}}%
 \begin{quote}
@@ -3789,7 +4740,12 @@ aaa2
 d--eftypefn no arg2
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2 
a{-}{-}rguments2...}\hfill[c--ategory2 on \texttt{c{-}{-}lass2}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2 
a{-}{-}rguments2...}& [c--ategory2 on \texttt{c{-}{-}lass2}]
+\end{tabularx}
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2\ on 
c{-}{-}lass2}}%
 \begin{quote}
@@ -3797,7 +4753,12 @@ d--eftypefn no arg2
 d--eftypeop2
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2}\hfill[c--ategory2
 on \texttt{c{-}{-}lass2}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2}& 
[c--ategory2 on \texttt{c{-}{-}lass2}]
+\end{tabularx}
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2\ on 
c{-}{-}lass2}}%
 \begin{quote}
@@ -3805,7 +4766,12 @@ d--eftypeop2
 d--eftypeop no arg2
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype2 d{-}{-}eftypecv\_name2}\hfill[c--ategory2 of 
\texttt{c{-}{-}lass2}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype2 d{-}{-}eftypecv\_name2}& [c--ategory2 of 
\texttt{c{-}{-}lass2}]
+\end{tabularx}
 
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2\ of 
c{-}{-}lass2}}%
 \begin{quote}
@@ -3813,7 +4779,12 @@ d--eftypeop no arg2
 d--eftypecv2
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype2 d{-}{-}eftypecv\_name2 
a{-}{-}rguments2...}\hfill[c--ategory2 of \texttt{c{-}{-}lass2}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype2 d{-}{-}eftypecv\_name2 a{-}{-}rguments2...}& 
[c--ategory2 of \texttt{c{-}{-}lass2}]
+\end{tabularx}
 
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2\ of 
c{-}{-}lass2}}%
 \begin{quote}
@@ -3821,7 +4792,12 @@ d--eftypecv2
 d--eftypecv with arguments2
 \end{quote}
 
-\noindent\texttt{arg2}\hfill[fun2]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{arg2}& [fun2]
+\end{tabularx}
 
 \index[fn]{arg2@\texttt{arg2}}%
 \begin{quote}
@@ -4103,39 +5079,99 @@ b
 l--ine
 \end{description}
 
-\noindent\texttt{}\hfill[fun]
 
-\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose 
and}}\EmbracOff{}}\hfill[truc]
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& [fun]
+\end{tabularx}
+
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose 
and}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and  
after}}\EmbracOff{}}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and  
after}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and 
}}\EmbracOff{}}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and 
}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and and 
after}}\EmbracOff{}}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and and 
after}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{followed \EmbracOn{}\textnormal{\textsl{by a 
comment}}\EmbracOff{}}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{followed \EmbracOn{}\textnormal{\textsl{by a 
comment}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{followed@\texttt{followed}}%
 Various deff lines
-\noindent\texttt{after \EmbracOn{}\textnormal{\textsl{a deff 
item}}\EmbracOff{}}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{after \EmbracOn{}\textnormal{\textsl{a deff 
item}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{after@\texttt{after}}%
 
-\noindent\texttt{\GNUTexinfocommandstyletextvar{invalid} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}\hfill[fsetinv]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{\GNUTexinfocommandstyletextvar{invalid} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fsetinv]
+\end{tabularx}
 
 \index[fn]{invalid@\texttt{\GNUTexinfocommandstyletextvar{invalid}}}%
-\noindent\texttt{}\hfill[\textbf{id `\texttt{i}' ule}]
 
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& [\textbf{id `\texttt{i}' ule}]
+\end{tabularx}
+
+
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& [aaa]
+\end{tabularx}
 
-\noindent\texttt{}\hfill[aaa]
 
-\noindent\texttt{}\hfill[]
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& []
+\end{tabularx}
 
-\noindent\texttt{}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& [truc]
+\end{tabularx}
 
 
 g--roupe
@@ -4810,7 +5846,12 @@ f--ormat
 s--mallformat
 \end{GNUTexinfopreformatted}
 
-\noindent\texttt{d{-}{-}effn\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}effn\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory]
+\end{tabularx}
 
 \index[fn]{d--effn\_name@\texttt{d{-}{-}effn\_name}}%
 \begin{quote}
@@ -4818,7 +5859,12 @@ s--mallformat
 d--effn
 \end{quote}
 
-\noindent\texttt{de{-}{-}ffn\_name \EmbracOn{}\textnormal{\textsl{ar--guments  
  more args \leavevmode{}\\ even more so}}\EmbracOff{}}\hfill[cate--gory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{de{-}{-}ffn\_name \EmbracOn{}\textnormal{\textsl{ar--guments  
  more args \leavevmode{}\\ even more so}}\EmbracOff{}}& [cate--gory]
+\end{tabularx}
 
 \index[fn]{de--ffn\_name@\texttt{de{-}{-}ffn\_name}}%
 \begin{quote}
@@ -4826,72 +5872,177 @@ d--effn
 def--fn
 \end{quote}
 
-\noindent\texttt{\GNUTexinfocommandstyletextvar{i} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}\hfill[fset]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{\GNUTexinfocommandstyletextvar{i} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fset]
+\end{tabularx}
 
 \index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
 \index[cp]{index entry within deffn}%
-\noindent\texttt{truc 
\EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}\hfill[cmde]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{truc \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [cmde]
+\end{tabularx}
 
 \index[fn]{truc@\texttt{truc}}%
-\noindent\texttt{log trap 
\EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}\hfill[Command]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{log trap \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& 
[Command]
+\end{tabularx}
 
 \index[fn]{log trap@\texttt{log trap}}%
-\noindent\texttt{log trap1 
\EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}\hfill[Command]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{log trap1 \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& 
[Command]
+\end{tabularx}
 
 \index[fn]{log trap1@\texttt{log trap1}}%
-\noindent\texttt{log trap2 
\EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}\hfill[Command]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{log trap2 \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& 
[Command]
+\end{tabularx}
 
 \index[fn]{log trap2@\texttt{log trap2}}%
-\noindent\texttt{\textbf{id ule} 
\EmbracOn{}\textnormal{\textsl{truc}}\EmbracOff{}}\hfill[cmde]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{\textbf{id ule} 
\EmbracOn{}\textnormal{\textsl{truc}}\EmbracOff{}}& [cmde]
+\end{tabularx}
 
 \index[fn]{id ule@\texttt{\textbf{id ule}}}%
-\noindent\texttt{\textbf{id `\texttt{i}'\ ule} 
\EmbracOn{}\textnormal{\textsl{truc}}\EmbracOff{}}\hfill[cmde2]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{\textbf{id `\texttt{i}'\ ule} 
\EmbracOn{}\textnormal{\textsl{truc}}\EmbracOff{}}& [cmde2]
+\end{tabularx}
 
 \index[fn]{id i ule@\texttt{\textbf{id `\texttt{i}'\ ule}}}%
-\noindent\texttt{}\hfill[]
 
-\noindent\texttt{machin}\hfill[]
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& []
+\end{tabularx}
+
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{machin}& []
+\end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{bidule machin}\hfill[]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{bidule machin}& []
+\end{tabularx}
 
 \index[fn]{bidule machin@\texttt{bidule machin}}%
-\noindent\texttt{machin}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{machin}& [truc]
+\end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{}\hfill[truc]
 
-\noindent\texttt{followed \EmbracOn{}\textnormal{\textsl{by a 
comment}}\EmbracOff{}}\hfill[truc]
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& [truc]
+\end{tabularx}
+
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{followed \EmbracOn{}\textnormal{\textsl{by a 
comment}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{followed@\texttt{followed}}%
-\noindent\texttt{}\hfill[]
 
-\noindent\texttt{a \EmbracOn{}\textnormal{\textsl{b c d e 
\EmbracMakeKnown{textbf}\textbf{f g} h i}}\EmbracOff{}}\hfill[truc]
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& []
+\end{tabularx}
+
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{a \EmbracOn{}\textnormal{\textsl{b c d e 
\EmbracMakeKnown{textbf}\textbf{f g} h i}}\EmbracOff{}}& [truc]
+\end{tabularx}
 \ExplSyntaxOn%
 
\cs_undefine:N{\embrac_textbf:nn}\cs_undefine:N{\embrac_orig_textbf:n}\cs_undefine:N{\__embrac_textbf:n}%
 \ExplSyntaxOff%
 
 \index[fn]{a@\texttt{a}}%
-\noindent\texttt{deffnx \EmbracOn{}\textnormal{\textsl{before end 
deffn}}\EmbracOff{}}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{deffnx \EmbracOn{}\textnormal{\textsl{before end 
deffn}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{deffnx@\texttt{deffnx}}%
 
 
-\noindent\texttt{deffn}\hfill[empty]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{deffn}& [empty]
+\end{tabularx}
 
 \index[fn]{deffn@\texttt{deffn}}%
 
-\noindent\texttt{deffn \EmbracOn{}\textnormal{\textsl{with 
deffnx}}\EmbracOff{}}\hfill[empty]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{deffn \EmbracOn{}\textnormal{\textsl{with 
deffnx}}\EmbracOff{}}& [empty]
+\end{tabularx}
 
 \index[fn]{deffn@\texttt{deffn}}%
-\noindent\texttt{deffnx}\hfill[empty]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{deffnx}& [empty]
+\end{tabularx}
 
 \index[fn]{deffnx@\texttt{deffnx}}%
 
-\noindent\texttt{\GNUTexinfocommandstyletextvar{i} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}\hfill[fset]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{\GNUTexinfocommandstyletextvar{i} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fset]
+\end{tabularx}
 
 \index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
-\noindent\texttt{truc 
\EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}\hfill[cmde]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{truc \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [cmde]
+\end{tabularx}
 
 \index[fn]{truc@\texttt{truc}}%
 \begin{quote}
@@ -4900,7 +6051,12 @@ text in def item for second def item
 \end{quote}
 
 
-\noindent\texttt{d{-}{-}efvr\_name}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efvr\_name}& [c--ategory]
+\end{tabularx}
 
 \index[cp]{d--efvr\_name@\texttt{d{-}{-}efvr\_name}}%
 \begin{quote}
@@ -4908,7 +6064,12 @@ text in def item for second def item
 d--efvr
 \end{quote}
 
-\noindent\texttt{n{-}{-}ame 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{n{-}{-}ame 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory]
+\end{tabularx}
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
 \begin{quote}
@@ -4916,7 +6077,12 @@ d--efvr
 d--effn
 \end{quote}
 
-\noindent\texttt{n{-}{-}ame}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{n{-}{-}ame}& [c--ategory]
+\end{tabularx}
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
 \begin{quote}
@@ -4924,7 +6090,12 @@ d--effn
 d--effn no arg
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name 
a{-}{-}rguments...}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name a{-}{-}rguments...}& 
[c--ategory]
+\end{tabularx}
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
 \begin{quote}
@@ -4932,7 +6103,12 @@ d--effn no arg
 d--eftypefn
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name}& [c--ategory]
+\end{tabularx}
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
 \begin{quote}
@@ -4940,7 +6116,12 @@ d--eftypefn
 d--eftypefn no arg
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypeop\_name 
a{-}{-}rguments...}\hfill[c--ategory on \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypeop\_name a{-}{-}rguments...}& 
[c--ategory on \texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[fn]{d--eftypeop\_name on c--lass@\texttt{d{-}{-}eftypeop\_name\ on 
c{-}{-}lass}}%
 \begin{quote}
@@ -4948,7 +6129,12 @@ d--eftypefn no arg
 d--eftypeop
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypeop\_name}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypeop\_name}& [c--ategory on 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[fn]{d--eftypeop\_name on c--lass@\texttt{d{-}{-}eftypeop\_name\ on 
c{-}{-}lass}}%
 \begin{quote}
@@ -4956,7 +6142,12 @@ d--eftypeop
 d--eftypeop no arg
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypevr\_name}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypevr\_name}& [c--ategory]
+\end{tabularx}
 
 \index[cp]{d--eftypevr\_name@\texttt{d{-}{-}eftypevr\_name}}%
 \begin{quote}
@@ -4964,7 +6155,12 @@ d--eftypeop no arg
 d--eftypevr
 \end{quote}
 
-\noindent\texttt{d{-}{-}efcv\_name}\hfill[c--ategory of \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efcv\_name}& [c--ategory of \texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
 \begin{quote}
@@ -4972,7 +6168,12 @@ d--eftypevr
 d--efcv
 \end{quote}
 
-\noindent\texttt{d{-}{-}efcv\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[c--ategory 
of \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efcv\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory of 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
 \begin{quote}
@@ -4980,7 +6181,12 @@ d--efcv
 d--efcv with arguments
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypecv\_name}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypecv\_name}& [c--ategory of 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name\ of 
c{-}{-}lass}}%
 \begin{quote}
@@ -4988,7 +6194,12 @@ d--efcv with arguments
 d--eftypecv
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypecv\_name 
a{-}{-}rguments...}\hfill[c--ategory of \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypecv\_name a{-}{-}rguments...}& 
[c--ategory of \texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name\ of 
c{-}{-}lass}}%
 \begin{quote}
@@ -4996,7 +6207,12 @@ d--eftypecv
 d--eftypecv with arguments
 \end{quote}
 
-\noindent\texttt{d{-}{-}efop\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[c--ategory 
on \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efop\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory on 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name\ on 
c{-}{-}lass}}%
 \begin{quote}
@@ -5004,7 +6220,12 @@ d--eftypecv with arguments
 d--efop
 \end{quote}
 
-\noindent\texttt{d{-}{-}efop\_name}\hfill[c--ategory on \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efop\_name}& [c--ategory on \texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name\ on 
c{-}{-}lass}}%
 \begin{quote}
@@ -5012,7 +6233,12 @@ d--efop
 d--efop no arg
 \end{quote}
 
-\noindent\texttt{d{-}{-}eftp\_name 
\EmbracOn{}\textnormal{\textsl{a--ttributes...}}\EmbracOff{}}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}eftp\_name 
\EmbracOn{}\textnormal{\textsl{a--ttributes...}}\EmbracOff{}}& [c--ategory]
+\end{tabularx}
 
 \index[tp]{d--eftp\_name@\texttt{d{-}{-}eftp\_name}}%
 \begin{quote}
@@ -5020,7 +6246,12 @@ d--efop no arg
 d--eftp
 \end{quote}
 
-\noindent\texttt{d{-}{-}efun\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efun\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Function]
+\end{tabularx}
 
 \index[fn]{d--efun\_name@\texttt{d{-}{-}efun\_name}}%
 \begin{quote}
@@ -5028,7 +6259,12 @@ d--eftp
 d--efun
 \end{quote}
 
-\noindent\texttt{d{-}{-}efmac\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[Macro]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efmac\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Macro]
+\end{tabularx}
 
 \index[fn]{d--efmac\_name@\texttt{d{-}{-}efmac\_name}}%
 \begin{quote}
@@ -5036,7 +6272,12 @@ d--efun
 d--efmac
 \end{quote}
 
-\noindent\texttt{d{-}{-}efspec\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[Special Form]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efspec\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
 
 \index[fn]{d--efspec\_name@\texttt{d{-}{-}efspec\_name}}%
 \begin{quote}
@@ -5044,7 +6285,12 @@ d--efmac
 d--efspec
 \end{quote}
 
-\noindent\texttt{d{-}{-}efvar\_name}\hfill[Variable]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efvar\_name}& [Variable]
+\end{tabularx}
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
 \begin{quote}
@@ -5052,7 +6298,12 @@ d--efspec
 d--efvar
 \end{quote}
 
-\noindent\texttt{d{-}{-}efvar\_name \EmbracOn{}\textnormal{\textsl{arg--var 
arg--var1}}\EmbracOff{}}\hfill[Variable]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efvar\_name \EmbracOn{}\textnormal{\textsl{arg--var 
arg--var1}}\EmbracOff{}}& [Variable]
+\end{tabularx}
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
 \begin{quote}
@@ -5060,7 +6311,12 @@ d--efvar
 d--efvar with args
 \end{quote}
 
-\noindent\texttt{d{-}{-}efopt\_name}\hfill[User Option]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efopt\_name}& [User Option]
+\end{tabularx}
 
 \index[cp]{d--efopt\_name@\texttt{d{-}{-}efopt\_name}}%
 \begin{quote}
@@ -5068,7 +6324,12 @@ d--efvar with args
 d--efopt
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypefun\_name 
a{-}{-}rguments...}\hfill[Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypefun\_name a{-}{-}rguments...}& 
[Function]
+\end{tabularx}
 
 \index[fn]{d--eftypefun\_name@\texttt{d{-}{-}eftypefun\_name}}%
 \begin{quote}
@@ -5076,7 +6337,12 @@ d--efopt
 d--eftypefun
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypevar\_name}\hfill[Variable]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypevar\_name}& [Variable]
+\end{tabularx}
 
 \index[cp]{d--eftypevar\_name@\texttt{d{-}{-}eftypevar\_name}}%
 \begin{quote}
@@ -5084,7 +6350,12 @@ d--eftypefun
 d--eftypevar
 \end{quote}
 
-\noindent\texttt{d{-}{-}efivar\_name}\hfill[Instance Variable of 
\texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efivar\_name}& [Instance Variable of 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[cp]{d--efivar\_name of c--lass@\texttt{d{-}{-}efivar\_name\ of 
c{-}{-}lass}}%
 \begin{quote}
@@ -5092,7 +6363,12 @@ d--eftypevar
 d--efivar
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypeivar\_name}\hfill[Instance Variable 
of \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypeivar\_name}& [Instance Variable of 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[cp]{d--eftypeivar\_name of c--lass@\texttt{d{-}{-}eftypeivar\_name\ of 
c{-}{-}lass}}%
 \begin{quote}
@@ -5100,7 +6376,12 @@ d--efivar
 d--eftypeivar
 \end{quote}
 
-\noindent\texttt{d{-}{-}efmethod\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[Method on 
\texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efmethod\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Method on 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[fn]{d--efmethod\_name on c--lass@\texttt{d{-}{-}efmethod\_name\ on 
c{-}{-}lass}}%
 \begin{quote}
@@ -5108,7 +6389,12 @@ d--eftypeivar
 d--efmethod
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypemethod\_name 
a{-}{-}rguments...}\hfill[Method on \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypemethod\_name a{-}{-}rguments...}& 
[Method on \texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[fn]{d--eftypemethod\_name on c--lass@\texttt{d{-}{-}eftypemethod\_name\ 
on c{-}{-}lass}}%
 \begin{quote}
@@ -5117,7 +6403,12 @@ d--eftypemethod
 \end{quote}
 
 
-\noindent\texttt{data-type2\leavevmode{}\\name2 arguments2...}\hfill[Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{data-type2\leavevmode{}\\name2 arguments2...}& [Function]
+\end{tabularx}
 
 \index[fn]{name2@\texttt{name2}}%
 \begin{quote}
@@ -5125,7 +6416,12 @@ d--eftypemethod
 aaa2
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypefn\_name2}\hfill[c--ategory2]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypefn\_name2}& 
[c--ategory2]
+\end{tabularx}
 
 \index[fn]{d--eftypefn\_name2@\texttt{d{-}{-}eftypefn\_name2}}%
 \begin{quote}
@@ -5133,7 +6429,12 @@ aaa2
 d--eftypefn no arg2
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2 
a{-}{-}rguments2...}\hfill[c--ategory2 on \texttt{c{-}{-}lass2}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2 
a{-}{-}rguments2...}& [c--ategory2 on \texttt{c{-}{-}lass2}]
+\end{tabularx}
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2\ on 
c{-}{-}lass2}}%
 \begin{quote}
@@ -5141,7 +6442,12 @@ d--eftypefn no arg2
 d--eftypeop2
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2}\hfill[c--ategory2
 on \texttt{c{-}{-}lass2}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2}& 
[c--ategory2 on \texttt{c{-}{-}lass2}]
+\end{tabularx}
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2\ on 
c{-}{-}lass2}}%
 \begin{quote}
@@ -5149,7 +6455,12 @@ d--eftypeop2
 d--eftypeop no arg2
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype2 d{-}{-}eftypecv\_name2}\hfill[c--ategory2 of 
\texttt{c{-}{-}lass2}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype2 d{-}{-}eftypecv\_name2}& [c--ategory2 of 
\texttt{c{-}{-}lass2}]
+\end{tabularx}
 
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2\ of 
c{-}{-}lass2}}%
 \begin{quote}
@@ -5157,7 +6468,12 @@ d--eftypeop no arg2
 d--eftypecv2
 \end{quote}
 
-\noindent\texttt{t{-}{-}ype2 d{-}{-}eftypecv\_name2 
a{-}{-}rguments2...}\hfill[c--ategory2 of \texttt{c{-}{-}lass2}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype2 d{-}{-}eftypecv\_name2 a{-}{-}rguments2...}& 
[c--ategory2 of \texttt{c{-}{-}lass2}]
+\end{tabularx}
 
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2\ of 
c{-}{-}lass2}}%
 \begin{quote}
@@ -5165,7 +6481,12 @@ d--eftypecv2
 d--eftypecv with arguments2
 \end{quote}
 
-\noindent\texttt{arg2}\hfill[fun2]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{arg2}& [fun2]
+\end{tabularx}
 
 \index[fn]{arg2@\texttt{arg2}}%
 \begin{quote}
@@ -5447,39 +6768,99 @@ b
 l--ine
 \end{description}
 
-\noindent\texttt{}\hfill[fun]
 
-\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose 
and}}\EmbracOff{}}\hfill[truc]
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& [fun]
+\end{tabularx}
+
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose 
and}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and  
after}}\EmbracOff{}}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and  
after}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and 
}}\EmbracOff{}}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and 
}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and and 
after}}\EmbracOff{}}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and and 
after}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{followed \EmbracOn{}\textnormal{\textsl{by a 
comment}}\EmbracOff{}}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{followed \EmbracOn{}\textnormal{\textsl{by a 
comment}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{followed@\texttt{followed}}%
 Various deff lines
-\noindent\texttt{after \EmbracOn{}\textnormal{\textsl{a deff 
item}}\EmbracOff{}}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{after \EmbracOn{}\textnormal{\textsl{a deff 
item}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{after@\texttt{after}}%
 
-\noindent\texttt{\GNUTexinfocommandstyletextvar{invalid} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}\hfill[fsetinv]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{\GNUTexinfocommandstyletextvar{invalid} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fsetinv]
+\end{tabularx}
 
 \index[fn]{invalid@\texttt{\GNUTexinfocommandstyletextvar{invalid}}}%
-\noindent\texttt{}\hfill[\textbf{id `\texttt{i}' ule}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& [\textbf{id `\texttt{i}' ule}]
+\end{tabularx}
+
+
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& [aaa]
+\end{tabularx}
 
 
-\noindent\texttt{}\hfill[aaa]
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& []
+\end{tabularx}
 
-\noindent\texttt{}\hfill[]
 
-\noindent\texttt{}\hfill[truc]
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& [truc]
+\end{tabularx}
 
 
 g--roupe
@@ -6516,7 +7897,12 @@ s--mallformat
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{d{-}{-}effn\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}effn\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory]
+\end{tabularx}
 
 \index[fn]{d--effn\_name@\texttt{d{-}{-}effn\_name}}%
 \begin{quote}
@@ -6530,7 +7916,12 @@ d{-}{-}effn
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{de{-}{-}ffn\_name \EmbracOn{}\textnormal{\textsl{ar--guments  
  more args \leavevmode{}\\ even more so}}\EmbracOff{}}\hfill[cate--gory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{de{-}{-}ffn\_name \EmbracOn{}\textnormal{\textsl{ar--guments  
  more args \leavevmode{}\\ even more so}}\EmbracOff{}}& [cate--gory]
+\end{tabularx}
 
 \index[fn]{de--ffn\_name@\texttt{de{-}{-}ffn\_name}}%
 \begin{quote}
@@ -6544,59 +7935,139 @@ def{-}{-}fn
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{\GNUTexinfocommandstyletextvar{i} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}\hfill[fset]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{\GNUTexinfocommandstyletextvar{i} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fset]
+\end{tabularx}
 
 \index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
 \begin{GNUTexinfopreformatted}
 \leftskip=2em\relax\ttfamily%
 \index[cp]{index entry within deffn}%
 \end{GNUTexinfopreformatted}
-\noindent\texttt{truc 
\EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}\hfill[cmde]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{truc \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [cmde]
+\end{tabularx}
 
 \index[fn]{truc@\texttt{truc}}%
-\noindent\texttt{log trap 
\EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}\hfill[Command]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{log trap \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& 
[Command]
+\end{tabularx}
 
 \index[fn]{log trap@\texttt{log trap}}%
-\noindent\texttt{log trap1 
\EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}\hfill[Command]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{log trap1 \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& 
[Command]
+\end{tabularx}
 
 \index[fn]{log trap1@\texttt{log trap1}}%
-\noindent\texttt{log trap2 
\EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}\hfill[Command]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{log trap2 \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& 
[Command]
+\end{tabularx}
 
 \index[fn]{log trap2@\texttt{log trap2}}%
-\noindent\texttt{\textbf{id ule} 
\EmbracOn{}\textnormal{\textsl{truc}}\EmbracOff{}}\hfill[cmde]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{\textbf{id ule} 
\EmbracOn{}\textnormal{\textsl{truc}}\EmbracOff{}}& [cmde]
+\end{tabularx}
 
 \index[fn]{id ule@\texttt{\textbf{id ule}}}%
-\noindent\texttt{\textbf{id `\texttt{i}'\ ule} 
\EmbracOn{}\textnormal{\textsl{truc}}\EmbracOff{}}\hfill[cmde2]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{\textbf{id `\texttt{i}'\ ule} 
\EmbracOn{}\textnormal{\textsl{truc}}\EmbracOff{}}& [cmde2]
+\end{tabularx}
 
 \index[fn]{id i ule@\texttt{\textbf{id `\texttt{i}'\ ule}}}%
-\noindent\texttt{}\hfill[]
 
-\noindent\texttt{machin}\hfill[]
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& []
+\end{tabularx}
+
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{machin}& []
+\end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{bidule machin}\hfill[]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{bidule machin}& []
+\end{tabularx}
 
 \index[fn]{bidule machin@\texttt{bidule machin}}%
-\noindent\texttt{machin}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{machin}& [truc]
+\end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{}\hfill[truc]
 
-\noindent\texttt{followed \EmbracOn{}\textnormal{\textsl{by a 
comment}}\EmbracOff{}}\hfill[truc]
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& [truc]
+\end{tabularx}
+
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{followed \EmbracOn{}\textnormal{\textsl{by a 
comment}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{followed@\texttt{followed}}%
 \begin{GNUTexinfopreformatted}
 \leftskip=2em\relax\ttfamily%
 \end{GNUTexinfopreformatted}
-\noindent\texttt{}\hfill[]
 
-\noindent\texttt{a \EmbracOn{}\textnormal{\textsl{b c d e 
\EmbracMakeKnown{textbf}\textbf{f g} h i}}\EmbracOff{}}\hfill[truc]
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& []
+\end{tabularx}
+
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{a \EmbracOn{}\textnormal{\textsl{b c d e 
\EmbracMakeKnown{textbf}\textbf{f g} h i}}\EmbracOff{}}& [truc]
+\end{tabularx}
 \ExplSyntaxOn%
 
\cs_undefine:N{\embrac_textbf:nn}\cs_undefine:N{\embrac_orig_textbf:n}\cs_undefine:N{\__embrac_textbf:n}%
 \ExplSyntaxOff%
 
 \index[fn]{a@\texttt{a}}%
-\noindent\texttt{deffnx \EmbracOn{}\textnormal{\textsl{before end 
deffn}}\EmbracOff{}}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{deffnx \EmbracOn{}\textnormal{\textsl{before end 
deffn}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{deffnx@\texttt{deffnx}}%
 \begin{GNUTexinfopreformatted}
@@ -6604,30 +8075,55 @@ def{-}{-}fn
 
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{deffn}\hfill[empty]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{deffn}& [empty]
+\end{tabularx}
 
 \index[fn]{deffn@\texttt{deffn}}%
 \begin{GNUTexinfopreformatted}
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{deffn \EmbracOn{}\textnormal{\textsl{with 
deffnx}}\EmbracOff{}}\hfill[empty]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{deffn \EmbracOn{}\textnormal{\textsl{with 
deffnx}}\EmbracOff{}}& [empty]
+\end{tabularx}
 
 \index[fn]{deffn@\texttt{deffn}}%
 \begin{GNUTexinfopreformatted}
 \leftskip=2em\relax\ttfamily%
 \end{GNUTexinfopreformatted}
-\noindent\texttt{deffnx}\hfill[empty]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{deffnx}& [empty]
+\end{tabularx}
 
 \index[fn]{deffnx@\texttt{deffnx}}%
 \begin{GNUTexinfopreformatted}
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{\GNUTexinfocommandstyletextvar{i} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}\hfill[fset]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{\GNUTexinfocommandstyletextvar{i} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fset]
+\end{tabularx}
 
 \index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
-\noindent\texttt{truc 
\EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}\hfill[cmde]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{truc \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [cmde]
+\end{tabularx}
 
 \index[fn]{truc@\texttt{truc}}%
 \begin{quote}
@@ -6642,7 +8138,12 @@ text in def item for second def item
 
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{d{-}{-}efvr\_name}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efvr\_name}& [c--ategory]
+\end{tabularx}
 
 \index[cp]{d--efvr\_name@\texttt{d{-}{-}efvr\_name}}%
 \begin{quote}
@@ -6656,7 +8157,12 @@ d{-}{-}efvr
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{n{-}{-}ame 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{n{-}{-}ame 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory]
+\end{tabularx}
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
 \begin{quote}
@@ -6670,7 +8176,12 @@ d{-}{-}effn
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{n{-}{-}ame}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{n{-}{-}ame}& [c--ategory]
+\end{tabularx}
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
 \begin{quote}
@@ -6684,7 +8195,12 @@ d{-}{-}effn no arg
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name 
a{-}{-}rguments...}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name a{-}{-}rguments...}& 
[c--ategory]
+\end{tabularx}
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
 \begin{quote}
@@ -6698,7 +8214,12 @@ d{-}{-}eftypefn
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name}& [c--ategory]
+\end{tabularx}
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
 \begin{quote}
@@ -6712,7 +8233,12 @@ d{-}{-}eftypefn no arg
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypeop\_name 
a{-}{-}rguments...}\hfill[c--ategory on \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypeop\_name a{-}{-}rguments...}& 
[c--ategory on \texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[fn]{d--eftypeop\_name on c--lass@\texttt{d{-}{-}eftypeop\_name\ on 
c{-}{-}lass}}%
 \begin{quote}
@@ -6726,7 +8252,12 @@ d{-}{-}eftypeop
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypeop\_name}\hfill[c--ategory on 
\texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypeop\_name}& [c--ategory on 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[fn]{d--eftypeop\_name on c--lass@\texttt{d{-}{-}eftypeop\_name\ on 
c{-}{-}lass}}%
 \begin{quote}
@@ -6740,7 +8271,12 @@ d{-}{-}eftypeop no arg
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypevr\_name}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypevr\_name}& [c--ategory]
+\end{tabularx}
 
 \index[cp]{d--eftypevr\_name@\texttt{d{-}{-}eftypevr\_name}}%
 \begin{quote}
@@ -6754,7 +8290,12 @@ d{-}{-}eftypevr
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{d{-}{-}efcv\_name}\hfill[c--ategory of \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efcv\_name}& [c--ategory of \texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
 \begin{quote}
@@ -6768,7 +8309,12 @@ d{-}{-}efcv
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{d{-}{-}efcv\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[c--ategory 
of \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efcv\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory of 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
 \begin{quote}
@@ -6782,7 +8328,12 @@ d{-}{-}efcv with arguments
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypecv\_name}\hfill[c--ategory of 
\texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypecv\_name}& [c--ategory of 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name\ of 
c{-}{-}lass}}%
 \begin{quote}
@@ -6796,7 +8347,12 @@ d{-}{-}eftypecv
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypecv\_name 
a{-}{-}rguments...}\hfill[c--ategory of \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypecv\_name a{-}{-}rguments...}& 
[c--ategory of \texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name\ of 
c{-}{-}lass}}%
 \begin{quote}
@@ -6810,7 +8366,12 @@ d{-}{-}eftypecv with arguments
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{d{-}{-}efop\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[c--ategory 
on \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efop\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory on 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name\ on 
c{-}{-}lass}}%
 \begin{quote}
@@ -6824,7 +8385,12 @@ d{-}{-}efop
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{d{-}{-}efop\_name}\hfill[c--ategory on \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efop\_name}& [c--ategory on \texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name\ on 
c{-}{-}lass}}%
 \begin{quote}
@@ -6838,7 +8404,12 @@ d{-}{-}efop no arg
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{d{-}{-}eftp\_name 
\EmbracOn{}\textnormal{\textsl{a--ttributes...}}\EmbracOff{}}\hfill[c--ategory]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}eftp\_name 
\EmbracOn{}\textnormal{\textsl{a--ttributes...}}\EmbracOff{}}& [c--ategory]
+\end{tabularx}
 
 \index[tp]{d--eftp\_name@\texttt{d{-}{-}eftp\_name}}%
 \begin{quote}
@@ -6852,7 +8423,12 @@ d{-}{-}eftp
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{d{-}{-}efun\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efun\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Function]
+\end{tabularx}
 
 \index[fn]{d--efun\_name@\texttt{d{-}{-}efun\_name}}%
 \begin{quote}
@@ -6866,7 +8442,12 @@ d{-}{-}efun
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{d{-}{-}efmac\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[Macro]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efmac\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Macro]
+\end{tabularx}
 
 \index[fn]{d--efmac\_name@\texttt{d{-}{-}efmac\_name}}%
 \begin{quote}
@@ -6880,7 +8461,12 @@ d{-}{-}efmac
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{d{-}{-}efspec\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[Special Form]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efspec\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Special Form]
+\end{tabularx}
 
 \index[fn]{d--efspec\_name@\texttt{d{-}{-}efspec\_name}}%
 \begin{quote}
@@ -6894,7 +8480,12 @@ d{-}{-}efspec
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{d{-}{-}efvar\_name}\hfill[Variable]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efvar\_name}& [Variable]
+\end{tabularx}
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
 \begin{quote}
@@ -6908,7 +8499,12 @@ d{-}{-}efvar
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{d{-}{-}efvar\_name \EmbracOn{}\textnormal{\textsl{arg--var 
arg--var1}}\EmbracOff{}}\hfill[Variable]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efvar\_name \EmbracOn{}\textnormal{\textsl{arg--var 
arg--var1}}\EmbracOff{}}& [Variable]
+\end{tabularx}
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
 \begin{quote}
@@ -6922,7 +8518,12 @@ d{-}{-}efvar with args
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{d{-}{-}efopt\_name}\hfill[User Option]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efopt\_name}& [User Option]
+\end{tabularx}
 
 \index[cp]{d--efopt\_name@\texttt{d{-}{-}efopt\_name}}%
 \begin{quote}
@@ -6936,7 +8537,12 @@ d{-}{-}efopt
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypefun\_name 
a{-}{-}rguments...}\hfill[Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypefun\_name a{-}{-}rguments...}& 
[Function]
+\end{tabularx}
 
 \index[fn]{d--eftypefun\_name@\texttt{d{-}{-}eftypefun\_name}}%
 \begin{quote}
@@ -6950,7 +8556,12 @@ d{-}{-}eftypefun
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypevar\_name}\hfill[Variable]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypevar\_name}& [Variable]
+\end{tabularx}
 
 \index[cp]{d--eftypevar\_name@\texttt{d{-}{-}eftypevar\_name}}%
 \begin{quote}
@@ -6964,7 +8575,12 @@ d{-}{-}eftypevar
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{d{-}{-}efivar\_name}\hfill[Instance Variable of 
\texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efivar\_name}& [Instance Variable of 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[cp]{d--efivar\_name of c--lass@\texttt{d{-}{-}efivar\_name\ of 
c{-}{-}lass}}%
 \begin{quote}
@@ -6978,7 +8594,12 @@ d{-}{-}efivar
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypeivar\_name}\hfill[Instance Variable 
of \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypeivar\_name}& [Instance Variable of 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[cp]{d--eftypeivar\_name of c--lass@\texttt{d{-}{-}eftypeivar\_name\ of 
c{-}{-}lass}}%
 \begin{quote}
@@ -6992,7 +8613,12 @@ d{-}{-}eftypeivar
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{d{-}{-}efmethod\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}\hfill[Method on 
\texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{d{-}{-}efmethod\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Method on 
\texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[fn]{d--efmethod\_name on c--lass@\texttt{d{-}{-}efmethod\_name\ on 
c{-}{-}lass}}%
 \begin{quote}
@@ -7006,7 +8632,12 @@ d{-}{-}efmethod
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypemethod\_name 
a{-}{-}rguments...}\hfill[Method on \texttt{c{-}{-}lass}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype d{-}{-}eftypemethod\_name a{-}{-}rguments...}& 
[Method on \texttt{c{-}{-}lass}]
+\end{tabularx}
 
 \index[fn]{d--eftypemethod\_name on c--lass@\texttt{d{-}{-}eftypemethod\_name\ 
on c{-}{-}lass}}%
 \begin{quote}
@@ -7021,7 +8652,12 @@ d{-}{-}eftypemethod
 
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{data-type2\leavevmode{}\\name2 arguments2...}\hfill[Function]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{data-type2\leavevmode{}\\name2 arguments2...}& [Function]
+\end{tabularx}
 
 \index[fn]{name2@\texttt{name2}}%
 \begin{quote}
@@ -7035,7 +8671,12 @@ aaa2
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypefn\_name2}\hfill[c--ategory2]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypefn\_name2}& 
[c--ategory2]
+\end{tabularx}
 
 \index[fn]{d--eftypefn\_name2@\texttt{d{-}{-}eftypefn\_name2}}%
 \begin{quote}
@@ -7049,7 +8690,12 @@ d{-}{-}eftypefn no arg2
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2 
a{-}{-}rguments2...}\hfill[c--ategory2 on \texttt{c{-}{-}lass2}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2 
a{-}{-}rguments2...}& [c--ategory2 on \texttt{c{-}{-}lass2}]
+\end{tabularx}
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2\ on 
c{-}{-}lass2}}%
 \begin{quote}
@@ -7063,7 +8709,12 @@ d{-}{-}eftypeop2
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2}\hfill[c--ategory2
 on \texttt{c{-}{-}lass2}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypeop\_name2}& 
[c--ategory2 on \texttt{c{-}{-}lass2}]
+\end{tabularx}
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2\ on 
c{-}{-}lass2}}%
 \begin{quote}
@@ -7077,7 +8728,12 @@ d{-}{-}eftypeop no arg2
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{t{-}{-}ype2 d{-}{-}eftypecv\_name2}\hfill[c--ategory2 of 
\texttt{c{-}{-}lass2}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype2 d{-}{-}eftypecv\_name2}& [c--ategory2 of 
\texttt{c{-}{-}lass2}]
+\end{tabularx}
 
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2\ of 
c{-}{-}lass2}}%
 \begin{quote}
@@ -7091,7 +8747,12 @@ d{-}{-}eftypecv2
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{t{-}{-}ype2 d{-}{-}eftypecv\_name2 
a{-}{-}rguments2...}\hfill[c--ategory2 of \texttt{c{-}{-}lass2}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{t{-}{-}ype2 d{-}{-}eftypecv\_name2 a{-}{-}rguments2...}& 
[c--ategory2 of \texttt{c{-}{-}lass2}]
+\end{tabularx}
 
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2\ of 
c{-}{-}lass2}}%
 \begin{quote}
@@ -7105,7 +8766,12 @@ d{-}{-}eftypecv with arguments2
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{arg2}\hfill[fun2]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{arg2}& [fun2]
+\end{tabularx}
 
 \index[fn]{arg2@\texttt{arg2}}%
 \begin{quote}
@@ -7543,45 +9209,105 @@ l{-}{-}ine
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{}\hfill[fun]
 
-\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose 
and}}\EmbracOff{}}\hfill[truc]
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& [fun]
+\end{tabularx}
+
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose 
and}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and  
after}}\EmbracOff{}}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and  
after}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and 
}}\EmbracOff{}}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and 
}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and and 
after}}\EmbracOff{}}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and and 
after}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
-\noindent\texttt{followed \EmbracOn{}\textnormal{\textsl{by a 
comment}}\EmbracOff{}}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{followed \EmbracOn{}\textnormal{\textsl{by a 
comment}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{followed@\texttt{followed}}%
 \begin{GNUTexinfopreformatted}
 \leftskip=2em\relax\ttfamily%
 Various deff lines
 \end{GNUTexinfopreformatted}
-\noindent\texttt{after \EmbracOn{}\textnormal{\textsl{a deff 
item}}\EmbracOff{}}\hfill[truc]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{after \EmbracOn{}\textnormal{\textsl{a deff 
item}}\EmbracOff{}}& [truc]
+\end{tabularx}
 
 \index[fn]{after@\texttt{after}}%
 \begin{GNUTexinfopreformatted}
 \leftskip=2em\relax\ttfamily%
 
 \end{GNUTexinfopreformatted}
-\noindent\texttt{\GNUTexinfocommandstyletextvar{invalid} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}\hfill[fsetinv]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{\GNUTexinfocommandstyletextvar{invalid} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fsetinv]
+\end{tabularx}
 
 \index[fn]{invalid@\texttt{\GNUTexinfocommandstyletextvar{invalid}}}%
-\noindent\texttt{}\hfill[\textbf{id `\texttt{i}' ule}]
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& [\textbf{id `\texttt{i}' ule}]
+\end{tabularx}
+
+
+
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& [aaa]
+\end{tabularx}
 
 
-\noindent\texttt{}\hfill[aaa]
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& []
+\end{tabularx}
 
-\noindent\texttt{}\hfill[]
 
-\noindent\texttt{}\hfill[truc]
+\noindent\begin{tabularx}{\linewidth}{@{}Xr}
+\rightskip=5em plus 1 fill
+\hangindent=2em
+\noindent\texttt{}& [truc]
+\end{tabularx}
 
 \begin{GNUTexinfopreformatted}
 \leftskip=2em\relax\ttfamily%



reply via email to

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