anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix backslash LaTeXifying in InsetCommand

Browse Source 
\ was transformed very early to \textbackslash{}, but then the following
routines escaped braces in the string, so we wrongly ended up in
\textbackslash\{\} and "\{} in the output
This commit is contained in:
Juergen Spitzmueller 2024-04-01 10:57:27 +02:00
parent 812e306dad
commit a020bbc4a8
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/insets/InsetCommandParams.cpp
View File

@ -455,7 +455,21 @@ docstring InsetCommandParams::prepareCommand(OutputParams const & runparams,
// LATEXIFY, ESCAPE and NONE are mutually exclusive // LATEXIFY, ESCAPE and NONE are mutually exclusive
if (handling & ParamInfo::HANDLING_LATEXIFY) { if (handling & ParamInfo::HANDLING_LATEXIFY) {
// First handle backslash // First handle backslash
result = subst(command, from_ascii("\\"), from_ascii("\\textbackslash{}")); // we cannot replace yet with \textbackslash{}
// as the braces would be erroneously escaped
// in the following routines ("\textbackslash\{\}").
// So create a unique placeholder which is replaced
// in the end.
docstring bs = from_ascii("@LyXBackslash@");
// We are super-careful and assure the placeholder
// does not exist in the string
for (int i = 0; ; ++i) {
if (!contains(command, bs)) {
result = subst(command, from_ascii("\\"), bs);
break;
}
bs = from_ascii("@LyXBackslash") + i + '@';
}
// Then get LaTeX macros // Then get LaTeX macros
pair<docstring, docstring> command_latexed = pair<docstring, docstring> command_latexed =
runparams.encoding->latexString(result, runparams.dryrun); runparams.encoding->latexString(result, runparams.dryrun);
@ -493,6 +507,8 @@ docstring InsetCommandParams::prepareCommand(OutputParams const & runparams,
result.replace(pos, 1, backslash + chars_escape[k] + term); result.replace(pos, 1, backslash + chars_escape[k] + term);
} }
} }
// set in real backslash now
result = subst(result, bs, from_ascii("\\textbackslash{}"));
} }
else if (handling & ParamInfo::HANDLING_ESCAPE) else if (handling & ParamInfo::HANDLING_ESCAPE)
result = escape(command); result = escape(command);