[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Patrice Dumas |
|
Date: |
Fri, 12 Aug 2022 03:27:46 -0400 (EDT) |
branch: master
commit 80fc46b7afa44d9a2147c5d9c15e841aad1114be
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Aug 12 09:27:33 2022 +0200
Add commands handled by embrac before tabularx
* tp/Texinfo/Convert/LaTeX.pm (_convert): convert the def line before
prepending commands known to embrac to avoid doing it within the
tabularx where it causes an error.
---
ChangeLog | 8 +++
tp/Texinfo/Convert/LaTeX.pm | 59 ++++++++++++----------
.../res_latex/definition_commands.tex | 32 ++++++++----
.../converters_tests/frenchspacing_and_code.pl | 6 ++-
.../res_parser/formatting_latex/formatting.tex | 15 ++++--
5 files changed, 77 insertions(+), 43 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0e01ded51c..f714121c8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2022-08-11 Patrice Dumas <pertusus@free.fr>
+
+ Add commands handled by embrac before tabularx
+
+ * tp/Texinfo/Convert/LaTeX.pm (_convert): convert the def line before
+ prepending commands known to embrac to avoid doing it within the
+ tabularx where it causes an error.
+
2022-08-11 Gavin Smith <gavinsmith0123@gmail.com>
* doc/texinfo.texi (Definition Commands):
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index b0d8282901..8dd280d524 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -2451,8 +2451,6 @@ sub _convert($$)
my $defined_style_embrac = $need_known_embrac{$LaTeX_style_command};
if (not $self->{'formatting_context'}->[-1]->{'embrac'}->[-1]
->{'made_known'}->{$defined_style_embrac}) {
- $result .= '\EmbracMakeKnown{'
- .$defined_style_embrac.'}';
$self->{'formatting_context'}->[-1]->{'embrac'}->[-1]
->{'made_known'}->{$defined_style_embrac} = 1;
}
@@ -2716,7 +2714,7 @@ sub _convert($$)
if ($self->{'normalized_nodes_associated_section'}
and
$self->{'normalized_nodes_associated_section'}->{$normalized_name}) {
$section_command
- =
$self->{'normalized_nodes_associated_section'}->{$normalized_name};
+ =
$self->{'normalized_nodes_associated_section'}->{$normalized_name};
} elsif ($reference->{'cmdname'} eq 'node') {
# can only happen if there is no sectioning commands at all,
# otherwise it would have been associated in
@@ -3546,55 +3544,56 @@ sub _convert($$)
}
$self->{'packages'}->{'tabularx'} = 1;
+ 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.
- $result .= "\n\\noindent\\begin{tabularx}{\\linewidth}{\@{}Xr}\n";
+ $def_line_result .=
"\\noindent\\begin{tabularx}{\\linewidth}{\@{}Xr}\n";
# This stops the definition line overlapping the category in
# case it is hard to break the first line.
- $result .= "\\rightskip=5em plus 1 fill\n";
+ $def_line_result .= "\\rightskip=5em plus 1 fill\n";
# In case definition "line" doesn't fit on one line.
- $result .= "\\hangindent=2em\n";
+ $def_line_result .= "\\hangindent=2em\n";
- $result .= '\noindent\texttt{';
+ $def_line_result .= '\noindent\texttt{';
# the def* line except for the category is converted in code context
push @{$self->{'formatting_context'}->[-1]->{'code'}}, 1;
if ($element->{'extra'}->{'def_parsed_hash'}->{'type'}) {
- $result .= _convert($self,
+ $def_line_result .= _convert($self,
$element->{'extra'}->{'def_parsed_hash'}->{'type'});
if ($self->get_conf('deftypefnnewline') eq 'on'
and ($command eq 'deftypefn' or $command eq 'deftypeop')) {
- $result .= '\\leavevmode{}\\\\'; # should be same as @*
+ $def_line_result .= '\\leavevmode{}\\\\'; # should be same as @*
} else {
- $result .= ' ';
+ $def_line_result .= ' ';
}
}
- $result .= _convert($self, $name) if $name;
+ $def_line_result .= _convert($self, $name) if $name;
# will contain the command names that have been made known to
# embrac, like texttt and need to have the symbol undefined
# such that they can be redefined later
my $known_embrac_commands;
if ($arguments) {
- $result .= $def_space;
+ $def_line_result .= $def_space;
if ($Texinfo::Common::def_no_var_arg_commands{$command}) {
- $result .= _convert($self, {'contents' => $arguments});
+ $def_line_result .= _convert($self, {'contents' => $arguments});
} else {
$self->{'packages'}->{'embrac'} = 1;
# we want slanted roman and not slanted typewriter, including
# ligatures, as if @r{@slanted{...}} had been used, so output
# \textnormal and push 0 on 'code' context.
- $result .= '\EmbracOn{}\textnormal{\textsl{';
+ $def_line_result .= '\EmbracOn{}\textnormal{\textsl{';
push @{$self->{'formatting_context'}->[-1]->{'code'}}, 0;
push @{$self->{'formatting_context'}->[-1]->{'embrac'}},
{'status' => 1, 'made_known' => {}};
- $result .= _convert($self, {'contents' => $arguments});
+ $def_line_result .= _convert($self, {'contents' => $arguments});
# \EmbracOff{} is probably not really needed here as \EmbracOn{}
# should be local to the texttt
- $result .= '}}\EmbracOff{}'; # \textnormal \textsl
+ $def_line_result .= '}}\EmbracOff{}'; # \textnormal \textsl
pop @{$self->{'formatting_context'}->[-1]->{'code'}};
my $closed_embrac
= pop @{$self->{'formatting_context'}->[-1]->{'embrac'}};
@@ -3606,28 +3605,36 @@ sub _convert($$)
}
pop @{$self->{'formatting_context'}->[-1]->{'code'}};
- $result .= '}'; # \texttt
+ $def_line_result .= '}'; # \texttt
my $category
= Texinfo::Convert::Utils::definition_category_tree($self,
$element);;
if (defined($category)) {
# category is converted in normal text context
my $converted = _convert($self, $category);
- $result .= "& [$converted]\n";
- }
- $result .= "\\end{tabularx}\n";
- # undefine symbols associated with commands that have been made
- # known to embrac, such that they can be redefined later
+ $def_line_result .= "& [$converted]\n";
+ }
+ $def_line_result .= "\\end{tabularx}\n";
+ # Add commands associated to embrac, prepended to be before tabularx.
+ # If done in tabularx there are redefinition errors, cells are
+ # probably expanded more than once.
+ #
+ # also postpend undefine symbols associated with commands that have
+ # been made known to embrac, such that they can be redefined later
if (defined($known_embrac_commands)) {
- $result .= "\\ExplSyntaxOn%\n";
+ $def_line_result .= "\\ExplSyntaxOn%\n";
foreach my $defined_style_embrac (@{$known_embrac_commands}) {
- $result .= '\cs_undefine:N{\embrac_'.$defined_style_embrac.':nn}'.
+ # before the tabularx
+ $def_line_result = '\EmbracMakeKnown{'.$defined_style_embrac.'}'
+ ."%\n" .$def_line_result;
+ $def_line_result .=
'\cs_undefine:N{\embrac_'.$defined_style_embrac.':nn}'.
'\cs_undefine:N{\embrac_orig_'.$defined_style_embrac.':n}'.
'\cs_undefine:N{\__embrac_'.$defined_style_embrac.':n}%
';
}
- $result .= "\\ExplSyntaxOff%\n";
+ $def_line_result .= "\\ExplSyntaxOff%\n";
}
+ $result .= "\n".$def_line_result;
}
$result .= "\n";
$result .= _index_entry($self, $element);
@@ -3800,7 +3807,7 @@ sub _convert($$)
} elsif ($cmdname eq 'multitable') {
$result .= '\end{tabular}%'."\n";
}
-
+
# close the contexts and register the cells
if ($block_raw_commands{$cmdname}) {
my $old_context = pop
@{$self->{'formatting_context'}->[-1]->{'text_context'}};
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 babb3c2063..2429a763a1 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
@@ -150,10 +150,11 @@ deffn r slanted for
\GNUTexinfocommandstyletextvar{a---rg1} and \GNUTexinfocomma
\index[fn]{foobar@\texttt{foobar}}%
+\EmbracMakeKnown{texttt}%
\noindent\begin{tabularx}{\linewidth}{@{}Xr}
\rightskip=5em plus 1 fill
\hangindent=2em
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var
\EmbracMakeKnown{texttt}\texttt{[}from to \texttt{[}inc\texttt{]]})
code}}\EmbracOff{}}& [Special Form]
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var \texttt{[}from to
\texttt{[}inc\texttt{]]}) code}}\EmbracOff{}}& [Special Form]
\end{tabularx}
\ExplSyntaxOn%
\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
@@ -161,10 +162,11 @@ deffn r slanted for
\GNUTexinfocommandstyletextvar{a---rg1} and \GNUTexinfocomma
\index[fn]{foobar@\texttt{foobar}}%
+\EmbracMakeKnown{texttt}%
\noindent\begin{tabularx}{\linewidth}{@{}Xr}
\rightskip=5em plus 1 fill
\hangindent=2em
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var
\EmbracMakeKnown{texttt}\texttt{[}from to \texttt{[}inc\texttt{]]})
t}}\EmbracOff{}}& [Special Form]
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var \texttt{[}from to
\texttt{[}inc\texttt{]]}) t}}\EmbracOff{}}& [Special Form]
\end{tabularx}
\ExplSyntaxOn%
\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
@@ -172,10 +174,12 @@ deffn r slanted for
\GNUTexinfocommandstyletextvar{a---rg1} and \GNUTexinfocomma
\index[fn]{foobar@\texttt{foobar}}%
+\EmbracMakeKnown{texttt}%
+\EmbracMakeKnown{textbf}%
\noindent\begin{tabularx}{\linewidth}{@{}Xr}
\rightskip=5em plus 1 fill
\hangindent=2em
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var
\EmbracMakeKnown{texttt}\texttt{\EmbracMakeKnown{textbf}\textbf{[}}from to
\texttt{\textbf{[}}inc\texttt{\textbf{]]}}) t:b}}\EmbracOff{}}& [Special Form]
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var
\texttt{\textbf{[}}from to \texttt{\textbf{[}}inc\texttt{\textbf{]]}})
t:b}}\EmbracOff{}}& [Special Form]
\end{tabularx}
\ExplSyntaxOn%
\cs_undefine:N{\embrac_textbf:nn}\cs_undefine:N{\embrac_orig_textbf:n}\cs_undefine:N{\__embrac_textbf:n}%
@@ -253,10 +257,11 @@ separators
\index[fn]{foobar@\texttt{foobar}}%
+\EmbracMakeKnown{texttt}%
\noindent\begin{tabularx}{\linewidth}{@{}Xr}
\rightskip=5em plus 1 fill
\hangindent=2em
-\noindent\texttt{foobar
\EmbracOn{}\textnormal{\textsl{\EmbracMakeKnown{texttt}\texttt{va{-}{-}{-}riable}
code}}\EmbracOff{}}& [Special Form]
+\noindent\texttt{foobar
\EmbracOn{}\textnormal{\textsl{\texttt{va{-}{-}{-}riable} code}}\EmbracOff{}}&
[Special Form]
\end{tabularx}
\ExplSyntaxOn%
\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
@@ -264,10 +269,11 @@ separators
\index[fn]{foobar@\texttt{foobar}}%
+\EmbracMakeKnown{texttt}%
\noindent\begin{tabularx}{\linewidth}{@{}Xr}
\rightskip=5em plus 1 fill
\hangindent=2em
-\noindent\texttt{foobar
\EmbracOn{}\textnormal{\textsl{\EmbracMakeKnown{texttt}\texttt{va{-}{-}{-}riable}
t}}\EmbracOff{}}& [Special Form]
+\noindent\texttt{foobar
\EmbracOn{}\textnormal{\textsl{\texttt{va{-}{-}{-}riable} t}}\EmbracOff{}}&
[Special Form]
\end{tabularx}
\ExplSyntaxOn%
\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
@@ -275,10 +281,12 @@ separators
\index[fn]{foobar@\texttt{foobar}}%
+\EmbracMakeKnown{texttt}%
+\EmbracMakeKnown{textbf}%
\noindent\begin{tabularx}{\linewidth}{@{}Xr}
\rightskip=5em plus 1 fill
\hangindent=2em
-\noindent\texttt{foobar
\EmbracOn{}\textnormal{\textsl{\EmbracMakeKnown{texttt}\texttt{\EmbracMakeKnown{textbf}\textbf{va{-}{-}{-}riable}}
t:b}}\EmbracOff{}}& [Special Form]
+\noindent\texttt{foobar
\EmbracOn{}\textnormal{\textsl{\texttt{\textbf{va{-}{-}{-}riable}}
t:b}}\EmbracOff{}}& [Special Form]
\end{tabularx}
\ExplSyntaxOn%
\cs_undefine:N{\embrac_textbf:nn}\cs_undefine:N{\embrac_orig_textbf:n}\cs_undefine:N{\__embrac_textbf:n}%
@@ -348,10 +356,11 @@ name
\index[fn]{\textbackslash{}f(fn@\texttt{\texttt{\textbackslash{}f(}\textnormal{\textsl{fn}}\texttt{}}}%
+\EmbracMakeKnown{texttt}%
\noindent\begin{tabularx}{\linewidth}{@{}Xr}
\rightskip=5em plus 1 fill
\hangindent=2em
-\noindent\texttt{\texttt{\textbackslash{}f[}\textnormal{\textsl{font}}\texttt{]}
\EmbracOn{}\textnormal{\textsl{\EmbracMakeKnown{texttt}\texttt{\textbackslash{}f[}\EmbracOff{}\textnormal{\textsl{font}}\EmbracOn{}\texttt{]}}}\EmbracOff{}}&
[Escape~sequence]
+\noindent\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}
\ExplSyntaxOn%
\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
@@ -374,10 +383,11 @@ to \GNUTexinfocommandstyletextvar{font} (one-character
name~\GNUTexinfocommandst
\end{quote}
+\EmbracMakeKnown{texttt}%
\noindent\begin{tabularx}{\linewidth}{@{}Xr}
\rightskip=5em plus 1 fill
\hangindent=2em
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{[
\EmbracOff{}\textnormal{[}\EmbracOn{} \textsl{[}
\EmbracMakeKnown{texttt}\texttt{[} \texttt{[}
\EmbracOff{}\textnormal{\textsl{[}}\EmbracOn{}
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{}
\EmbracOff{}\textnormal{\texttt{\textsl{[}}}\EmbracOn{}
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{} ,
\EmbracOff{}\textnormal{,}\EmbracOn{} \textsl{,} \texttt{,} \texttt{,}
\EmbracOff{}\textnormal{\textsl{,}}\EmbracOn{} \EmbracOff{}\textnormal [...]
+\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{} [...]
\end{tabularx}
\ExplSyntaxOn%
\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
@@ -385,10 +395,11 @@ to \GNUTexinfocommandstyletextvar{font} (one-character
name~\GNUTexinfocommandst
\index[fn]{foobar@\texttt{foobar}}%
+\EmbracMakeKnown{texttt}%
\noindent\begin{tabularx}{\linewidth}{@{}Xr}
\rightskip=5em plus 1 fill
\hangindent=2em
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{[]
\EmbracOff{}\textnormal{[]}\EmbracOn{} \textsl{[]}
\EmbracMakeKnown{texttt}\texttt{[]} \texttt{[]}
\EmbracOff{}\textnormal{\textsl{[]}}\EmbracOn{}
\EmbracOff{}\textnormal{\texttt{[]}}\EmbracOn{}
\EmbracOff{}\textnormal{\texttt{\textsl{[]}}}\EmbracOn{}}}\EmbracOff{}}&
[Special Form]
+\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]
\end{tabularx}
\ExplSyntaxOn%
\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
@@ -495,10 +506,11 @@ explicit keyword marking, no var
\GNUTexinfocommandstyletextvar{function} with \
\end{quote}
+\EmbracMakeKnown{texttt}%
\noindent\begin{tabularx}{\linewidth}{@{}Xr}
\rightskip=5em plus 1 fill
\hangindent=2em
-\noindent\texttt{name \EmbracOn{}\textnormal{\textsl{argument
\EmbracMakeKnown{texttt}\texttt{int} \texttt{a{-}{-}b}
\GNUTexinfocommandstyletextvar{v--ar1}, word \texttt{{-}{-}} (\texttt{type
o{-}{-}ther}, \GNUTexinfocommandstyletextvar{v---ar2} [\texttt{float}
[\GNUTexinfocommandstyletextvar{var4}]])}}\EmbracOff{}}& [Category]
+\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]
\end{tabularx}
\ExplSyntaxOn%
\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
diff --git a/tp/t/results/converters_tests/frenchspacing_and_code.pl
b/tp/t/results/converters_tests/frenchspacing_and_code.pl
index c2fd224568..f6b9201c51 100644
--- a/tp/t/results/converters_tests/frenchspacing_and_code.pl
+++ b/tp/t/results/converters_tests/frenchspacing_and_code.pl
@@ -2547,10 +2547,11 @@ deftypeop
\\end{quote}
+\\EmbracMakeKnown{texttt}%
\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
\\rightskip=5em plus 1 fill
\\hangindent=2em
-\\noindent\\texttt{vname?\\ n;\\ d \\EmbracOn{}\\textnormal{\\textsl{varg? ve:
f. \\GNUTexinfocommandstyletextvar{vv: g? b}
\\EmbracMakeKnown{texttt}\\texttt{vcode?\\ is:\\ a}}}\\EmbracOff{}}& [vcat: r.
z on \\texttt{vclass:\\ MyC.\\ u}]
+\\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}]
\\end{tabularx}
\\ExplSyntaxOn%
\\cs_undefine:N{\\embrac_texttt:nn}\\cs_undefine:N{\\embrac_orig_texttt:n}\\cs_undefine:N{\\__embrac_texttt:n}%
@@ -2589,10 +2590,11 @@ deftypeop n
\\end{quote}
+\\EmbracMakeKnown{texttt}%
\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
\\rightskip=5em plus 1 fill
\\hangindent=2em
-\\noindent\\texttt{vname?\\ n;\\ d \\EmbracOn{}\\textnormal{\\textsl{varg? ve:
f. \\GNUTexinfocommandstyletextvar{vv: g? b}
\\EmbracMakeKnown{texttt}\\texttt{vcode?\\ is:\\ a}}}\\EmbracOff{}}& [vcat: r.
z on \\texttt{nvclass:\\ MyC.\\ u}]
+\\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}]
\\end{tabularx}
\\ExplSyntaxOn%
\\cs_undefine:N{\\embrac_texttt:nn}\\cs_undefine:N{\\embrac_orig_texttt:n}\\cs_undefine:N{\\__embrac_texttt:n}%
diff --git a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
index 68bc995ace..50af4208ab 100644
--- a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
+++ b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
@@ -893,10 +893,11 @@ def--fn
\end{tabularx}
+\EmbracMakeKnown{textbf}%
\noindent\begin{tabularx}{\linewidth}{@{}Xr}
\rightskip=5em plus 1 fill
\hangindent=2em
-\noindent\texttt{a \EmbracOn{}\textnormal{\textsl{b c d e
\EmbracMakeKnown{textbf}\textbf{f g} h i}}\EmbracOff{}}& [truc]
+\noindent\texttt{a \EmbracOn{}\textnormal{\textsl{b c d e \textbf{f g} h
i}}\EmbracOff{}}& [truc]
\end{tabularx}
\ExplSyntaxOn%
\cs_undefine:N{\embrac_textbf:nn}\cs_undefine:N{\embrac_orig_textbf:n}\cs_undefine:N{\__embrac_textbf:n}%
@@ -2583,10 +2584,11 @@ def--fn
\end{tabularx}
+\EmbracMakeKnown{textbf}%
\noindent\begin{tabularx}{\linewidth}{@{}Xr}
\rightskip=5em plus 1 fill
\hangindent=2em
-\noindent\texttt{a \EmbracOn{}\textnormal{\textsl{b c d e
\EmbracMakeKnown{textbf}\textbf{f g} h i}}\EmbracOff{}}& [truc]
+\noindent\texttt{a \EmbracOn{}\textnormal{\textsl{b c d e \textbf{f g} h
i}}\EmbracOff{}}& [truc]
\end{tabularx}
\ExplSyntaxOn%
\cs_undefine:N{\embrac_textbf:nn}\cs_undefine:N{\embrac_orig_textbf:n}\cs_undefine:N{\__embrac_textbf:n}%
@@ -4294,10 +4296,11 @@ def--fn
\end{tabularx}
+\EmbracMakeKnown{textbf}%
\noindent\begin{tabularx}{\linewidth}{@{}Xr}
\rightskip=5em plus 1 fill
\hangindent=2em
-\noindent\texttt{a \EmbracOn{}\textnormal{\textsl{b c d e
\EmbracMakeKnown{textbf}\textbf{f g} h i}}\EmbracOff{}}& [truc]
+\noindent\texttt{a \EmbracOn{}\textnormal{\textsl{b c d e \textbf{f g} h
i}}\EmbracOff{}}& [truc]
\end{tabularx}
\ExplSyntaxOn%
\cs_undefine:N{\embrac_textbf:nn}\cs_undefine:N{\embrac_orig_textbf:n}\cs_undefine:N{\__embrac_textbf:n}%
@@ -5983,10 +5986,11 @@ def--fn
\end{tabularx}
+\EmbracMakeKnown{textbf}%
\noindent\begin{tabularx}{\linewidth}{@{}Xr}
\rightskip=5em plus 1 fill
\hangindent=2em
-\noindent\texttt{a \EmbracOn{}\textnormal{\textsl{b c d e
\EmbracMakeKnown{textbf}\textbf{f g} h i}}\EmbracOff{}}& [truc]
+\noindent\texttt{a \EmbracOn{}\textnormal{\textsl{b c d e \textbf{f g} h
i}}\EmbracOff{}}& [truc]
\end{tabularx}
\ExplSyntaxOn%
\cs_undefine:N{\embrac_textbf:nn}\cs_undefine:N{\embrac_orig_textbf:n}\cs_undefine:N{\__embrac_textbf:n}%
@@ -8052,10 +8056,11 @@ def{-}{-}fn
\end{tabularx}
+\EmbracMakeKnown{textbf}%
\noindent\begin{tabularx}{\linewidth}{@{}Xr}
\rightskip=5em plus 1 fill
\hangindent=2em
-\noindent\texttt{a \EmbracOn{}\textnormal{\textsl{b c d e
\EmbracMakeKnown{textbf}\textbf{f g} h i}}\EmbracOff{}}& [truc]
+\noindent\texttt{a \EmbracOn{}\textnormal{\textsl{b c d e \textbf{f g} h
i}}\EmbracOff{}}& [truc]
\end{tabularx}
\ExplSyntaxOn%
\cs_undefine:N{\embrac_textbf:nn}\cs_undefine:N{\embrac_orig_textbf:n}\cs_undefine:N{\__embrac_textbf:n}%