texinfo-commits
[Top][All Lists]
Advanced

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

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


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/Convert/LaTeX.pm (_convert): remove unneeded \noindent in tabularx cell.
Date: Thu, 25 Aug 2022 10:54:28 -0400

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

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 26d6677175 * tp/Texinfo/Convert/LaTeX.pm (_convert): remove unneeded 
\noindent in tabularx cell.
26d6677175 is described below

commit 26d6677175897e06f16ae185a7ef7c08b3388fdf
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Aug 25 16:54:18 2022 +0200

    * tp/Texinfo/Convert/LaTeX.pm (_convert): remove unneeded \noindent
    in tabularx cell.
---
 ChangeLog                                          |   5 +
 tp/Texinfo/Convert/LaTeX.pm                        |   3 +-
 tp/t/results/converters_tests/complex_nestings.pl  |  10 +-
 .../res_latex/definition_commands.tex              | 156 ++---
 .../converters_tests/frenchspacing_and_code.pl     |   8 +-
 .../converters_tests/test_deftypefnnewline.pl      |  28 +-
 tp/t/results/def/omit_def_space.pl                 |   4 +-
 .../res_latex/multiple_lang_chapters.tex           |   6 +-
 tp/t/results/latex_tests/brace_in_index.pl         |   4 +-
 tp/t/results/preformatted/def_in_example.pl        |   2 +-
 .../res_parser/formatting_latex/formatting.tex     | 690 ++++++++++-----------
 11 files changed, 461 insertions(+), 455 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 089bac216c..646ac28a0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-08-25  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/LaTeX.pm (_convert): remove unneeded \noindent
+       in tabularx cell.
+
 2022-08-25  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/LaTeX.pm: replace form feeds in ignorable
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index db983a9ab9..fdb1b2b4e7 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -3570,6 +3570,7 @@ sub _convert($$)
         my $def_line_result = '';
         # First column (X) is as wide as possible, second column (r) is for
         # category.  @{} removes space at left side of table.
+        # Without \noindent, a def* after a section beginning is indented
         $def_line_result .= 
"\\noindent\\begin{tabularx}{\\linewidth}{\@{}Xr}\n";
 
         # This stops the definition line overlapping the category in
@@ -3579,7 +3580,7 @@ sub _convert($$)
         # In case definition "line" doesn't fit on one line.
         $def_line_result .= "\\hangindent=2em\n";
 
-        $def_line_result .= '\noindent\texttt{';
+        $def_line_result .= '\texttt{';
 
         # no end of line in tabularx
         push @{$self->{'formatting_context'}->[-1]->{'no_eol'}}, 1;
diff --git a/tp/t/results/converters_tests/complex_nestings.pl 
b/tp/t/results/converters_tests/complex_nestings.pl
index c29f81d040..d458f70948 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -1784,7 +1784,7 @@ deffs
 \\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
 \\rightskip=5em plus 1 fill
 \\hangindent=2em
-\\noindent\\texttt{my def \\EmbracOn{}\\textnormal{\\textsl{args 
\\GNUTexinfocommandstyletextvar{arg} \\dots{}\\@}}\\EmbracOff{}}& [Function]
+\\texttt{my def \\EmbracOn{}\\textnormal{\\textsl{args 
\\GNUTexinfocommandstyletextvar{arg} \\dots{}\\@}}\\EmbracOff{}}& [Function]
 \\end{tabularx}
 
 \\index[fn]{my def@\\texttt{my def}}%
@@ -1792,7 +1792,7 @@ deffs
 \\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
 \\rightskip=5em plus 1 fill
 \\hangindent=2em
-\\noindent\\texttt{other def \\EmbracOn{}\\textnormal{\\textsl{no 
args}}\\EmbracOff{}}& [Function]
+\\texttt{other def \\EmbracOn{}\\textnormal{\\textsl{no args}}\\EmbracOff{}}& 
[Function]
 \\end{tabularx}
 
 \\index[fn]{other def@\\texttt{other def}}%
@@ -1802,7 +1802,7 @@ deffs
 \\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
 \\rightskip=5em plus 1 fill
 \\hangindent=2em
-\\noindent\\texttt{name \\EmbracOn{}\\textnormal{\\textsl{and now the 
args}}\\EmbracOff{}}& [type]
+\\texttt{name \\EmbracOn{}\\textnormal{\\textsl{and now the 
args}}\\EmbracOff{}}& [type]
 \\end{tabularx}
 
 \\index[fn]{name@\\texttt{name}}%
@@ -1812,7 +1812,7 @@ deffs
 \\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
 \\rightskip=5em plus 1 fill
 \\hangindent=2em
-\\noindent\\texttt{variables 
\\EmbracOn{}\\textnormal{\\textsl{variable-name}}\\EmbracOff{}}& [Variable]
+\\texttt{variables 
\\EmbracOn{}\\textnormal{\\textsl{variable-name}}\\EmbracOff{}}& [Variable]
 \\end{tabularx}
 
 \\index[vr]{variables@\\texttt{variables}}%
@@ -1824,7 +1824,7 @@ deffs
 \\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
 \\rightskip=5em plus 1 fill
 \\hangindent=2em
-\\noindent\\texttt{variables too 
\\EmbracOn{}\\textnormal{\\textsl{other-variable}}\\EmbracOff{}}& [Variable]
+\\texttt{variables too 
\\EmbracOn{}\\textnormal{\\textsl{other-variable}}\\EmbracOff{}}& [Variable]
 \\end{tabularx}
 
 \\index[vr]{variables too@\\texttt{variables too}}%
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 4fdf6767c9..1c1059290a 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
@@ -82,7 +82,7 @@
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{fname \EmbracOn{}\textnormal{\textsl{a---rg1 
a--rg2}}\EmbracOff{}}& [Func]
+\texttt{fname \EmbracOn{}\textnormal{\textsl{a---rg1 a--rg2}}\EmbracOff{}}& 
[Func]
 \end{tabularx}
 
 \index[fn]{fname@\texttt{fname}}%
@@ -95,7 +95,7 @@ deffn no var for \GNUTexinfocommandstyletextvar{a---rg1} and 
\GNUTexinfocommands
 \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]
+\texttt{fname 
\EmbracOn{}\textnormal{\textsl{\GNUTexinfocommandstyletextvar{a---rg1} 
\GNUTexinfocommandstyletextvar{a--rg2}}}\EmbracOff{}}& [Func]
 \end{tabularx}
 
 \index[fn]{fname@\texttt{fname}}%
@@ -108,7 +108,7 @@ deffn explict var for 
\GNUTexinfocommandstyletextvar{a---rg1} and \GNUTexinfocom
 \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]
+\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}}%
@@ -121,7 +121,7 @@ deffn r slanted for \GNUTexinfocommandstyletextvar{a---rg1} 
and \GNUTexinfocomma
 \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]
+\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var [from to [inc]]) 
default}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -129,7 +129,7 @@ deffn r slanted for \GNUTexinfocommandstyletextvar{a---rg1} 
and \GNUTexinfocomma
 \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]
+\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}}%
@@ -137,7 +137,7 @@ deffn r slanted for \GNUTexinfocommandstyletextvar{a---rg1} 
and \GNUTexinfocomma
 \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]
+\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\GNUTexinfocommandstyletextvar{[}from to 
\GNUTexinfocommandstyletextvar{[}inc\GNUTexinfocommandstyletextvar{]]}) 
var}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -145,7 +145,7 @@ deffn r slanted for \GNUTexinfocommandstyletextvar{a---rg1} 
and \GNUTexinfocomma
 \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]
+\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var \textsl{[}from to 
\textsl{[}inc\textsl{]]}) slanted}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -153,7 +153,7 @@ deffn r slanted for \GNUTexinfocommandstyletextvar{a---rg1} 
and \GNUTexinfocomma
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var \texttt{[}from to 
\texttt{[}inc\texttt{]]}) code}}\EmbracOff{}}& [Special Form]
+\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var \texttt{[}from to 
\texttt{[}inc\texttt{]]}) code}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -161,7 +161,7 @@ deffn r slanted for \GNUTexinfocommandstyletextvar{a---rg1} 
and \GNUTexinfocomma
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var \texttt{[}from to 
\texttt{[}inc\texttt{]]}) t}}\EmbracOff{}}& [Special Form]
+\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var \texttt{[}from to 
\texttt{[}inc\texttt{]]}) t}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -169,7 +169,7 @@ deffn r slanted for \GNUTexinfocommandstyletextvar{a---rg1} 
and \GNUTexinfocomma
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\texttt{\textbf{[}}from to \texttt{\textbf{[}}inc\texttt{\textbf{]]}}) 
t:b}}\EmbracOff{}}& [Special Form]
+\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var \texttt{\textbf{[}}from to 
\texttt{\textbf{[}}inc\texttt{\textbf{]]}}) t:b}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -177,7 +177,7 @@ deffn r slanted for \GNUTexinfocommandstyletextvar{a---rg1} 
and \GNUTexinfocomma
 \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]
+\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}}%
@@ -185,7 +185,7 @@ deffn r slanted for \GNUTexinfocommandstyletextvar{a---rg1} 
and \GNUTexinfocomma
 \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]
+\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}}%
@@ -193,7 +193,7 @@ deffn r slanted for \GNUTexinfocommandstyletextvar{a---rg1} 
and \GNUTexinfocomma
 \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]
+\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}}%
@@ -201,7 +201,7 @@ deffn r slanted for \GNUTexinfocommandstyletextvar{a---rg1} 
and \GNUTexinfocomma
 \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]
+\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}}%
@@ -209,7 +209,7 @@ deffn r slanted for \GNUTexinfocommandstyletextvar{a---rg1} 
and \GNUTexinfocomma
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\texttt{\GNUTexinfocommandstyletextvar{[}}from to 
\texttt{\GNUTexinfocommandstyletextvar{[}}inc\texttt{\GNUTexinfocommandstyletextvar{]]}})
 code:var}}\EmbracOff{}}& [Special Form]
+\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\texttt{\GNUTexinfocommandstyletextvar{[}}from to 
\texttt{\GNUTexinfocommandstyletextvar{[}}inc\texttt{\GNUTexinfocommandstyletextvar{]]}})
 code:var}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -217,7 +217,7 @@ deffn r slanted for \GNUTexinfocommandstyletextvar{a---rg1} 
and \GNUTexinfocomma
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\texttt{\GNUTexinfocommandstyletextvar{[}}from to 
\texttt{\GNUTexinfocommandstyletextvar{[}}inc\texttt{\GNUTexinfocommandstyletextvar{]]}})
 t:var}}\EmbracOff{}}& [Special Form]
+\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\texttt{\GNUTexinfocommandstyletextvar{[}}from to 
\texttt{\GNUTexinfocommandstyletextvar{[}}inc\texttt{\GNUTexinfocommandstyletextvar{]]}})
 t:var}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -225,7 +225,7 @@ deffn r slanted for \GNUTexinfocommandstyletextvar{a---rg1} 
and \GNUTexinfocomma
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\texttt{\textsl{[}}from to \texttt{\textsl{[}}inc\texttt{\textsl{]]}}) 
code:slanted}}\EmbracOff{}}& [Special Form]
+\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var \texttt{\textsl{[}}from to 
\texttt{\textsl{[}}inc\texttt{\textsl{]]}}) code:slanted}}\EmbracOff{}}& 
[Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -233,7 +233,7 @@ deffn r slanted for \GNUTexinfocommandstyletextvar{a---rg1} 
and \GNUTexinfocomma
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\texttt{\textsl{[}}from to \texttt{\textsl{[}}inc\texttt{\textsl{]]}}) 
t:slanted}}\EmbracOff{}}& [Special Form]
+\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var \texttt{\textsl{[}}from to 
\texttt{\textsl{[}}inc\texttt{\textsl{]]}}) t:slanted}}\EmbracOff{}}& [Special 
Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -246,7 +246,7 @@ separators
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{va---riable 
default}}\EmbracOff{}}& [Special Form]
+\texttt{foobar \EmbracOn{}\textnormal{\textsl{va---riable 
default}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -254,7 +254,7 @@ separators
 \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]
+\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\GNUTexinfocommandstyletextvar{va---riable} 
var}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -262,7 +262,7 @@ separators
 \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]
+\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\EmbracOff{}\textnormal{va---riable}\EmbracOn{} 
r}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -270,7 +270,7 @@ separators
 \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]
+\texttt{foobar \EmbracOn{}\textnormal{\textsl{\textsl{va---riable} 
slanted}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -278,7 +278,7 @@ separators
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\texttt{va{-}{-}{-}riable} code}}\EmbracOff{}}& 
[Special Form]
+\texttt{foobar \EmbracOn{}\textnormal{\textsl{\texttt{va{-}{-}{-}riable} 
code}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -286,7 +286,7 @@ separators
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\texttt{va{-}{-}{-}riable} t}}\EmbracOff{}}& 
[Special Form]
+\texttt{foobar \EmbracOn{}\textnormal{\textsl{\texttt{va{-}{-}{-}riable} 
t}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -294,7 +294,7 @@ separators
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\texttt{\textbf{va{-}{-}{-}riable}} 
t:b}}\EmbracOff{}}& [Special Form]
+\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\texttt{\textbf{va{-}{-}{-}riable}} 
t:b}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -302,7 +302,7 @@ separators
 \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]
+\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\EmbracOff{}\textnormal{\GNUTexinfocommandstyletextvar{va---riable}}\EmbracOn{}
 r:var}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -310,7 +310,7 @@ separators
 \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]
+\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\EmbracOff{}\textnormal{\textsl{va---riable}}\EmbracOn{}
 r:slanted}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -318,7 +318,7 @@ separators
 \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]
+\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\EmbracOff{}\textnormal{\texttt{va{-}{-}{-}riable}}\EmbracOn{}
 r:code}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -326,7 +326,7 @@ separators
 \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]
+\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\EmbracOff{}\textnormal{\texttt{va{-}{-}{-}riable}}\EmbracOn{}
 r:t}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -334,7 +334,7 @@ separators
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\texttt{\GNUTexinfocommandstyletextvar{va---riable}}
 code:var}}\EmbracOff{}}& [Special Form]
+\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\texttt{\GNUTexinfocommandstyletextvar{va---riable}}
 code:var}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -342,7 +342,7 @@ separators
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\texttt{\GNUTexinfocommandstyletextvar{va---riable}}
 t:var}}\EmbracOff{}}& [Special Form]
+\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\texttt{\GNUTexinfocommandstyletextvar{va---riable}}
 t:var}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -350,7 +350,7 @@ separators
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\texttt{\textsl{va{-}{-}{-}riable}} 
code:slanted}}\EmbracOff{}}& [Special Form]
+\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\texttt{\textsl{va{-}{-}{-}riable}} 
code:slanted}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -358,7 +358,7 @@ separators
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\texttt{\textsl{va{-}{-}{-}riable}} 
t:slanted}}\EmbracOff{}}& [Special Form]
+\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\texttt{\textsl{va{-}{-}{-}riable}} 
t:slanted}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -371,7 +371,7 @@ name
 \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]
+\texttt{\texttt{.ft} 
\EmbracOn{}\textnormal{\textsl{[\EmbracOff{}\textnormal{\textsl{font}}\EmbracOn{}]}}\EmbracOff{}}&
 [Request]
 \end{tabularx}
 
 \index[fn]{.ft@\texttt{\texttt{.ft}}}%
@@ -379,7 +379,7 @@ name
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{\texttt{\textbackslash{}f}\textnormal{\textsl{f}}\texttt{}}& 
[Escape~sequence]
+\texttt{\texttt{\textbackslash{}f}\textnormal{\textsl{f}}\texttt{}}& 
[Escape~sequence]
 \end{tabularx}
 
 
\index[fn]{\textbackslash{}ff@\texttt{\texttt{\textbackslash{}f}\textnormal{\textsl{f}}\texttt{}}}%
@@ -387,7 +387,7 @@ name
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{\texttt{\textbackslash{}f(}\textnormal{\textsl{fn}}\texttt{}}&
 [Escape~sequence]
+\texttt{\texttt{\textbackslash{}f(}\textnormal{\textsl{fn}}\texttt{}}& 
[Escape~sequence]
 \end{tabularx}
 
 
\index[fn]{\textbackslash{}f(fn@\texttt{\texttt{\textbackslash{}f(}\textnormal{\textsl{fn}}\texttt{}}}%
@@ -395,7 +395,7 @@ name
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{\texttt{\textbackslash{}f[}\textnormal{\textsl{font}}\texttt{]}
 
\EmbracOn{}\textnormal{\textsl{\texttt{\textbackslash{}f[}\EmbracOff{}\textnormal{\textsl{font}}\EmbracOn{}\texttt{]}}}\EmbracOff{}}&
 [Escape~sequence]
+\texttt{\texttt{\textbackslash{}f[}\textnormal{\textsl{font}}\texttt{]} 
\EmbracOn{}\textnormal{\textsl{\texttt{\textbackslash{}f[}\EmbracOff{}\textnormal{\textsl{font}}\EmbracOn{}\texttt{]}}}\EmbracOff{}}&
 [Escape~sequence]
 \end{tabularx}
 
 
\index[fn]{\textbackslash{}f[font]@\texttt{\texttt{\textbackslash{}f[}\textnormal{\textsl{font}}\texttt{]}}}%
@@ -403,7 +403,7 @@ name
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{\texttt{\textbackslash{}n[.sty]}}& [Register]
+\texttt{\texttt{\textbackslash{}n[.sty]}}& [Register]
 \end{tabularx}
 
 \index[fn]{\textbackslash{}n[.sty]@\texttt{\texttt{\textbackslash{}n[.sty]}}}%
@@ -418,7 +418,7 @@ to \GNUTexinfocommandstyletextvar{font} (one-character 
name~\GNUTexinfocommandst
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{[ 
\EmbracOff{}\textnormal{[}\EmbracOn{} \textsl{[} \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{\texttt{,}}\EmbracOn{}  [...]
+\texttt{foobar \EmbracOn{}\textnormal{\textsl{[ 
\EmbracOff{}\textnormal{[}\EmbracOn{} \textsl{[} \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{\texttt{,}}\EmbracOn{} \EmbracOf [...]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -426,7 +426,7 @@ to \GNUTexinfocommandstyletextvar{font} (one-character 
name~\GNUTexinfocommandst
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{[] 
\EmbracOff{}\textnormal{[]}\EmbracOn{} \textsl{[]} \texttt{[]} \texttt{[]} 
\EmbracOff{}\textnormal{\textsl{[]}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{[]}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{\textsl{[]}}}\EmbracOn{}}}\EmbracOff{}}& 
[Special Form]
+\texttt{foobar \EmbracOn{}\textnormal{\textsl{[] 
\EmbracOff{}\textnormal{[]}\EmbracOn{} \textsl{[]} \texttt{[]} \texttt{[]} 
\EmbracOff{}\textnormal{\textsl{[]}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{[]}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{\textsl{[]}}}\EmbracOn{}}}\EmbracOff{}}& 
[Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -439,7 +439,7 @@ test formatting of separators
 \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]
+\texttt{int foobar (int\ \GNUTexinfocommandstyletextvar{f---oo},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar})}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -452,7 +452,7 @@ test formatting of separators
 \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]
+\texttt{int foobar (int\ \textnormal{\textsl{f---oo}},\ float\ 
\textnormal{\textsl{b--ar}})}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -466,7 +466,7 @@ test formatting of separators
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{border-pattern}& [Class Option of \texttt{Window}]
+\texttt{border-pattern}& [Class Option of \texttt{Window}]
 \end{tabularx}
 
 \index[vr]{border-pattern@\texttt{border-pattern}}%
@@ -479,7 +479,7 @@ test formatting of separators
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{\texttt{int} border-pattern}& [Class Option of 
\texttt{Window}]
+\texttt{\texttt{int} border-pattern}& [Class Option of \texttt{Window}]
 \end{tabularx}
 
 \index[vr]{border-pattern of Window@\texttt{border-pattern\ of Window}}%
@@ -493,7 +493,7 @@ test formatting of separators
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{int foobar (int\ \GNUTexinfocommandstyletextvar{foo},\ float\ 
\GNUTexinfocommandstyletextvar{bar})}& [Library Function]
+\texttt{int foobar (int\ \GNUTexinfocommandstyletextvar{foo},\ float\ 
\GNUTexinfocommandstyletextvar{bar})}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -507,7 +507,7 @@ test formatting of separators
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{apply \EmbracOn{}\textnormal{\textsl{function \&rest 
arguments}}\EmbracOff{}}& [Function]
+\texttt{apply \EmbracOn{}\textnormal{\textsl{function \&rest 
arguments}}\EmbracOff{}}& [Function]
 \end{tabularx}
 
 \index[fn]{apply@\texttt{apply}}%
@@ -520,7 +520,7 @@ test formatting of separators
 \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]
+\texttt{apply \EmbracOn{}\textnormal{\textsl{function 
\EmbracOff{}\textnormal{\textbf{\&rest}}\EmbracOn{} argument}}\EmbracOff{}}& 
[Function]
 \end{tabularx}
 
 \index[fn]{apply@\texttt{apply}}%
@@ -533,7 +533,7 @@ explicit keyword marking, no var 
\GNUTexinfocommandstyletextvar{function} with \
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{name \EmbracOn{}\textnormal{\textsl{argument \texttt{int} 
\texttt{a{-}{-}b} \GNUTexinfocommandstyletextvar{v--ar1}, word \texttt{{-}{-}} 
(\texttt{type o{-}{-}ther}, \GNUTexinfocommandstyletextvar{v---ar2}  
[\texttt{float} [\GNUTexinfocommandstyletextvar{var4}]])}}\EmbracOff{}}& 
[Category]
+\texttt{name \EmbracOn{}\textnormal{\textsl{argument \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}
 
 \index[fn]{name@\texttt{name}}%
@@ -546,7 +546,7 @@ In deffn with code and var used
 \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]
+\texttt{int foobar (int\ \GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ default}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -554,7 +554,7 @@ In deffn with code and var used
 \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]
+\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\textnormal{[},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}\textnormal{]})\ r}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -562,7 +562,7 @@ In deffn with code and var used
 \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]
+\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\GNUTexinfocommandstyletextvar{[},\ 
float\ \GNUTexinfocommandstyletextvar{b--ar}\GNUTexinfocommandstyletextvar{]})\ 
var}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -570,7 +570,7 @@ In deffn with code and var used
 \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]
+\texttt{int foobar (int\ \GNUTexinfocommandstyletextvar{f---oo}\textsl{[},\ 
float\ \GNUTexinfocommandstyletextvar{b--ar}\textsl{]})\ slanted}& [Library 
Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -578,7 +578,7 @@ In deffn with code and var used
 \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]
+\texttt{int foobar (int\ \GNUTexinfocommandstyletextvar{f---oo}\texttt{[},\ 
float\ \GNUTexinfocommandstyletextvar{b--ar}\texttt{]})\ code}& [Library 
Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -586,7 +586,7 @@ In deffn with code and var used
 \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]
+\texttt{int foobar (int\ \GNUTexinfocommandstyletextvar{f---oo}\texttt{[},\ 
float\ \GNUTexinfocommandstyletextvar{b--ar}\texttt{]})\ t}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -594,7 +594,7 @@ In deffn with code and var used
 \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]
+\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}}%
@@ -602,7 +602,7 @@ In deffn with code and var used
 \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]
+\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}}%
@@ -610,7 +610,7 @@ In deffn with code and var used
 \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]
+\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}}%
@@ -618,7 +618,7 @@ In deffn with code and var used
 \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]
+\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}}%
@@ -626,7 +626,7 @@ In deffn with code and var used
 \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]
+\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}}%
@@ -634,7 +634,7 @@ In deffn with code and var used
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\texttt{\GNUTexinfocommandstyletextvar{[}},\
 float\ 
\GNUTexinfocommandstyletextvar{b--ar}\texttt{\GNUTexinfocommandstyletextvar{]}})\
 code:var}& [Library Function]
+\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\texttt{\GNUTexinfocommandstyletextvar{[}},\
 float\ 
\GNUTexinfocommandstyletextvar{b--ar}\texttt{\GNUTexinfocommandstyletextvar{]}})\
 code:var}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -642,7 +642,7 @@ In deffn with code and var used
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\texttt{\GNUTexinfocommandstyletextvar{[}},\
 float\ 
\GNUTexinfocommandstyletextvar{b--ar}\texttt{\GNUTexinfocommandstyletextvar{]}})\
 t:var}& [Library Function]
+\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\texttt{\GNUTexinfocommandstyletextvar{[}},\
 float\ 
\GNUTexinfocommandstyletextvar{b--ar}\texttt{\GNUTexinfocommandstyletextvar{]}})\
 t:var}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -650,7 +650,7 @@ In deffn with code and var used
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\texttt{\textsl{[}},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}\texttt{\textsl{]}})\ code:slanted}& 
[Library Function]
+\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\texttt{\textsl{[}},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}\texttt{\textsl{]}})\ code:slanted}& 
[Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -658,7 +658,7 @@ In deffn with code and var used
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\texttt{\textsl{[}},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}\texttt{\textsl{]}})\ t:slanted}& [Library 
Function]
+\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\texttt{\textsl{[}},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}\texttt{\textsl{]}})\ t:slanted}& [Library 
Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -671,7 +671,7 @@ separators
 \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]
+\texttt{int foobar (i{-}{-}nt\ \GNUTexinfocommandstyletextvar{f---oo}[,\ 
float\ \GNUTexinfocommandstyletextvar{b--ar}])\ default}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -679,7 +679,7 @@ separators
 \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]
+\texttt{int foobar (\textnormal{i--nt}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ r}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -687,7 +687,7 @@ separators
 \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]
+\texttt{int foobar (\GNUTexinfocommandstyletextvar{i--nt}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ var}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -695,7 +695,7 @@ separators
 \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]
+\texttt{int foobar (\textsl{i{-}{-}nt}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ slanted}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -703,7 +703,7 @@ separators
 \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]
+\texttt{int foobar (\texttt{i{-}{-}nt}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ code}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -711,7 +711,7 @@ separators
 \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]
+\texttt{int foobar (\texttt{i{-}{-}nt}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ t}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -719,7 +719,7 @@ separators
 \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]
+\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}}%
@@ -727,7 +727,7 @@ separators
 \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]
+\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}}%
@@ -735,7 +735,7 @@ separators
 \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]
+\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}}%
@@ -743,7 +743,7 @@ separators
 \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]
+\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}}%
@@ -751,7 +751,7 @@ separators
 \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]
+\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}}%
@@ -759,7 +759,7 @@ separators
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{int foobar (\texttt{\GNUTexinfocommandstyletextvar{i--nt}}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ code:var}& [Library Function]
+\texttt{int foobar (\texttt{\GNUTexinfocommandstyletextvar{i--nt}}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ code:var}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -767,7 +767,7 @@ separators
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{int foobar (\texttt{\GNUTexinfocommandstyletextvar{i--nt}}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ t:var}& [Library Function]
+\texttt{int foobar (\texttt{\GNUTexinfocommandstyletextvar{i--nt}}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ t:var}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -775,7 +775,7 @@ separators
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{int foobar (\texttt{\textsl{i{-}{-}nt}}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ code:slanted}& [Library Function]
+\texttt{int foobar (\texttt{\textsl{i{-}{-}nt}}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ code:slanted}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -783,7 +783,7 @@ separators
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{int foobar (\texttt{\textsl{i{-}{-}nt}}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ t:slanted}& [Library Function]
+\texttt{int foobar (\texttt{\textsl{i{-}{-}nt}}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ t:slanted}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
diff --git a/tp/t/results/converters_tests/frenchspacing_and_code.pl 
b/tp/t/results/converters_tests/frenchspacing_and_code.pl
index cb542f2ea7..d9930fab83 100644
--- a/tp/t/results/converters_tests/frenchspacing_and_code.pl
+++ b/tp/t/results/converters_tests/frenchspacing_and_code.pl
@@ -2537,7 +2537,7 @@ c:\\ d?\\ j
 \\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}]
+\\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}}%
@@ -2550,7 +2550,7 @@ deftypeop
 \\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} \\texttt{vcode?\\ is:\\ 
a}}}\\EmbracOff{}}& [vcat: r. z on \\texttt{vclass:\\ MyC.\\ u}]
+\\texttt{vname?\\ n;\\ d \\EmbracOn{}\\textnormal{\\textsl{varg? ve: f. 
\\GNUTexinfocommandstyletextvar{vv: g? b} \\texttt{vcode?\\ is:\\ 
a}}}\\EmbracOff{}}& [vcat: r. z on \\texttt{vclass:\\ MyC.\\ u}]
 \\end{tabularx}
 
 \\index[fn]{vname? n; d on vclass: MyC. u@\\texttt{vname?\\ n;\\ d\\ on 
vclass:\\ MyC.\\ u}}%
@@ -2576,7 +2576,7 @@ c:\\ d?\\ jn
 \\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}]
+\\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}}%
@@ -2589,7 +2589,7 @@ deftypeop n
 \\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} \\texttt{vcode?\\ is:\\ 
a}}}\\EmbracOff{}}& [vcat: r. z on \\texttt{nvclass:\\ MyC.\\ u}]
+\\texttt{vname?\\ n;\\ d \\EmbracOn{}\\textnormal{\\textsl{varg? ve: f. 
\\GNUTexinfocommandstyletextvar{vv: g? b} \\texttt{vcode?\\ is:\\ 
a}}}\\EmbracOff{}}& [vcat: r. z on \\texttt{nvclass:\\ MyC.\\ u}]
 \\end{tabularx}
 
 \\index[fn]{vname? n; d on nvclass: MyC. u@\\texttt{vname?\\ n;\\ d\\ on 
nvclass:\\ MyC.\\ u}}%
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl 
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index 83a90befbb..258e31be11 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -3627,7 +3627,7 @@ $result_converted{'latex'}->{'test_deftypefnnewline'} = '
 \\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
 \\rightskip=5em plus 1 fill
 \\hangindent=2em
-\\noindent\\texttt{data-type}& [Function]\\\\
+\\texttt{data-type}& [Function]\\\\
 \\texttt{name arguments...}\\end{tabularx}
 
 \\index[fn]{name@\\texttt{name}}%
@@ -3640,7 +3640,7 @@ aaa
 \\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
 \\rightskip=5em plus 1 fill
 \\hangindent=2em
-\\noindent\\texttt{t{-}{-}ype}& [c--ategory]\\\\
+\\texttt{t{-}{-}ype}& [c--ategory]\\\\
 \\texttt{d{-}{-}eftypefn\\_name}\\end{tabularx}
 
 \\index[fn]{d--eftypefn\\_name@\\texttt{d{-}{-}eftypefn\\_name}}%
@@ -3653,7 +3653,7 @@ d--eftypefn no arg
 \\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
 \\rightskip=5em plus 1 fill
 \\hangindent=2em
-\\noindent\\texttt{t{-}{-}ype}& [c--ategory on \\texttt{c{-}{-}lass}]\\\\
+\\texttt{t{-}{-}ype}& [c--ategory on \\texttt{c{-}{-}lass}]\\\\
 \\texttt{d{-}{-}eftypeop\\_name a{-}{-}rguments...}\\end{tabularx}
 
 \\index[fn]{d--eftypeop\\_name on c--lass@\\texttt{d{-}{-}eftypeop\\_name\\ on 
c{-}{-}lass}}%
@@ -3666,7 +3666,7 @@ d--eftypeop
 \\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
 \\rightskip=5em plus 1 fill
 \\hangindent=2em
-\\noindent\\texttt{t{-}{-}ype}& [c--ategory on \\texttt{c{-}{-}lass}]\\\\
+\\texttt{t{-}{-}ype}& [c--ategory on \\texttt{c{-}{-}lass}]\\\\
 \\texttt{d{-}{-}eftypeop\\_name}\\end{tabularx}
 
 \\index[fn]{d--eftypeop\\_name on c--lass@\\texttt{d{-}{-}eftypeop\\_name\\ on 
c{-}{-}lass}}%
@@ -3679,7 +3679,7 @@ d--eftypeop no arg
 \\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}]
+\\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}}%
@@ -3692,7 +3692,7 @@ d--eftypecv
 \\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}]
+\\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}}%
@@ -3705,7 +3705,7 @@ d--eftypecv with arguments
 \\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
 \\rightskip=5em plus 1 fill
 \\hangindent=2em
-\\noindent\\texttt{arg}& [fun]
+\\texttt{arg}& [fun]
 \\end{tabularx}
 
 \\index[fn]{arg@\\texttt{arg}}%
@@ -3719,7 +3719,7 @@ fff
 \\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
 \\rightskip=5em plus 1 fill
 \\hangindent=2em
-\\noindent\\texttt{data-type2 name2 arguments2...}& [Function]
+\\texttt{data-type2 name2 arguments2...}& [Function]
 \\end{tabularx}
 
 \\index[fn]{name2@\\texttt{name2}}%
@@ -3732,7 +3732,7 @@ aaa2
 \\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
 \\rightskip=5em plus 1 fill
 \\hangindent=2em
-\\noindent\\texttt{t{-}{-}ype2 d{-}{-}eftypefn\\_name2}& [c--ategory2]
+\\texttt{t{-}{-}ype2 d{-}{-}eftypefn\\_name2}& [c--ategory2]
 \\end{tabularx}
 
 \\index[fn]{d--eftypefn\\_name2@\\texttt{d{-}{-}eftypefn\\_name2}}%
@@ -3745,7 +3745,7 @@ d--eftypefn no arg2
 \\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}]
+\\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}}%
@@ -3758,7 +3758,7 @@ d--eftypeop2
 \\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}]
+\\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}}%
@@ -3771,7 +3771,7 @@ d--eftypeop no arg2
 \\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}]
+\\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}}%
@@ -3784,7 +3784,7 @@ d--eftypecv2
 \\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}]
+\\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}}%
@@ -3797,7 +3797,7 @@ d--eftypecv with arguments2
 \\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
 \\rightskip=5em plus 1 fill
 \\hangindent=2em
-\\noindent\\texttt{arg2}& [fun2]
+\\texttt{arg2}& [fun2]
 \\end{tabularx}
 
 \\index[fn]{arg2@\\texttt{arg2}}%
diff --git a/tp/t/results/def/omit_def_space.pl 
b/tp/t/results/def/omit_def_space.pl
index e50706f5cb..0abea5b60b 100644
--- a/tp/t/results/def/omit_def_space.pl
+++ b/tp/t/results/def/omit_def_space.pl
@@ -651,7 +651,7 @@ $result_converted{'latex'}->{'omit_def_space'} = 
'\\label{anchor:Top}%
 \\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
 \\rightskip=5em plus 1 fill
 \\hangindent=2em
-\\noindent\\texttt{function\\EmbracOn{}\\textnormal{\\textsl{(arg1, 
arg2)}}\\EmbracOff{}}& [Function]
+\\texttt{function\\EmbracOn{}\\textnormal{\\textsl{(arg1, 
arg2)}}\\EmbracOff{}}& [Function]
 \\end{tabularx}
 
 \\index[fn]{function@\\texttt{function}}%
@@ -659,7 +659,7 @@ $result_converted{'latex'}->{'omit_def_space'} = 
'\\label{anchor:Top}%
 \\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
 \\rightskip=5em plus 1 fill
 \\hangindent=2em
-\\noindent\\texttt{another\\EmbracOn{}\\textnormal{\\textsl{(aarg)}}\\EmbracOff{}}&
 [Function]
+\\texttt{another\\EmbracOn{}\\textnormal{\\textsl{(aarg)}}\\EmbracOff{}}& 
[Function]
 \\end{tabularx}
 
 \\index[fn]{another@\\texttt{another}}%
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 a6576c85b7..1e8d5c09d1 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
@@ -90,7 +90,7 @@ In japanese. See 
\hyperref[anchor:chapter-ja]{\chaptername~\ref*{anchor:chapter-
 \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}]
+\texttt{BBB \EmbracOn{}\textnormal{\textsl{CCC}}\EmbracOff{}}& [Instance 
Variable of \texttt{AAA}]
 \end{tabularx}
 
 \index[vr]{BBB of AAA@\texttt{BBB\ of AAA}}%
@@ -104,7 +104,7 @@ In english. See 
\hyperref[anchor:chapter-ja]{\chaptername~\ref*{anchor:chapter-j
 \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}]
+\texttt{BBB \EmbracOn{}\textnormal{\textsl{CCC}}\EmbracOff{}}& [Instance 
Variable of \texttt{AAA}]
 \end{tabularx}
 
 \index[vr]{BBB of AAA@\texttt{BBB\ of AAA}}%
@@ -117,7 +117,7 @@ In english. See 
\hyperref[anchor:chapter-ja]{\chaptername~\ref*{anchor:chapter-j
 \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}]
+\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/t/results/latex_tests/brace_in_index.pl 
b/tp/t/results/latex_tests/brace_in_index.pl
index ded53acee2..1b4df58408 100644
--- a/tp/t/results/latex_tests/brace_in_index.pl
+++ b/tp/t/results/latex_tests/brace_in_index.pl
@@ -690,7 +690,7 @@ $$
 \\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
 \\rightskip=5em plus 1 fill
 \\hangindent=2em
-\\noindent\\texttt{A\\{A 
\\EmbracOn{}\\textnormal{\\textsl{(BBB)}}\\EmbracOff{}}& [Function]
+\\texttt{A\\{A \\EmbracOn{}\\textnormal{\\textsl{(BBB)}}\\EmbracOff{}}& 
[Function]
 \\end{tabularx}
 
 \\index[fn]{AA@\\texttt{A\\textbraceleft{}A}}%
@@ -791,7 +791,7 @@ $$
 \\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
 \\rightskip=5em plus 1 fill
 \\hangindent=2em
-\\noindent\\texttt{A\\{A 
\\EmbracOn{}\\textnormal{\\textsl{(BBB)}}\\EmbracOff{}}& [Function]
+\\texttt{A\\{A \\EmbracOn{}\\textnormal{\\textsl{(BBB)}}\\EmbracOff{}}& 
[Function]
 \\end{tabularx}
 
 \\index[fn]{AA@\\texttt{A\\textbraceleft{}A}}%
diff --git a/tp/t/results/preformatted/def_in_example.pl 
b/tp/t/results/preformatted/def_in_example.pl
index 60efd3d00a..9a5489b634 100644
--- a/tp/t/results/preformatted/def_in_example.pl
+++ b/tp/t/results/preformatted/def_in_example.pl
@@ -321,7 +321,7 @@ $result_converted{'latex'}->{'def_in_example'} = '
 \\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
 \\rightskip=5em plus 1 fill
 \\hangindent=2em
-\\noindent\\texttt{name \\EmbracOn{}\\textnormal{\\textsl{arg}}\\EmbracOff{}}& 
[Function]
+\\texttt{name \\EmbracOn{}\\textnormal{\\textsl{arg}}\\EmbracOff{}}& [Function]
 \\end{tabularx}
 
 \\index[fn]{name@\\texttt{name}}%
diff --git a/tp/tests/layout/res_parser/formatting_latex/formatting.tex 
b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
index 3f3b86c158..241a132d80 100644
--- a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
+++ b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
@@ -757,7 +757,7 @@ s--mallformat
 \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]
+\texttt{d{-}{-}effn\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory]
 \end{tabularx}
 
 \index[fn]{d--effn\_name@\texttt{d{-}{-}effn\_name}}%
@@ -770,7 +770,7 @@ d--effn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{de{-}{-}ffn\_name \EmbracOn{}\textnormal{\textsl{ar--guments  
  more args   even more so}}\EmbracOff{}}& [cate--gory]
+\texttt{de{-}{-}ffn\_name \EmbracOn{}\textnormal{\textsl{ar--guments    more 
args   even more so}}\EmbracOff{}}& [cate--gory]
 \end{tabularx}
 
 \index[fn]{de--ffn\_name@\texttt{de{-}{-}ffn\_name}}%
@@ -783,7 +783,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{\GNUTexinfocommandstyletextvar{i} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fset]
+\texttt{\GNUTexinfocommandstyletextvar{i} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fset]
 \end{tabularx}
 
 \index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
@@ -792,7 +792,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{truc \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [cmde]
+\texttt{truc \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [cmde]
 \end{tabularx}
 
 \index[fn]{truc@\texttt{truc}}%
@@ -800,7 +800,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{log trap \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& 
[Command]
+\texttt{log trap \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [Command]
 \end{tabularx}
 
 \index[fn]{log trap@\texttt{log trap}}%
@@ -808,7 +808,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{log trap1 \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& 
[Command]
+\texttt{log trap1 \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [Command]
 \end{tabularx}
 
 \index[fn]{log trap1@\texttt{log trap1}}%
@@ -816,7 +816,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{log trap2 \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& 
[Command]
+\texttt{log trap2 \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [Command]
 \end{tabularx}
 
 \index[fn]{log trap2@\texttt{log trap2}}%
@@ -824,7 +824,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{\textbf{id ule} 
\EmbracOn{}\textnormal{\textsl{truc}}\EmbracOff{}}& [cmde]
+\texttt{\textbf{id ule} \EmbracOn{}\textnormal{\textsl{truc}}\EmbracOff{}}& 
[cmde]
 \end{tabularx}
 
 \index[fn]{id ule@\texttt{\textbf{id ule}}}%
@@ -832,7 +832,7 @@ def--fn
 \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]
+\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}}}%
@@ -840,14 +840,14 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& []
+\texttt{}& []
 \end{tabularx}
 
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{machin}& []
+\texttt{machin}& []
 \end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
@@ -855,7 +855,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{bidule machin}& []
+\texttt{bidule machin}& []
 \end{tabularx}
 
 \index[fn]{bidule machin@\texttt{bidule machin}}%
@@ -863,7 +863,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{machin}& [truc]
+\texttt{machin}& [truc]
 \end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
@@ -871,14 +871,14 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& [truc]
+\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]
+\texttt{followed \EmbracOn{}\textnormal{\textsl{by a comment}}\EmbracOff{}}& 
[truc]
 \end{tabularx}
 
 \index[fn]{followed@\texttt{followed}}%
@@ -886,14 +886,14 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& []
+\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 \textbf{f g} h 
i}}\EmbracOff{}}& [truc]
+\texttt{a \EmbracOn{}\textnormal{\textsl{b c d e \textbf{f g} h 
i}}\EmbracOff{}}& [truc]
 \end{tabularx}
 
 \index[fn]{a@\texttt{a}}%
@@ -901,7 +901,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{deffnx \EmbracOn{}\textnormal{\textsl{before end 
deffn}}\EmbracOff{}}& [truc]
+\texttt{deffnx \EmbracOn{}\textnormal{\textsl{before end deffn}}\EmbracOff{}}& 
[truc]
 \end{tabularx}
 
 \index[fn]{deffnx@\texttt{deffnx}}%
@@ -911,7 +911,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{deffn}& [empty]
+\texttt{deffn}& [empty]
 \end{tabularx}
 
 \index[fn]{deffn@\texttt{deffn}}%
@@ -920,7 +920,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{deffn \EmbracOn{}\textnormal{\textsl{with 
deffnx}}\EmbracOff{}}& [empty]
+\texttt{deffn \EmbracOn{}\textnormal{\textsl{with deffnx}}\EmbracOff{}}& 
[empty]
 \end{tabularx}
 
 \index[fn]{deffn@\texttt{deffn}}%
@@ -928,7 +928,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{deffnx}& [empty]
+\texttt{deffnx}& [empty]
 \end{tabularx}
 
 \index[fn]{deffnx@\texttt{deffnx}}%
@@ -937,7 +937,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{\GNUTexinfocommandstyletextvar{i} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fset]
+\texttt{\GNUTexinfocommandstyletextvar{i} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fset]
 \end{tabularx}
 
 \index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
@@ -945,7 +945,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{truc \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [cmde]
+\texttt{truc \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [cmde]
 \end{tabularx}
 
 \index[fn]{truc@\texttt{truc}}%
@@ -959,7 +959,7 @@ text in def item for second def item
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efvr\_name}& [c--ategory]
+\texttt{d{-}{-}efvr\_name}& [c--ategory]
 \end{tabularx}
 
 \index[cp]{d--efvr\_name@\texttt{d{-}{-}efvr\_name}}%
@@ -972,7 +972,7 @@ d--efvr
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{n{-}{-}ame 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory]
+\texttt{n{-}{-}ame 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory]
 \end{tabularx}
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
@@ -985,7 +985,7 @@ d--effn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{n{-}{-}ame}& [c--ategory]
+\texttt{n{-}{-}ame}& [c--ategory]
 \end{tabularx}
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
@@ -998,7 +998,7 @@ d--effn no arg
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name a{-}{-}rguments...}& 
[c--ategory]
+\texttt{t{-}{-}ype d{-}{-}eftypefn\_name a{-}{-}rguments...}& [c--ategory]
 \end{tabularx}
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
@@ -1011,7 +1011,7 @@ d--eftypefn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name}& [c--ategory]
+\texttt{t{-}{-}ype d{-}{-}eftypefn\_name}& [c--ategory]
 \end{tabularx}
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
@@ -1024,7 +1024,7 @@ d--eftypefn no arg
 \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}]
+\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}}%
@@ -1037,7 +1037,7 @@ d--eftypeop
 \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}]
+\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}}%
@@ -1050,7 +1050,7 @@ d--eftypeop no arg
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypevr\_name}& [c--ategory]
+\texttt{t{-}{-}ype d{-}{-}eftypevr\_name}& [c--ategory]
 \end{tabularx}
 
 \index[cp]{d--eftypevr\_name@\texttt{d{-}{-}eftypevr\_name}}%
@@ -1063,7 +1063,7 @@ d--eftypevr
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efcv\_name}& [c--ategory of \texttt{c{-}{-}lass}]
+\texttt{d{-}{-}efcv\_name}& [c--ategory of \texttt{c{-}{-}lass}]
 \end{tabularx}
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
@@ -1076,7 +1076,7 @@ d--efcv
 \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}]
+\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}}%
@@ -1089,7 +1089,7 @@ d--efcv with arguments
 \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}]
+\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}}%
@@ -1102,7 +1102,7 @@ d--eftypecv
 \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}]
+\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}}%
@@ -1115,7 +1115,7 @@ d--eftypecv with arguments
 \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}]
+\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}}%
@@ -1128,7 +1128,7 @@ d--efop
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efop\_name}& [c--ategory on \texttt{c{-}{-}lass}]
+\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}}%
@@ -1141,7 +1141,7 @@ d--efop no arg
 \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]
+\texttt{d{-}{-}eftp\_name 
\EmbracOn{}\textnormal{\textsl{a--ttributes...}}\EmbracOff{}}& [c--ategory]
 \end{tabularx}
 
 \index[tp]{d--eftp\_name@\texttt{d{-}{-}eftp\_name}}%
@@ -1154,7 +1154,7 @@ d--eftp
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efun\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Function]
+\texttt{d{-}{-}efun\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Function]
 \end{tabularx}
 
 \index[fn]{d--efun\_name@\texttt{d{-}{-}efun\_name}}%
@@ -1167,7 +1167,7 @@ d--efun
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efmac\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Macro]
+\texttt{d{-}{-}efmac\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Macro]
 \end{tabularx}
 
 \index[fn]{d--efmac\_name@\texttt{d{-}{-}efmac\_name}}%
@@ -1180,7 +1180,7 @@ d--efmac
 \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]
+\texttt{d{-}{-}efspec\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{d--efspec\_name@\texttt{d{-}{-}efspec\_name}}%
@@ -1193,7 +1193,7 @@ d--efspec
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efvar\_name}& [Variable]
+\texttt{d{-}{-}efvar\_name}& [Variable]
 \end{tabularx}
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
@@ -1206,7 +1206,7 @@ d--efvar
 \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]
+\texttt{d{-}{-}efvar\_name \EmbracOn{}\textnormal{\textsl{arg--var 
arg--var1}}\EmbracOff{}}& [Variable]
 \end{tabularx}
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
@@ -1219,7 +1219,7 @@ d--efvar with args
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efopt\_name}& [User Option]
+\texttt{d{-}{-}efopt\_name}& [User Option]
 \end{tabularx}
 
 \index[cp]{d--efopt\_name@\texttt{d{-}{-}efopt\_name}}%
@@ -1232,7 +1232,7 @@ d--efopt
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypefun\_name a{-}{-}rguments...}& 
[Function]
+\texttt{t{-}{-}ype d{-}{-}eftypefun\_name a{-}{-}rguments...}& [Function]
 \end{tabularx}
 
 \index[fn]{d--eftypefun\_name@\texttt{d{-}{-}eftypefun\_name}}%
@@ -1245,7 +1245,7 @@ d--eftypefun
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypevar\_name}& [Variable]
+\texttt{t{-}{-}ype d{-}{-}eftypevar\_name}& [Variable]
 \end{tabularx}
 
 \index[cp]{d--eftypevar\_name@\texttt{d{-}{-}eftypevar\_name}}%
@@ -1258,7 +1258,7 @@ d--eftypevar
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efivar\_name}& [Instance Variable of 
\texttt{c{-}{-}lass}]
+\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}}%
@@ -1271,7 +1271,7 @@ d--efivar
 \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}]
+\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}}%
@@ -1284,7 +1284,7 @@ d--eftypeivar
 \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}]
+\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}}%
@@ -1297,7 +1297,7 @@ d--efmethod
 \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}]
+\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}}%
@@ -1311,7 +1311,7 @@ d--eftypemethod
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{data-type2}& [Function]\\
+\texttt{data-type2}& [Function]\\
 \texttt{name2 arguments2...}\end{tabularx}
 
 \index[fn]{name2@\texttt{name2}}%
@@ -1324,7 +1324,7 @@ aaa2
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype2}& [c--ategory2]\\
+\texttt{t{-}{-}ype2}& [c--ategory2]\\
 \texttt{d{-}{-}eftypefn\_name2}\end{tabularx}
 
 \index[fn]{d--eftypefn\_name2@\texttt{d{-}{-}eftypefn\_name2}}%
@@ -1337,7 +1337,7 @@ d--eftypefn no arg2
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype2}& [c--ategory2 on \texttt{c{-}{-}lass2}]\\
+\texttt{t{-}{-}ype2}& [c--ategory2 on \texttt{c{-}{-}lass2}]\\
 \texttt{d{-}{-}eftypeop\_name2 a{-}{-}rguments2...}\end{tabularx}
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2\ on 
c{-}{-}lass2}}%
@@ -1350,7 +1350,7 @@ d--eftypeop2
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype2}& [c--ategory2 on \texttt{c{-}{-}lass2}]\\
+\texttt{t{-}{-}ype2}& [c--ategory2 on \texttt{c{-}{-}lass2}]\\
 \texttt{d{-}{-}eftypeop\_name2}\end{tabularx}
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2\ on 
c{-}{-}lass2}}%
@@ -1363,7 +1363,7 @@ d--eftypeop no arg2
 \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}]
+\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}}%
@@ -1376,7 +1376,7 @@ d--eftypecv2
 \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}]
+\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}}%
@@ -1389,7 +1389,7 @@ d--eftypecv with arguments2
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{arg2}& [fun2]
+\texttt{arg2}& [fun2]
 \end{tabularx}
 
 \index[fn]{arg2@\texttt{arg2}}%
@@ -1684,14 +1684,14 @@ l--ine
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& [fun]
+\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]
+\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and}}\EmbracOff{}}& 
[truc]
 \end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
@@ -1699,7 +1699,7 @@ l--ine
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and  
after}}\EmbracOff{}}& [truc]
+\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and  
after}}\EmbracOff{}}& [truc]
 \end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
@@ -1707,7 +1707,7 @@ l--ine
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and 
}}\EmbracOff{}}& [truc]
+\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and 
}}\EmbracOff{}}& [truc]
 \end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
@@ -1715,7 +1715,7 @@ l--ine
 \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]
+\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and and 
after}}\EmbracOff{}}& [truc]
 \end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
@@ -1723,7 +1723,7 @@ l--ine
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{followed \EmbracOn{}\textnormal{\textsl{by a 
comment}}\EmbracOff{}}& [truc]
+\texttt{followed \EmbracOn{}\textnormal{\textsl{by a comment}}\EmbracOff{}}& 
[truc]
 \end{tabularx}
 
 \index[fn]{followed@\texttt{followed}}%
@@ -1732,7 +1732,7 @@ Various deff lines
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{after \EmbracOn{}\textnormal{\textsl{a deff 
item}}\EmbracOff{}}& [truc]
+\texttt{after \EmbracOn{}\textnormal{\textsl{a deff item}}\EmbracOff{}}& [truc]
 \end{tabularx}
 
 \index[fn]{after@\texttt{after}}%
@@ -1741,7 +1741,7 @@ Various deff lines
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{\GNUTexinfocommandstyletextvar{invalid} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fsetinv]
+\texttt{\GNUTexinfocommandstyletextvar{invalid} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fsetinv]
 \end{tabularx}
 
 \index[fn]{invalid@\texttt{\GNUTexinfocommandstyletextvar{invalid}}}%
@@ -1749,7 +1749,7 @@ Various deff lines
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& [\textbf{id `\texttt{i}' ule}]
+\texttt{}& [\textbf{id `\texttt{i}' ule}]
 \end{tabularx}
 
 
@@ -1757,21 +1757,21 @@ Various deff lines
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& [aaa]
+\texttt{}& [aaa]
 \end{tabularx}
 
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& []
+\texttt{}& []
 \end{tabularx}
 
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& [truc]
+\texttt{}& [truc]
 \end{tabularx}
 
 
@@ -2454,7 +2454,7 @@ s--mallformat
 \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]
+\texttt{d{-}{-}effn\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory]
 \end{tabularx}
 
 \index[fn]{d--effn\_name@\texttt{d{-}{-}effn\_name}}%
@@ -2467,7 +2467,7 @@ d--effn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{de{-}{-}ffn\_name \EmbracOn{}\textnormal{\textsl{ar--guments  
  more args   even more so}}\EmbracOff{}}& [cate--gory]
+\texttt{de{-}{-}ffn\_name \EmbracOn{}\textnormal{\textsl{ar--guments    more 
args   even more so}}\EmbracOff{}}& [cate--gory]
 \end{tabularx}
 
 \index[fn]{de--ffn\_name@\texttt{de{-}{-}ffn\_name}}%
@@ -2480,7 +2480,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{\GNUTexinfocommandstyletextvar{i} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fset]
+\texttt{\GNUTexinfocommandstyletextvar{i} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fset]
 \end{tabularx}
 
 \index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
@@ -2489,7 +2489,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{truc \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [cmde]
+\texttt{truc \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [cmde]
 \end{tabularx}
 
 \index[fn]{truc@\texttt{truc}}%
@@ -2497,7 +2497,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{log trap \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& 
[Command]
+\texttt{log trap \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [Command]
 \end{tabularx}
 
 \index[fn]{log trap@\texttt{log trap}}%
@@ -2505,7 +2505,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{log trap1 \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& 
[Command]
+\texttt{log trap1 \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [Command]
 \end{tabularx}
 
 \index[fn]{log trap1@\texttt{log trap1}}%
@@ -2513,7 +2513,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{log trap2 \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& 
[Command]
+\texttt{log trap2 \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [Command]
 \end{tabularx}
 
 \index[fn]{log trap2@\texttt{log trap2}}%
@@ -2521,7 +2521,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{\textbf{id ule} 
\EmbracOn{}\textnormal{\textsl{truc}}\EmbracOff{}}& [cmde]
+\texttt{\textbf{id ule} \EmbracOn{}\textnormal{\textsl{truc}}\EmbracOff{}}& 
[cmde]
 \end{tabularx}
 
 \index[fn]{id ule@\texttt{\textbf{id ule}}}%
@@ -2529,7 +2529,7 @@ def--fn
 \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]
+\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}}}%
@@ -2537,14 +2537,14 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& []
+\texttt{}& []
 \end{tabularx}
 
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{machin}& []
+\texttt{machin}& []
 \end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
@@ -2552,7 +2552,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{bidule machin}& []
+\texttt{bidule machin}& []
 \end{tabularx}
 
 \index[fn]{bidule machin@\texttt{bidule machin}}%
@@ -2560,7 +2560,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{machin}& [truc]
+\texttt{machin}& [truc]
 \end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
@@ -2568,14 +2568,14 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& [truc]
+\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]
+\texttt{followed \EmbracOn{}\textnormal{\textsl{by a comment}}\EmbracOff{}}& 
[truc]
 \end{tabularx}
 
 \index[fn]{followed@\texttt{followed}}%
@@ -2583,14 +2583,14 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& []
+\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 \textbf{f g} h 
i}}\EmbracOff{}}& [truc]
+\texttt{a \EmbracOn{}\textnormal{\textsl{b c d e \textbf{f g} h 
i}}\EmbracOff{}}& [truc]
 \end{tabularx}
 
 \index[fn]{a@\texttt{a}}%
@@ -2598,7 +2598,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{deffnx \EmbracOn{}\textnormal{\textsl{before end 
deffn}}\EmbracOff{}}& [truc]
+\texttt{deffnx \EmbracOn{}\textnormal{\textsl{before end deffn}}\EmbracOff{}}& 
[truc]
 \end{tabularx}
 
 \index[fn]{deffnx@\texttt{deffnx}}%
@@ -2608,7 +2608,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{deffn}& [empty]
+\texttt{deffn}& [empty]
 \end{tabularx}
 
 \index[fn]{deffn@\texttt{deffn}}%
@@ -2617,7 +2617,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{deffn \EmbracOn{}\textnormal{\textsl{with 
deffnx}}\EmbracOff{}}& [empty]
+\texttt{deffn \EmbracOn{}\textnormal{\textsl{with deffnx}}\EmbracOff{}}& 
[empty]
 \end{tabularx}
 
 \index[fn]{deffn@\texttt{deffn}}%
@@ -2625,7 +2625,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{deffnx}& [empty]
+\texttt{deffnx}& [empty]
 \end{tabularx}
 
 \index[fn]{deffnx@\texttt{deffnx}}%
@@ -2634,7 +2634,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{\GNUTexinfocommandstyletextvar{i} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fset]
+\texttt{\GNUTexinfocommandstyletextvar{i} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fset]
 \end{tabularx}
 
 \index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
@@ -2642,7 +2642,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{truc \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [cmde]
+\texttt{truc \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [cmde]
 \end{tabularx}
 
 \index[fn]{truc@\texttt{truc}}%
@@ -2656,7 +2656,7 @@ text in def item for second def item
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efvr\_name}& [c--ategory]
+\texttt{d{-}{-}efvr\_name}& [c--ategory]
 \end{tabularx}
 
 \index[cp]{d--efvr\_name@\texttt{d{-}{-}efvr\_name}}%
@@ -2669,7 +2669,7 @@ d--efvr
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{n{-}{-}ame 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory]
+\texttt{n{-}{-}ame 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory]
 \end{tabularx}
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
@@ -2682,7 +2682,7 @@ d--effn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{n{-}{-}ame}& [c--ategory]
+\texttt{n{-}{-}ame}& [c--ategory]
 \end{tabularx}
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
@@ -2695,7 +2695,7 @@ d--effn no arg
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name a{-}{-}rguments...}& 
[c--ategory]
+\texttt{t{-}{-}ype d{-}{-}eftypefn\_name a{-}{-}rguments...}& [c--ategory]
 \end{tabularx}
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
@@ -2708,7 +2708,7 @@ d--eftypefn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name}& [c--ategory]
+\texttt{t{-}{-}ype d{-}{-}eftypefn\_name}& [c--ategory]
 \end{tabularx}
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
@@ -2721,7 +2721,7 @@ d--eftypefn no arg
 \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}]
+\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}}%
@@ -2734,7 +2734,7 @@ d--eftypeop
 \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}]
+\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}}%
@@ -2747,7 +2747,7 @@ d--eftypeop no arg
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypevr\_name}& [c--ategory]
+\texttt{t{-}{-}ype d{-}{-}eftypevr\_name}& [c--ategory]
 \end{tabularx}
 
 \index[cp]{d--eftypevr\_name@\texttt{d{-}{-}eftypevr\_name}}%
@@ -2760,7 +2760,7 @@ d--eftypevr
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efcv\_name}& [c--ategory of \texttt{c{-}{-}lass}]
+\texttt{d{-}{-}efcv\_name}& [c--ategory of \texttt{c{-}{-}lass}]
 \end{tabularx}
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
@@ -2773,7 +2773,7 @@ d--efcv
 \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}]
+\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}}%
@@ -2786,7 +2786,7 @@ d--efcv with arguments
 \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}]
+\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}}%
@@ -2799,7 +2799,7 @@ d--eftypecv
 \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}]
+\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}}%
@@ -2812,7 +2812,7 @@ d--eftypecv with arguments
 \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}]
+\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}}%
@@ -2825,7 +2825,7 @@ d--efop
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efop\_name}& [c--ategory on \texttt{c{-}{-}lass}]
+\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}}%
@@ -2838,7 +2838,7 @@ d--efop no arg
 \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]
+\texttt{d{-}{-}eftp\_name 
\EmbracOn{}\textnormal{\textsl{a--ttributes...}}\EmbracOff{}}& [c--ategory]
 \end{tabularx}
 
 \index[tp]{d--eftp\_name@\texttt{d{-}{-}eftp\_name}}%
@@ -2851,7 +2851,7 @@ d--eftp
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efun\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Function]
+\texttt{d{-}{-}efun\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Function]
 \end{tabularx}
 
 \index[fn]{d--efun\_name@\texttt{d{-}{-}efun\_name}}%
@@ -2864,7 +2864,7 @@ d--efun
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efmac\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Macro]
+\texttt{d{-}{-}efmac\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Macro]
 \end{tabularx}
 
 \index[fn]{d--efmac\_name@\texttt{d{-}{-}efmac\_name}}%
@@ -2877,7 +2877,7 @@ d--efmac
 \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]
+\texttt{d{-}{-}efspec\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{d--efspec\_name@\texttt{d{-}{-}efspec\_name}}%
@@ -2890,7 +2890,7 @@ d--efspec
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efvar\_name}& [Variable]
+\texttt{d{-}{-}efvar\_name}& [Variable]
 \end{tabularx}
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
@@ -2903,7 +2903,7 @@ d--efvar
 \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]
+\texttt{d{-}{-}efvar\_name \EmbracOn{}\textnormal{\textsl{arg--var 
arg--var1}}\EmbracOff{}}& [Variable]
 \end{tabularx}
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
@@ -2916,7 +2916,7 @@ d--efvar with args
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efopt\_name}& [User Option]
+\texttt{d{-}{-}efopt\_name}& [User Option]
 \end{tabularx}
 
 \index[cp]{d--efopt\_name@\texttt{d{-}{-}efopt\_name}}%
@@ -2929,7 +2929,7 @@ d--efopt
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypefun\_name a{-}{-}rguments...}& 
[Function]
+\texttt{t{-}{-}ype d{-}{-}eftypefun\_name a{-}{-}rguments...}& [Function]
 \end{tabularx}
 
 \index[fn]{d--eftypefun\_name@\texttt{d{-}{-}eftypefun\_name}}%
@@ -2942,7 +2942,7 @@ d--eftypefun
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypevar\_name}& [Variable]
+\texttt{t{-}{-}ype d{-}{-}eftypevar\_name}& [Variable]
 \end{tabularx}
 
 \index[cp]{d--eftypevar\_name@\texttt{d{-}{-}eftypevar\_name}}%
@@ -2955,7 +2955,7 @@ d--eftypevar
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efivar\_name}& [Instance Variable of 
\texttt{c{-}{-}lass}]
+\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}}%
@@ -2968,7 +2968,7 @@ d--efivar
 \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}]
+\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}}%
@@ -2981,7 +2981,7 @@ d--eftypeivar
 \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}]
+\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}}%
@@ -2994,7 +2994,7 @@ d--efmethod
 \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}]
+\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}}%
@@ -3008,7 +3008,7 @@ d--eftypemethod
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{data-type2}& [Function]\\
+\texttt{data-type2}& [Function]\\
 \texttt{name2 arguments2...}\end{tabularx}
 
 \index[fn]{name2@\texttt{name2}}%
@@ -3021,7 +3021,7 @@ aaa2
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype2}& [c--ategory2]\\
+\texttt{t{-}{-}ype2}& [c--ategory2]\\
 \texttt{d{-}{-}eftypefn\_name2}\end{tabularx}
 
 \index[fn]{d--eftypefn\_name2@\texttt{d{-}{-}eftypefn\_name2}}%
@@ -3034,7 +3034,7 @@ d--eftypefn no arg2
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype2}& [c--ategory2 on \texttt{c{-}{-}lass2}]\\
+\texttt{t{-}{-}ype2}& [c--ategory2 on \texttt{c{-}{-}lass2}]\\
 \texttt{d{-}{-}eftypeop\_name2 a{-}{-}rguments2...}\end{tabularx}
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2\ on 
c{-}{-}lass2}}%
@@ -3047,7 +3047,7 @@ d--eftypeop2
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype2}& [c--ategory2 on \texttt{c{-}{-}lass2}]\\
+\texttt{t{-}{-}ype2}& [c--ategory2 on \texttt{c{-}{-}lass2}]\\
 \texttt{d{-}{-}eftypeop\_name2}\end{tabularx}
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2\ on 
c{-}{-}lass2}}%
@@ -3060,7 +3060,7 @@ d--eftypeop no arg2
 \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}]
+\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}}%
@@ -3073,7 +3073,7 @@ d--eftypecv2
 \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}]
+\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}}%
@@ -3086,7 +3086,7 @@ d--eftypecv with arguments2
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{arg2}& [fun2]
+\texttt{arg2}& [fun2]
 \end{tabularx}
 
 \index[fn]{arg2@\texttt{arg2}}%
@@ -3381,14 +3381,14 @@ l--ine
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& [fun]
+\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]
+\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and}}\EmbracOff{}}& 
[truc]
 \end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
@@ -3396,7 +3396,7 @@ l--ine
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and  
after}}\EmbracOff{}}& [truc]
+\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and  
after}}\EmbracOff{}}& [truc]
 \end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
@@ -3404,7 +3404,7 @@ l--ine
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and 
}}\EmbracOff{}}& [truc]
+\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and 
}}\EmbracOff{}}& [truc]
 \end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
@@ -3412,7 +3412,7 @@ l--ine
 \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]
+\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and and 
after}}\EmbracOff{}}& [truc]
 \end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
@@ -3420,7 +3420,7 @@ l--ine
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{followed \EmbracOn{}\textnormal{\textsl{by a 
comment}}\EmbracOff{}}& [truc]
+\texttt{followed \EmbracOn{}\textnormal{\textsl{by a comment}}\EmbracOff{}}& 
[truc]
 \end{tabularx}
 
 \index[fn]{followed@\texttt{followed}}%
@@ -3429,7 +3429,7 @@ Various deff lines
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{after \EmbracOn{}\textnormal{\textsl{a deff 
item}}\EmbracOff{}}& [truc]
+\texttt{after \EmbracOn{}\textnormal{\textsl{a deff item}}\EmbracOff{}}& [truc]
 \end{tabularx}
 
 \index[fn]{after@\texttt{after}}%
@@ -3438,7 +3438,7 @@ Various deff lines
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{\GNUTexinfocommandstyletextvar{invalid} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fsetinv]
+\texttt{\GNUTexinfocommandstyletextvar{invalid} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fsetinv]
 \end{tabularx}
 
 \index[fn]{invalid@\texttt{\GNUTexinfocommandstyletextvar{invalid}}}%
@@ -3446,7 +3446,7 @@ Various deff lines
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& [\textbf{id `\texttt{i}' ule}]
+\texttt{}& [\textbf{id `\texttt{i}' ule}]
 \end{tabularx}
 
 
@@ -3454,21 +3454,21 @@ Various deff lines
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& [aaa]
+\texttt{}& [aaa]
 \end{tabularx}
 
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& []
+\texttt{}& []
 \end{tabularx}
 
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& [truc]
+\texttt{}& [truc]
 \end{tabularx}
 
 
@@ -4172,7 +4172,7 @@ s--mallformat
 \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]
+\texttt{d{-}{-}effn\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory]
 \end{tabularx}
 
 \index[fn]{d--effn\_name@\texttt{d{-}{-}effn\_name}}%
@@ -4185,7 +4185,7 @@ d--effn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{de{-}{-}ffn\_name \EmbracOn{}\textnormal{\textsl{ar--guments  
  more args   even more so}}\EmbracOff{}}& [cate--gory]
+\texttt{de{-}{-}ffn\_name \EmbracOn{}\textnormal{\textsl{ar--guments    more 
args   even more so}}\EmbracOff{}}& [cate--gory]
 \end{tabularx}
 
 \index[fn]{de--ffn\_name@\texttt{de{-}{-}ffn\_name}}%
@@ -4198,7 +4198,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{\GNUTexinfocommandstyletextvar{i} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fset]
+\texttt{\GNUTexinfocommandstyletextvar{i} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fset]
 \end{tabularx}
 
 \index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
@@ -4207,7 +4207,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{truc \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [cmde]
+\texttt{truc \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [cmde]
 \end{tabularx}
 
 \index[fn]{truc@\texttt{truc}}%
@@ -4215,7 +4215,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{log trap \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& 
[Command]
+\texttt{log trap \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [Command]
 \end{tabularx}
 
 \index[fn]{log trap@\texttt{log trap}}%
@@ -4223,7 +4223,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{log trap1 \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& 
[Command]
+\texttt{log trap1 \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [Command]
 \end{tabularx}
 
 \index[fn]{log trap1@\texttt{log trap1}}%
@@ -4231,7 +4231,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{log trap2 \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& 
[Command]
+\texttt{log trap2 \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [Command]
 \end{tabularx}
 
 \index[fn]{log trap2@\texttt{log trap2}}%
@@ -4239,7 +4239,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{\textbf{id ule} 
\EmbracOn{}\textnormal{\textsl{truc}}\EmbracOff{}}& [cmde]
+\texttt{\textbf{id ule} \EmbracOn{}\textnormal{\textsl{truc}}\EmbracOff{}}& 
[cmde]
 \end{tabularx}
 
 \index[fn]{id ule@\texttt{\textbf{id ule}}}%
@@ -4247,7 +4247,7 @@ def--fn
 \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]
+\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}}}%
@@ -4255,14 +4255,14 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& []
+\texttt{}& []
 \end{tabularx}
 
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{machin}& []
+\texttt{machin}& []
 \end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
@@ -4270,7 +4270,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{bidule machin}& []
+\texttt{bidule machin}& []
 \end{tabularx}
 
 \index[fn]{bidule machin@\texttt{bidule machin}}%
@@ -4278,7 +4278,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{machin}& [truc]
+\texttt{machin}& [truc]
 \end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
@@ -4286,14 +4286,14 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& [truc]
+\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]
+\texttt{followed \EmbracOn{}\textnormal{\textsl{by a comment}}\EmbracOff{}}& 
[truc]
 \end{tabularx}
 
 \index[fn]{followed@\texttt{followed}}%
@@ -4301,14 +4301,14 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& []
+\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 \textbf{f g} h 
i}}\EmbracOff{}}& [truc]
+\texttt{a \EmbracOn{}\textnormal{\textsl{b c d e \textbf{f g} h 
i}}\EmbracOff{}}& [truc]
 \end{tabularx}
 
 \index[fn]{a@\texttt{a}}%
@@ -4316,7 +4316,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{deffnx \EmbracOn{}\textnormal{\textsl{before end 
deffn}}\EmbracOff{}}& [truc]
+\texttt{deffnx \EmbracOn{}\textnormal{\textsl{before end deffn}}\EmbracOff{}}& 
[truc]
 \end{tabularx}
 
 \index[fn]{deffnx@\texttt{deffnx}}%
@@ -4326,7 +4326,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{deffn}& [empty]
+\texttt{deffn}& [empty]
 \end{tabularx}
 
 \index[fn]{deffn@\texttt{deffn}}%
@@ -4335,7 +4335,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{deffn \EmbracOn{}\textnormal{\textsl{with 
deffnx}}\EmbracOff{}}& [empty]
+\texttt{deffn \EmbracOn{}\textnormal{\textsl{with deffnx}}\EmbracOff{}}& 
[empty]
 \end{tabularx}
 
 \index[fn]{deffn@\texttt{deffn}}%
@@ -4343,7 +4343,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{deffnx}& [empty]
+\texttt{deffnx}& [empty]
 \end{tabularx}
 
 \index[fn]{deffnx@\texttt{deffnx}}%
@@ -4352,7 +4352,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{\GNUTexinfocommandstyletextvar{i} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fset]
+\texttt{\GNUTexinfocommandstyletextvar{i} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fset]
 \end{tabularx}
 
 \index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
@@ -4360,7 +4360,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{truc \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [cmde]
+\texttt{truc \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [cmde]
 \end{tabularx}
 
 \index[fn]{truc@\texttt{truc}}%
@@ -4374,7 +4374,7 @@ text in def item for second def item
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efvr\_name}& [c--ategory]
+\texttt{d{-}{-}efvr\_name}& [c--ategory]
 \end{tabularx}
 
 \index[cp]{d--efvr\_name@\texttt{d{-}{-}efvr\_name}}%
@@ -4387,7 +4387,7 @@ d--efvr
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{n{-}{-}ame 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory]
+\texttt{n{-}{-}ame 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory]
 \end{tabularx}
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
@@ -4400,7 +4400,7 @@ d--effn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{n{-}{-}ame}& [c--ategory]
+\texttt{n{-}{-}ame}& [c--ategory]
 \end{tabularx}
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
@@ -4413,7 +4413,7 @@ d--effn no arg
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name a{-}{-}rguments...}& 
[c--ategory]
+\texttt{t{-}{-}ype d{-}{-}eftypefn\_name a{-}{-}rguments...}& [c--ategory]
 \end{tabularx}
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
@@ -4426,7 +4426,7 @@ d--eftypefn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name}& [c--ategory]
+\texttt{t{-}{-}ype d{-}{-}eftypefn\_name}& [c--ategory]
 \end{tabularx}
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
@@ -4439,7 +4439,7 @@ d--eftypefn no arg
 \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}]
+\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}}%
@@ -4452,7 +4452,7 @@ d--eftypeop
 \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}]
+\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}}%
@@ -4465,7 +4465,7 @@ d--eftypeop no arg
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypevr\_name}& [c--ategory]
+\texttt{t{-}{-}ype d{-}{-}eftypevr\_name}& [c--ategory]
 \end{tabularx}
 
 \index[cp]{d--eftypevr\_name@\texttt{d{-}{-}eftypevr\_name}}%
@@ -4478,7 +4478,7 @@ d--eftypevr
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efcv\_name}& [c--ategory of \texttt{c{-}{-}lass}]
+\texttt{d{-}{-}efcv\_name}& [c--ategory of \texttt{c{-}{-}lass}]
 \end{tabularx}
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
@@ -4491,7 +4491,7 @@ d--efcv
 \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}]
+\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}}%
@@ -4504,7 +4504,7 @@ d--efcv with arguments
 \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}]
+\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}}%
@@ -4517,7 +4517,7 @@ d--eftypecv
 \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}]
+\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}}%
@@ -4530,7 +4530,7 @@ d--eftypecv with arguments
 \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}]
+\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}}%
@@ -4543,7 +4543,7 @@ d--efop
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efop\_name}& [c--ategory on \texttt{c{-}{-}lass}]
+\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}}%
@@ -4556,7 +4556,7 @@ d--efop no arg
 \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]
+\texttt{d{-}{-}eftp\_name 
\EmbracOn{}\textnormal{\textsl{a--ttributes...}}\EmbracOff{}}& [c--ategory]
 \end{tabularx}
 
 \index[tp]{d--eftp\_name@\texttt{d{-}{-}eftp\_name}}%
@@ -4569,7 +4569,7 @@ d--eftp
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efun\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Function]
+\texttt{d{-}{-}efun\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Function]
 \end{tabularx}
 
 \index[fn]{d--efun\_name@\texttt{d{-}{-}efun\_name}}%
@@ -4582,7 +4582,7 @@ d--efun
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efmac\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Macro]
+\texttt{d{-}{-}efmac\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Macro]
 \end{tabularx}
 
 \index[fn]{d--efmac\_name@\texttt{d{-}{-}efmac\_name}}%
@@ -4595,7 +4595,7 @@ d--efmac
 \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]
+\texttt{d{-}{-}efspec\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{d--efspec\_name@\texttt{d{-}{-}efspec\_name}}%
@@ -4608,7 +4608,7 @@ d--efspec
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efvar\_name}& [Variable]
+\texttt{d{-}{-}efvar\_name}& [Variable]
 \end{tabularx}
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
@@ -4621,7 +4621,7 @@ d--efvar
 \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]
+\texttt{d{-}{-}efvar\_name \EmbracOn{}\textnormal{\textsl{arg--var 
arg--var1}}\EmbracOff{}}& [Variable]
 \end{tabularx}
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
@@ -4634,7 +4634,7 @@ d--efvar with args
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efopt\_name}& [User Option]
+\texttt{d{-}{-}efopt\_name}& [User Option]
 \end{tabularx}
 
 \index[cp]{d--efopt\_name@\texttt{d{-}{-}efopt\_name}}%
@@ -4647,7 +4647,7 @@ d--efopt
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypefun\_name a{-}{-}rguments...}& 
[Function]
+\texttt{t{-}{-}ype d{-}{-}eftypefun\_name a{-}{-}rguments...}& [Function]
 \end{tabularx}
 
 \index[fn]{d--eftypefun\_name@\texttt{d{-}{-}eftypefun\_name}}%
@@ -4660,7 +4660,7 @@ d--eftypefun
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypevar\_name}& [Variable]
+\texttt{t{-}{-}ype d{-}{-}eftypevar\_name}& [Variable]
 \end{tabularx}
 
 \index[cp]{d--eftypevar\_name@\texttt{d{-}{-}eftypevar\_name}}%
@@ -4673,7 +4673,7 @@ d--eftypevar
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efivar\_name}& [Instance Variable of 
\texttt{c{-}{-}lass}]
+\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}}%
@@ -4686,7 +4686,7 @@ d--efivar
 \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}]
+\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}}%
@@ -4699,7 +4699,7 @@ d--eftypeivar
 \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}]
+\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}}%
@@ -4712,7 +4712,7 @@ d--efmethod
 \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}]
+\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}}%
@@ -4726,7 +4726,7 @@ d--eftypemethod
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{data-type2}& [Function]\\
+\texttt{data-type2}& [Function]\\
 \texttt{name2 arguments2...}\end{tabularx}
 
 \index[fn]{name2@\texttt{name2}}%
@@ -4739,7 +4739,7 @@ aaa2
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype2}& [c--ategory2]\\
+\texttt{t{-}{-}ype2}& [c--ategory2]\\
 \texttt{d{-}{-}eftypefn\_name2}\end{tabularx}
 
 \index[fn]{d--eftypefn\_name2@\texttt{d{-}{-}eftypefn\_name2}}%
@@ -4752,7 +4752,7 @@ d--eftypefn no arg2
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype2}& [c--ategory2 on \texttt{c{-}{-}lass2}]\\
+\texttt{t{-}{-}ype2}& [c--ategory2 on \texttt{c{-}{-}lass2}]\\
 \texttt{d{-}{-}eftypeop\_name2 a{-}{-}rguments2...}\end{tabularx}
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2\ on 
c{-}{-}lass2}}%
@@ -4765,7 +4765,7 @@ d--eftypeop2
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype2}& [c--ategory2 on \texttt{c{-}{-}lass2}]\\
+\texttt{t{-}{-}ype2}& [c--ategory2 on \texttt{c{-}{-}lass2}]\\
 \texttt{d{-}{-}eftypeop\_name2}\end{tabularx}
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2\ on 
c{-}{-}lass2}}%
@@ -4778,7 +4778,7 @@ d--eftypeop no arg2
 \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}]
+\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}}%
@@ -4791,7 +4791,7 @@ d--eftypecv2
 \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}]
+\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}}%
@@ -4804,7 +4804,7 @@ d--eftypecv with arguments2
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{arg2}& [fun2]
+\texttt{arg2}& [fun2]
 \end{tabularx}
 
 \index[fn]{arg2@\texttt{arg2}}%
@@ -5099,14 +5099,14 @@ l--ine
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& [fun]
+\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]
+\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and}}\EmbracOff{}}& 
[truc]
 \end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
@@ -5114,7 +5114,7 @@ l--ine
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and  
after}}\EmbracOff{}}& [truc]
+\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and  
after}}\EmbracOff{}}& [truc]
 \end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
@@ -5122,7 +5122,7 @@ l--ine
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and 
}}\EmbracOff{}}& [truc]
+\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and 
}}\EmbracOff{}}& [truc]
 \end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
@@ -5130,7 +5130,7 @@ l--ine
 \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]
+\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and and 
after}}\EmbracOff{}}& [truc]
 \end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
@@ -5138,7 +5138,7 @@ l--ine
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{followed \EmbracOn{}\textnormal{\textsl{by a 
comment}}\EmbracOff{}}& [truc]
+\texttt{followed \EmbracOn{}\textnormal{\textsl{by a comment}}\EmbracOff{}}& 
[truc]
 \end{tabularx}
 
 \index[fn]{followed@\texttt{followed}}%
@@ -5147,7 +5147,7 @@ Various deff lines
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{after \EmbracOn{}\textnormal{\textsl{a deff 
item}}\EmbracOff{}}& [truc]
+\texttt{after \EmbracOn{}\textnormal{\textsl{a deff item}}\EmbracOff{}}& [truc]
 \end{tabularx}
 
 \index[fn]{after@\texttt{after}}%
@@ -5156,7 +5156,7 @@ Various deff lines
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{\GNUTexinfocommandstyletextvar{invalid} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fsetinv]
+\texttt{\GNUTexinfocommandstyletextvar{invalid} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fsetinv]
 \end{tabularx}
 
 \index[fn]{invalid@\texttt{\GNUTexinfocommandstyletextvar{invalid}}}%
@@ -5164,7 +5164,7 @@ Various deff lines
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& [\textbf{id `\texttt{i}' ule}]
+\texttt{}& [\textbf{id `\texttt{i}' ule}]
 \end{tabularx}
 
 
@@ -5172,21 +5172,21 @@ Various deff lines
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& [aaa]
+\texttt{}& [aaa]
 \end{tabularx}
 
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& []
+\texttt{}& []
 \end{tabularx}
 
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& [truc]
+\texttt{}& [truc]
 \end{tabularx}
 
 
@@ -5868,7 +5868,7 @@ s--mallformat
 \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]
+\texttt{d{-}{-}effn\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory]
 \end{tabularx}
 
 \index[fn]{d--effn\_name@\texttt{d{-}{-}effn\_name}}%
@@ -5881,7 +5881,7 @@ d--effn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{de{-}{-}ffn\_name \EmbracOn{}\textnormal{\textsl{ar--guments  
  more args   even more so}}\EmbracOff{}}& [cate--gory]
+\texttt{de{-}{-}ffn\_name \EmbracOn{}\textnormal{\textsl{ar--guments    more 
args   even more so}}\EmbracOff{}}& [cate--gory]
 \end{tabularx}
 
 \index[fn]{de--ffn\_name@\texttt{de{-}{-}ffn\_name}}%
@@ -5894,7 +5894,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{\GNUTexinfocommandstyletextvar{i} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fset]
+\texttt{\GNUTexinfocommandstyletextvar{i} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fset]
 \end{tabularx}
 
 \index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
@@ -5903,7 +5903,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{truc \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [cmde]
+\texttt{truc \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [cmde]
 \end{tabularx}
 
 \index[fn]{truc@\texttt{truc}}%
@@ -5911,7 +5911,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{log trap \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& 
[Command]
+\texttt{log trap \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [Command]
 \end{tabularx}
 
 \index[fn]{log trap@\texttt{log trap}}%
@@ -5919,7 +5919,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{log trap1 \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& 
[Command]
+\texttt{log trap1 \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [Command]
 \end{tabularx}
 
 \index[fn]{log trap1@\texttt{log trap1}}%
@@ -5927,7 +5927,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{log trap2 \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& 
[Command]
+\texttt{log trap2 \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [Command]
 \end{tabularx}
 
 \index[fn]{log trap2@\texttt{log trap2}}%
@@ -5935,7 +5935,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{\textbf{id ule} 
\EmbracOn{}\textnormal{\textsl{truc}}\EmbracOff{}}& [cmde]
+\texttt{\textbf{id ule} \EmbracOn{}\textnormal{\textsl{truc}}\EmbracOff{}}& 
[cmde]
 \end{tabularx}
 
 \index[fn]{id ule@\texttt{\textbf{id ule}}}%
@@ -5943,7 +5943,7 @@ def--fn
 \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]
+\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}}}%
@@ -5951,14 +5951,14 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& []
+\texttt{}& []
 \end{tabularx}
 
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{machin}& []
+\texttt{machin}& []
 \end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
@@ -5966,7 +5966,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{bidule machin}& []
+\texttt{bidule machin}& []
 \end{tabularx}
 
 \index[fn]{bidule machin@\texttt{bidule machin}}%
@@ -5974,7 +5974,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{machin}& [truc]
+\texttt{machin}& [truc]
 \end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
@@ -5982,14 +5982,14 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& [truc]
+\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]
+\texttt{followed \EmbracOn{}\textnormal{\textsl{by a comment}}\EmbracOff{}}& 
[truc]
 \end{tabularx}
 
 \index[fn]{followed@\texttt{followed}}%
@@ -5997,14 +5997,14 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& []
+\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 \textbf{f g} h 
i}}\EmbracOff{}}& [truc]
+\texttt{a \EmbracOn{}\textnormal{\textsl{b c d e \textbf{f g} h 
i}}\EmbracOff{}}& [truc]
 \end{tabularx}
 
 \index[fn]{a@\texttt{a}}%
@@ -6012,7 +6012,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{deffnx \EmbracOn{}\textnormal{\textsl{before end 
deffn}}\EmbracOff{}}& [truc]
+\texttt{deffnx \EmbracOn{}\textnormal{\textsl{before end deffn}}\EmbracOff{}}& 
[truc]
 \end{tabularx}
 
 \index[fn]{deffnx@\texttt{deffnx}}%
@@ -6022,7 +6022,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{deffn}& [empty]
+\texttt{deffn}& [empty]
 \end{tabularx}
 
 \index[fn]{deffn@\texttt{deffn}}%
@@ -6031,7 +6031,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{deffn \EmbracOn{}\textnormal{\textsl{with 
deffnx}}\EmbracOff{}}& [empty]
+\texttt{deffn \EmbracOn{}\textnormal{\textsl{with deffnx}}\EmbracOff{}}& 
[empty]
 \end{tabularx}
 
 \index[fn]{deffn@\texttt{deffn}}%
@@ -6039,7 +6039,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{deffnx}& [empty]
+\texttt{deffnx}& [empty]
 \end{tabularx}
 
 \index[fn]{deffnx@\texttt{deffnx}}%
@@ -6048,7 +6048,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{\GNUTexinfocommandstyletextvar{i} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fset]
+\texttt{\GNUTexinfocommandstyletextvar{i} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fset]
 \end{tabularx}
 
 \index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
@@ -6056,7 +6056,7 @@ def--fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{truc \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [cmde]
+\texttt{truc \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [cmde]
 \end{tabularx}
 
 \index[fn]{truc@\texttt{truc}}%
@@ -6070,7 +6070,7 @@ text in def item for second def item
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efvr\_name}& [c--ategory]
+\texttt{d{-}{-}efvr\_name}& [c--ategory]
 \end{tabularx}
 
 \index[cp]{d--efvr\_name@\texttt{d{-}{-}efvr\_name}}%
@@ -6083,7 +6083,7 @@ d--efvr
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{n{-}{-}ame 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory]
+\texttt{n{-}{-}ame 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory]
 \end{tabularx}
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
@@ -6096,7 +6096,7 @@ d--effn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{n{-}{-}ame}& [c--ategory]
+\texttt{n{-}{-}ame}& [c--ategory]
 \end{tabularx}
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
@@ -6109,7 +6109,7 @@ d--effn no arg
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name a{-}{-}rguments...}& 
[c--ategory]
+\texttt{t{-}{-}ype d{-}{-}eftypefn\_name a{-}{-}rguments...}& [c--ategory]
 \end{tabularx}
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
@@ -6122,7 +6122,7 @@ d--eftypefn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name}& [c--ategory]
+\texttt{t{-}{-}ype d{-}{-}eftypefn\_name}& [c--ategory]
 \end{tabularx}
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
@@ -6135,7 +6135,7 @@ d--eftypefn no arg
 \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}]
+\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}}%
@@ -6148,7 +6148,7 @@ d--eftypeop
 \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}]
+\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}}%
@@ -6161,7 +6161,7 @@ d--eftypeop no arg
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypevr\_name}& [c--ategory]
+\texttt{t{-}{-}ype d{-}{-}eftypevr\_name}& [c--ategory]
 \end{tabularx}
 
 \index[cp]{d--eftypevr\_name@\texttt{d{-}{-}eftypevr\_name}}%
@@ -6174,7 +6174,7 @@ d--eftypevr
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efcv\_name}& [c--ategory of \texttt{c{-}{-}lass}]
+\texttt{d{-}{-}efcv\_name}& [c--ategory of \texttt{c{-}{-}lass}]
 \end{tabularx}
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
@@ -6187,7 +6187,7 @@ d--efcv
 \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}]
+\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}}%
@@ -6200,7 +6200,7 @@ d--efcv with arguments
 \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}]
+\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}}%
@@ -6213,7 +6213,7 @@ d--eftypecv
 \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}]
+\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}}%
@@ -6226,7 +6226,7 @@ d--eftypecv with arguments
 \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}]
+\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}}%
@@ -6239,7 +6239,7 @@ d--efop
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efop\_name}& [c--ategory on \texttt{c{-}{-}lass}]
+\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}}%
@@ -6252,7 +6252,7 @@ d--efop no arg
 \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]
+\texttt{d{-}{-}eftp\_name 
\EmbracOn{}\textnormal{\textsl{a--ttributes...}}\EmbracOff{}}& [c--ategory]
 \end{tabularx}
 
 \index[tp]{d--eftp\_name@\texttt{d{-}{-}eftp\_name}}%
@@ -6265,7 +6265,7 @@ d--eftp
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efun\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Function]
+\texttt{d{-}{-}efun\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Function]
 \end{tabularx}
 
 \index[fn]{d--efun\_name@\texttt{d{-}{-}efun\_name}}%
@@ -6278,7 +6278,7 @@ d--efun
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efmac\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Macro]
+\texttt{d{-}{-}efmac\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Macro]
 \end{tabularx}
 
 \index[fn]{d--efmac\_name@\texttt{d{-}{-}efmac\_name}}%
@@ -6291,7 +6291,7 @@ d--efmac
 \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]
+\texttt{d{-}{-}efspec\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{d--efspec\_name@\texttt{d{-}{-}efspec\_name}}%
@@ -6304,7 +6304,7 @@ d--efspec
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efvar\_name}& [Variable]
+\texttt{d{-}{-}efvar\_name}& [Variable]
 \end{tabularx}
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
@@ -6317,7 +6317,7 @@ d--efvar
 \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]
+\texttt{d{-}{-}efvar\_name \EmbracOn{}\textnormal{\textsl{arg--var 
arg--var1}}\EmbracOff{}}& [Variable]
 \end{tabularx}
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
@@ -6330,7 +6330,7 @@ d--efvar with args
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efopt\_name}& [User Option]
+\texttt{d{-}{-}efopt\_name}& [User Option]
 \end{tabularx}
 
 \index[cp]{d--efopt\_name@\texttt{d{-}{-}efopt\_name}}%
@@ -6343,7 +6343,7 @@ d--efopt
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypefun\_name a{-}{-}rguments...}& 
[Function]
+\texttt{t{-}{-}ype d{-}{-}eftypefun\_name a{-}{-}rguments...}& [Function]
 \end{tabularx}
 
 \index[fn]{d--eftypefun\_name@\texttt{d{-}{-}eftypefun\_name}}%
@@ -6356,7 +6356,7 @@ d--eftypefun
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypevar\_name}& [Variable]
+\texttt{t{-}{-}ype d{-}{-}eftypevar\_name}& [Variable]
 \end{tabularx}
 
 \index[cp]{d--eftypevar\_name@\texttt{d{-}{-}eftypevar\_name}}%
@@ -6369,7 +6369,7 @@ d--eftypevar
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efivar\_name}& [Instance Variable of 
\texttt{c{-}{-}lass}]
+\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}}%
@@ -6382,7 +6382,7 @@ d--efivar
 \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}]
+\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}}%
@@ -6395,7 +6395,7 @@ d--eftypeivar
 \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}]
+\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}}%
@@ -6408,7 +6408,7 @@ d--efmethod
 \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}]
+\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}}%
@@ -6422,7 +6422,7 @@ d--eftypemethod
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{data-type2}& [Function]\\
+\texttt{data-type2}& [Function]\\
 \texttt{name2 arguments2...}\end{tabularx}
 
 \index[fn]{name2@\texttt{name2}}%
@@ -6435,7 +6435,7 @@ aaa2
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype2}& [c--ategory2]\\
+\texttt{t{-}{-}ype2}& [c--ategory2]\\
 \texttt{d{-}{-}eftypefn\_name2}\end{tabularx}
 
 \index[fn]{d--eftypefn\_name2@\texttt{d{-}{-}eftypefn\_name2}}%
@@ -6448,7 +6448,7 @@ d--eftypefn no arg2
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype2}& [c--ategory2 on \texttt{c{-}{-}lass2}]\\
+\texttt{t{-}{-}ype2}& [c--ategory2 on \texttt{c{-}{-}lass2}]\\
 \texttt{d{-}{-}eftypeop\_name2 a{-}{-}rguments2...}\end{tabularx}
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2\ on 
c{-}{-}lass2}}%
@@ -6461,7 +6461,7 @@ d--eftypeop2
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype2}& [c--ategory2 on \texttt{c{-}{-}lass2}]\\
+\texttt{t{-}{-}ype2}& [c--ategory2 on \texttt{c{-}{-}lass2}]\\
 \texttt{d{-}{-}eftypeop\_name2}\end{tabularx}
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2\ on 
c{-}{-}lass2}}%
@@ -6474,7 +6474,7 @@ d--eftypeop no arg2
 \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}]
+\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}}%
@@ -6487,7 +6487,7 @@ d--eftypecv2
 \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}]
+\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}}%
@@ -6500,7 +6500,7 @@ d--eftypecv with arguments2
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{arg2}& [fun2]
+\texttt{arg2}& [fun2]
 \end{tabularx}
 
 \index[fn]{arg2@\texttt{arg2}}%
@@ -6795,14 +6795,14 @@ l--ine
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& [fun]
+\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]
+\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and}}\EmbracOff{}}& 
[truc]
 \end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
@@ -6810,7 +6810,7 @@ l--ine
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and  
after}}\EmbracOff{}}& [truc]
+\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and  
after}}\EmbracOff{}}& [truc]
 \end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
@@ -6818,7 +6818,7 @@ l--ine
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and 
}}\EmbracOff{}}& [truc]
+\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and 
}}\EmbracOff{}}& [truc]
 \end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
@@ -6826,7 +6826,7 @@ l--ine
 \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]
+\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and and 
after}}\EmbracOff{}}& [truc]
 \end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
@@ -6834,7 +6834,7 @@ l--ine
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{followed \EmbracOn{}\textnormal{\textsl{by a 
comment}}\EmbracOff{}}& [truc]
+\texttt{followed \EmbracOn{}\textnormal{\textsl{by a comment}}\EmbracOff{}}& 
[truc]
 \end{tabularx}
 
 \index[fn]{followed@\texttt{followed}}%
@@ -6843,7 +6843,7 @@ Various deff lines
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{after \EmbracOn{}\textnormal{\textsl{a deff 
item}}\EmbracOff{}}& [truc]
+\texttt{after \EmbracOn{}\textnormal{\textsl{a deff item}}\EmbracOff{}}& [truc]
 \end{tabularx}
 
 \index[fn]{after@\texttt{after}}%
@@ -6852,7 +6852,7 @@ Various deff lines
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{\GNUTexinfocommandstyletextvar{invalid} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fsetinv]
+\texttt{\GNUTexinfocommandstyletextvar{invalid} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fsetinv]
 \end{tabularx}
 
 \index[fn]{invalid@\texttt{\GNUTexinfocommandstyletextvar{invalid}}}%
@@ -6860,7 +6860,7 @@ Various deff lines
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& [\textbf{id `\texttt{i}' ule}]
+\texttt{}& [\textbf{id `\texttt{i}' ule}]
 \end{tabularx}
 
 
@@ -6868,21 +6868,21 @@ Various deff lines
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& [aaa]
+\texttt{}& [aaa]
 \end{tabularx}
 
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& []
+\texttt{}& []
 \end{tabularx}
 
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& [truc]
+\texttt{}& [truc]
 \end{tabularx}
 
 
@@ -7926,7 +7926,7 @@ s--mallformat
 \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]
+\texttt{d{-}{-}effn\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory]
 \end{tabularx}
 
 \index[fn]{d--effn\_name@\texttt{d{-}{-}effn\_name}}%
@@ -7945,7 +7945,7 @@ d{-}{-}effn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{de{-}{-}ffn\_name \EmbracOn{}\textnormal{\textsl{ar--guments  
  more args   even more so}}\EmbracOff{}}& [cate--gory]
+\texttt{de{-}{-}ffn\_name \EmbracOn{}\textnormal{\textsl{ar--guments    more 
args   even more so}}\EmbracOff{}}& [cate--gory]
 \end{tabularx}
 
 \index[fn]{de--ffn\_name@\texttt{de{-}{-}ffn\_name}}%
@@ -7964,7 +7964,7 @@ def{-}{-}fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{\GNUTexinfocommandstyletextvar{i} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fset]
+\texttt{\GNUTexinfocommandstyletextvar{i} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fset]
 \end{tabularx}
 
 \index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
@@ -7976,7 +7976,7 @@ def{-}{-}fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{truc \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [cmde]
+\texttt{truc \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [cmde]
 \end{tabularx}
 
 \index[fn]{truc@\texttt{truc}}%
@@ -7984,7 +7984,7 @@ def{-}{-}fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{log trap \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& 
[Command]
+\texttt{log trap \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [Command]
 \end{tabularx}
 
 \index[fn]{log trap@\texttt{log trap}}%
@@ -7992,7 +7992,7 @@ def{-}{-}fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{log trap1 \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& 
[Command]
+\texttt{log trap1 \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [Command]
 \end{tabularx}
 
 \index[fn]{log trap1@\texttt{log trap1}}%
@@ -8000,7 +8000,7 @@ def{-}{-}fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{log trap2 \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& 
[Command]
+\texttt{log trap2 \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [Command]
 \end{tabularx}
 
 \index[fn]{log trap2@\texttt{log trap2}}%
@@ -8008,7 +8008,7 @@ def{-}{-}fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{\textbf{id ule} 
\EmbracOn{}\textnormal{\textsl{truc}}\EmbracOff{}}& [cmde]
+\texttt{\textbf{id ule} \EmbracOn{}\textnormal{\textsl{truc}}\EmbracOff{}}& 
[cmde]
 \end{tabularx}
 
 \index[fn]{id ule@\texttt{\textbf{id ule}}}%
@@ -8016,7 +8016,7 @@ def{-}{-}fn
 \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]
+\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}}}%
@@ -8024,14 +8024,14 @@ def{-}{-}fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& []
+\texttt{}& []
 \end{tabularx}
 
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{machin}& []
+\texttt{machin}& []
 \end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
@@ -8039,7 +8039,7 @@ def{-}{-}fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{bidule machin}& []
+\texttt{bidule machin}& []
 \end{tabularx}
 
 \index[fn]{bidule machin@\texttt{bidule machin}}%
@@ -8047,7 +8047,7 @@ def{-}{-}fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{machin}& [truc]
+\texttt{machin}& [truc]
 \end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
@@ -8055,14 +8055,14 @@ def{-}{-}fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& [truc]
+\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]
+\texttt{followed \EmbracOn{}\textnormal{\textsl{by a comment}}\EmbracOff{}}& 
[truc]
 \end{tabularx}
 
 \index[fn]{followed@\texttt{followed}}%
@@ -8073,14 +8073,14 @@ def{-}{-}fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& []
+\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 \textbf{f g} h 
i}}\EmbracOff{}}& [truc]
+\texttt{a \EmbracOn{}\textnormal{\textsl{b c d e \textbf{f g} h 
i}}\EmbracOff{}}& [truc]
 \end{tabularx}
 
 \index[fn]{a@\texttt{a}}%
@@ -8088,7 +8088,7 @@ def{-}{-}fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{deffnx \EmbracOn{}\textnormal{\textsl{before end 
deffn}}\EmbracOff{}}& [truc]
+\texttt{deffnx \EmbracOn{}\textnormal{\textsl{before end deffn}}\EmbracOff{}}& 
[truc]
 \end{tabularx}
 
 \index[fn]{deffnx@\texttt{deffnx}}%
@@ -8101,7 +8101,7 @@ def{-}{-}fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{deffn}& [empty]
+\texttt{deffn}& [empty]
 \end{tabularx}
 
 \index[fn]{deffn@\texttt{deffn}}%
@@ -8113,7 +8113,7 @@ def{-}{-}fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{deffn \EmbracOn{}\textnormal{\textsl{with 
deffnx}}\EmbracOff{}}& [empty]
+\texttt{deffn \EmbracOn{}\textnormal{\textsl{with deffnx}}\EmbracOff{}}& 
[empty]
 \end{tabularx}
 
 \index[fn]{deffn@\texttt{deffn}}%
@@ -8124,7 +8124,7 @@ def{-}{-}fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{deffnx}& [empty]
+\texttt{deffnx}& [empty]
 \end{tabularx}
 
 \index[fn]{deffnx@\texttt{deffnx}}%
@@ -8136,7 +8136,7 @@ def{-}{-}fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{\GNUTexinfocommandstyletextvar{i} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fset]
+\texttt{\GNUTexinfocommandstyletextvar{i} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fset]
 \end{tabularx}
 
 \index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
@@ -8144,7 +8144,7 @@ def{-}{-}fn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{truc \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [cmde]
+\texttt{truc \EmbracOn{}\textnormal{\textsl{}}\EmbracOff{}}& [cmde]
 \end{tabularx}
 
 \index[fn]{truc@\texttt{truc}}%
@@ -8164,7 +8164,7 @@ text in def item for second def item
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efvr\_name}& [c--ategory]
+\texttt{d{-}{-}efvr\_name}& [c--ategory]
 \end{tabularx}
 
 \index[cp]{d--efvr\_name@\texttt{d{-}{-}efvr\_name}}%
@@ -8183,7 +8183,7 @@ d{-}{-}efvr
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{n{-}{-}ame 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory]
+\texttt{n{-}{-}ame 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [c--ategory]
 \end{tabularx}
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
@@ -8202,7 +8202,7 @@ d{-}{-}effn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{n{-}{-}ame}& [c--ategory]
+\texttt{n{-}{-}ame}& [c--ategory]
 \end{tabularx}
 
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
@@ -8221,7 +8221,7 @@ d{-}{-}effn no arg
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name a{-}{-}rguments...}& 
[c--ategory]
+\texttt{t{-}{-}ype d{-}{-}eftypefn\_name a{-}{-}rguments...}& [c--ategory]
 \end{tabularx}
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
@@ -8240,7 +8240,7 @@ d{-}{-}eftypefn
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypefn\_name}& [c--ategory]
+\texttt{t{-}{-}ype d{-}{-}eftypefn\_name}& [c--ategory]
 \end{tabularx}
 
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
@@ -8259,7 +8259,7 @@ d{-}{-}eftypefn no arg
 \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}]
+\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}}%
@@ -8278,7 +8278,7 @@ d{-}{-}eftypeop
 \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}]
+\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}}%
@@ -8297,7 +8297,7 @@ d{-}{-}eftypeop no arg
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypevr\_name}& [c--ategory]
+\texttt{t{-}{-}ype d{-}{-}eftypevr\_name}& [c--ategory]
 \end{tabularx}
 
 \index[cp]{d--eftypevr\_name@\texttt{d{-}{-}eftypevr\_name}}%
@@ -8316,7 +8316,7 @@ d{-}{-}eftypevr
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efcv\_name}& [c--ategory of \texttt{c{-}{-}lass}]
+\texttt{d{-}{-}efcv\_name}& [c--ategory of \texttt{c{-}{-}lass}]
 \end{tabularx}
 
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
@@ -8335,7 +8335,7 @@ d{-}{-}efcv
 \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}]
+\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}}%
@@ -8354,7 +8354,7 @@ d{-}{-}efcv with arguments
 \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}]
+\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}}%
@@ -8373,7 +8373,7 @@ d{-}{-}eftypecv
 \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}]
+\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}}%
@@ -8392,7 +8392,7 @@ d{-}{-}eftypecv with arguments
 \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}]
+\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}}%
@@ -8411,7 +8411,7 @@ d{-}{-}efop
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efop\_name}& [c--ategory on \texttt{c{-}{-}lass}]
+\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}}%
@@ -8430,7 +8430,7 @@ d{-}{-}efop no arg
 \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]
+\texttt{d{-}{-}eftp\_name 
\EmbracOn{}\textnormal{\textsl{a--ttributes...}}\EmbracOff{}}& [c--ategory]
 \end{tabularx}
 
 \index[tp]{d--eftp\_name@\texttt{d{-}{-}eftp\_name}}%
@@ -8449,7 +8449,7 @@ d{-}{-}eftp
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efun\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Function]
+\texttt{d{-}{-}efun\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Function]
 \end{tabularx}
 
 \index[fn]{d--efun\_name@\texttt{d{-}{-}efun\_name}}%
@@ -8468,7 +8468,7 @@ d{-}{-}efun
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efmac\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Macro]
+\texttt{d{-}{-}efmac\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Macro]
 \end{tabularx}
 
 \index[fn]{d--efmac\_name@\texttt{d{-}{-}efmac\_name}}%
@@ -8487,7 +8487,7 @@ d{-}{-}efmac
 \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]
+\texttt{d{-}{-}efspec\_name 
\EmbracOn{}\textnormal{\textsl{a--rguments...}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{d--efspec\_name@\texttt{d{-}{-}efspec\_name}}%
@@ -8506,7 +8506,7 @@ d{-}{-}efspec
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efvar\_name}& [Variable]
+\texttt{d{-}{-}efvar\_name}& [Variable]
 \end{tabularx}
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
@@ -8525,7 +8525,7 @@ d{-}{-}efvar
 \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]
+\texttt{d{-}{-}efvar\_name \EmbracOn{}\textnormal{\textsl{arg--var 
arg--var1}}\EmbracOff{}}& [Variable]
 \end{tabularx}
 
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
@@ -8544,7 +8544,7 @@ d{-}{-}efvar with args
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efopt\_name}& [User Option]
+\texttt{d{-}{-}efopt\_name}& [User Option]
 \end{tabularx}
 
 \index[cp]{d--efopt\_name@\texttt{d{-}{-}efopt\_name}}%
@@ -8563,7 +8563,7 @@ d{-}{-}efopt
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypefun\_name a{-}{-}rguments...}& 
[Function]
+\texttt{t{-}{-}ype d{-}{-}eftypefun\_name a{-}{-}rguments...}& [Function]
 \end{tabularx}
 
 \index[fn]{d--eftypefun\_name@\texttt{d{-}{-}eftypefun\_name}}%
@@ -8582,7 +8582,7 @@ d{-}{-}eftypefun
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype d{-}{-}eftypevar\_name}& [Variable]
+\texttt{t{-}{-}ype d{-}{-}eftypevar\_name}& [Variable]
 \end{tabularx}
 
 \index[cp]{d--eftypevar\_name@\texttt{d{-}{-}eftypevar\_name}}%
@@ -8601,7 +8601,7 @@ d{-}{-}eftypevar
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{d{-}{-}efivar\_name}& [Instance Variable of 
\texttt{c{-}{-}lass}]
+\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}}%
@@ -8620,7 +8620,7 @@ d{-}{-}efivar
 \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}]
+\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}}%
@@ -8639,7 +8639,7 @@ d{-}{-}eftypeivar
 \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}]
+\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}}%
@@ -8658,7 +8658,7 @@ d{-}{-}efmethod
 \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}]
+\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}}%
@@ -8678,7 +8678,7 @@ d{-}{-}eftypemethod
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{data-type2}& [Function]\\
+\texttt{data-type2}& [Function]\\
 \texttt{name2 arguments2...}\end{tabularx}
 
 \index[fn]{name2@\texttt{name2}}%
@@ -8697,7 +8697,7 @@ aaa2
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype2}& [c--ategory2]\\
+\texttt{t{-}{-}ype2}& [c--ategory2]\\
 \texttt{d{-}{-}eftypefn\_name2}\end{tabularx}
 
 \index[fn]{d--eftypefn\_name2@\texttt{d{-}{-}eftypefn\_name2}}%
@@ -8716,7 +8716,7 @@ d{-}{-}eftypefn no arg2
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype2}& [c--ategory2 on \texttt{c{-}{-}lass2}]\\
+\texttt{t{-}{-}ype2}& [c--ategory2 on \texttt{c{-}{-}lass2}]\\
 \texttt{d{-}{-}eftypeop\_name2 a{-}{-}rguments2...}\end{tabularx}
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2\ on 
c{-}{-}lass2}}%
@@ -8735,7 +8735,7 @@ d{-}{-}eftypeop2
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{t{-}{-}ype2}& [c--ategory2 on \texttt{c{-}{-}lass2}]\\
+\texttt{t{-}{-}ype2}& [c--ategory2 on \texttt{c{-}{-}lass2}]\\
 \texttt{d{-}{-}eftypeop\_name2}\end{tabularx}
 
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2\ on 
c{-}{-}lass2}}%
@@ -8754,7 +8754,7 @@ d{-}{-}eftypeop no arg2
 \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}]
+\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}}%
@@ -8773,7 +8773,7 @@ d{-}{-}eftypecv2
 \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}]
+\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}}%
@@ -8792,7 +8792,7 @@ d{-}{-}eftypecv with arguments2
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{arg2}& [fun2]
+\texttt{arg2}& [fun2]
 \end{tabularx}
 
 \index[fn]{arg2@\texttt{arg2}}%
@@ -9243,14 +9243,14 @@ l{-}{-}ine
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& [fun]
+\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]
+\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and}}\EmbracOff{}}& 
[truc]
 \end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
@@ -9258,7 +9258,7 @@ l{-}{-}ine
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and  
after}}\EmbracOff{}}& [truc]
+\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and  
after}}\EmbracOff{}}& [truc]
 \end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
@@ -9266,7 +9266,7 @@ l{-}{-}ine
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and 
}}\EmbracOff{}}& [truc]
+\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and 
}}\EmbracOff{}}& [truc]
 \end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
@@ -9274,7 +9274,7 @@ l{-}{-}ine
 \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]
+\texttt{machin \EmbracOn{}\textnormal{\textsl{bidule chose and and 
after}}\EmbracOff{}}& [truc]
 \end{tabularx}
 
 \index[fn]{machin@\texttt{machin}}%
@@ -9282,7 +9282,7 @@ l{-}{-}ine
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{followed \EmbracOn{}\textnormal{\textsl{by a 
comment}}\EmbracOff{}}& [truc]
+\texttt{followed \EmbracOn{}\textnormal{\textsl{by a comment}}\EmbracOff{}}& 
[truc]
 \end{tabularx}
 
 \index[fn]{followed@\texttt{followed}}%
@@ -9294,7 +9294,7 @@ Various deff lines
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{after \EmbracOn{}\textnormal{\textsl{a deff 
item}}\EmbracOff{}}& [truc]
+\texttt{after \EmbracOn{}\textnormal{\textsl{a deff item}}\EmbracOff{}}& [truc]
 \end{tabularx}
 
 \index[fn]{after@\texttt{after}}%
@@ -9306,7 +9306,7 @@ Various deff lines
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{\GNUTexinfocommandstyletextvar{invalid} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fsetinv]
+\texttt{\GNUTexinfocommandstyletextvar{invalid} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fsetinv]
 \end{tabularx}
 
 \index[fn]{invalid@\texttt{\GNUTexinfocommandstyletextvar{invalid}}}%
@@ -9314,7 +9314,7 @@ Various deff lines
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& [\textbf{id `\texttt{i}' ule}]
+\texttt{}& [\textbf{id `\texttt{i}' ule}]
 \end{tabularx}
 
 
@@ -9322,21 +9322,21 @@ Various deff lines
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& [aaa]
+\texttt{}& [aaa]
 \end{tabularx}
 
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& []
+\texttt{}& []
 \end{tabularx}
 
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill
 \hangindent=2em
-\noindent\texttt{}& [truc]
+\texttt{}& [truc]
 \end{tabularx}
 
 \begin{GNUTexinfopreformatted}



reply via email to

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