branch master updated: * tp/Texinfo/Convert/LaTeX.pm: do not use EmbracMakeKnown, as using it twice leads to an error.

[Patrice Dumas]

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 02fcaf9412 * tp/Texinfo/Convert/LaTeX.pm: do not use EmbracMakeKnown, 
as using it twice leads to an error.
02fcaf9412 is described below

commit 02fcaf9412c6a5faaf2aba1ae27fbed282dc68e1
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Aug 14 17:00:32 2022 +0200

    * tp/Texinfo/Convert/LaTeX.pm: do not use EmbracMakeKnown,
    as using it twice leads to an error.
---
 ChangeLog                                          |  5 +++
 tp/Texinfo/Convert/LaTeX.pm                        |  6 ++-
 .../res_latex/definition_commands.tex              | 44 ----------------------
 .../converters_tests/frenchspacing_and_code.pl     |  8 ----
 4 files changed, 10 insertions(+), 53 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a8600c04e8..f36ee7dd19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-08-14  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/LaTeX.pm: do not use EmbracMakeKnown,
+       as using it twice leads to an error.
+
 2022-08-14  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/LaTeX.pm: simplify setting commands for
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index cd1df17067..53c23f4813 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -3633,7 +3633,11 @@ sub _convert($$)
         #
         # 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)) {
+        #
+        # TODO currently setting EmbracMakeKnown twice leads to an error.
+        # this is triggered by the tests layout formatting_latex test.
+        # So do not use it for now.
+        if (0 and defined($known_embrac_commands)) {
           $def_line_result .= "\\ExplSyntaxOn%\n";
           foreach my $defined_style_embrac (@{$known_embrac_commands}) {
             # before the tabularx
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 1a26ca3d3a..675e50f5aa 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,41 +150,27 @@ 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 \texttt{[}from to 
\texttt{[}inc\texttt{]]}) code}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
-\ExplSyntaxOn%
-\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
-\ExplSyntaxOff%
 
 \index[fn]{foobar@\texttt{foobar}}%
 
-\EmbracMakeKnown{texttt}%
 \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]
 \end{tabularx}
-\ExplSyntaxOn%
-\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
-\ExplSyntaxOff%
 
 \index[fn]{foobar@\texttt{foobar}}%
 
-\EmbracMakeKnown{texttt}%
-\EmbracMakeKnown{textbf}%
 \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]
 \end{tabularx}
-\ExplSyntaxOn%
-\cs_undefine:N{\embrac_textbf:nn}\cs_undefine:N{\embrac_orig_textbf:n}\cs_undefine:N{\__embrac_textbf:n}%
-\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
-\ExplSyntaxOff%
 
 \index[fn]{foobar@\texttt{foobar}}%
 
@@ -257,41 +243,27 @@ 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{\texttt{va{-}{-}{-}riable} code}}\EmbracOff{}}& 
[Special Form]
 \end{tabularx}
-\ExplSyntaxOn%
-\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
-\ExplSyntaxOff%
 
 \index[fn]{foobar@\texttt{foobar}}%
 
-\EmbracMakeKnown{texttt}%
 \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]
 \end{tabularx}
-\ExplSyntaxOn%
-\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
-\ExplSyntaxOff%
 
 \index[fn]{foobar@\texttt{foobar}}%
 
-\EmbracMakeKnown{texttt}%
-\EmbracMakeKnown{textbf}%
 \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]
 \end{tabularx}
-\ExplSyntaxOn%
-\cs_undefine:N{\embrac_textbf:nn}\cs_undefine:N{\embrac_orig_textbf:n}\cs_undefine:N{\__embrac_textbf:n}%
-\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
-\ExplSyntaxOff%
 
 \index[fn]{foobar@\texttt{foobar}}%
 
@@ -356,15 +328,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{\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}%
-\ExplSyntaxOff%
 
 
\index[fn]{\textbackslash{}f[font]@\texttt{\texttt{\textbackslash{}f[}\textnormal{\textsl{font}}\texttt{]}}}%
 
@@ -383,27 +351,19 @@ 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{[} \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}%
-\ExplSyntaxOff%
 
 \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{[]} \texttt{[]} \texttt{[]} 
\EmbracOff{}\textnormal{\textsl{[]}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{[]}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{\textsl{[]}}}\EmbracOn{}}}\EmbracOff{}}& 
[Special Form]
 \end{tabularx}
-\ExplSyntaxOn%
-\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
-\ExplSyntaxOff%
 
 \index[fn]{foobar@\texttt{foobar}}%
 \begin{quote}
@@ -506,15 +466,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 \texttt{int} 
\texttt{a{-}{-}b} \GNUTexinfocommandstyletextvar{v--ar1}, word \texttt{{-}{-}} 
(\texttt{type o{-}{-}ther}, \GNUTexinfocommandstyletextvar{v---ar2}  
[\texttt{float} [\GNUTexinfocommandstyletextvar{var4}]])}}\EmbracOff{}}& 
[Category]
 \end{tabularx}
-\ExplSyntaxOn%
-\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
-\ExplSyntaxOff%
 
 \index[fn]{name@\texttt{name}}%
 \begin{quote}
diff --git a/tp/t/results/converters_tests/frenchspacing_and_code.pl 
b/tp/t/results/converters_tests/frenchspacing_and_code.pl
index f6b9201c51..cb542f2ea7 100644
--- a/tp/t/results/converters_tests/frenchspacing_and_code.pl
+++ b/tp/t/results/converters_tests/frenchspacing_and_code.pl
@@ -2547,15 +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} \\texttt{vcode?\\ is:\\ 
a}}}\\EmbracOff{}}& [vcat: r. z on \\texttt{vclass:\\ MyC.\\ u}]
 \\end{tabularx}
-\\ExplSyntaxOn%
-\\cs_undefine:N{\\embrac_texttt:nn}\\cs_undefine:N{\\embrac_orig_texttt:n}\\cs_undefine:N{\\__embrac_texttt:n}%
-\\ExplSyntaxOff%
 
 \\index[fn]{vname? n; d on vclass: MyC. u@\\texttt{vname?\\ n;\\ d\\ on 
vclass:\\ MyC.\\ u}}%
 \\begin{quote}
@@ -2590,15 +2586,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} \\texttt{vcode?\\ is:\\ 
a}}}\\EmbracOff{}}& [vcat: r. z on \\texttt{nvclass:\\ MyC.\\ u}]
 \\end{tabularx}
-\\ExplSyntaxOn%
-\\cs_undefine:N{\\embrac_texttt:nn}\\cs_undefine:N{\\embrac_orig_texttt:n}\\cs_undefine:N{\\__embrac_texttt:n}%
-\\ExplSyntaxOff%
 
 \\index[fn]{vname? n; d on nvclass: MyC. u@\\texttt{vname?\\ n;\\ d\\ on 
nvclass:\\ MyC.\\ u}}%
 \\begin{quote}