anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-03 08:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not \protect label in subfloat caption (#11950)

Browse Source
This commit is contained in:
Juergen Spitzmueller 2020-08-28 07:32:29 +02:00
parent 3bd358a2f6
commit 3fc095e3bc
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/insets/InsetFloat.cpp
View File

@ -391,11 +391,11 @@ void InsetFloat::latex(otexstream & os, OutputParams const & runparams_in) const
OutputParams rp = runparams_in;
rp.moving_arg = true;
rp.inFloat = OutputParams::SUBFLOAT;
os << getCaption(rp);
os << '{';
// The main argument is the contents of the float. This is not a moving argument.
rp.moving_arg = false;
rp.inFloat = OutputParams::SUBFLOAT;
InsetText::latex(os, rp);
os << "}";

5
src/insets/InsetLabel.cpp
View File

@ -334,7 +334,10 @@ void InsetLabel::latex(otexstream & os, OutputParams const & runparams_in) const
if (runparams_in.postpone_fragile_stuff)
runparams_in.post_macro += command;
else {
if (runparams.moving_arg)
// protect label in moving argument (#9404),
// but not in subfloat caption (#11950)
if (runparams.moving_arg
&& runparams.inFloat != OutputParams::SUBFLOAT)
os << "\\protect";
os << command;
}