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

Use \cprotect only for "simple frame" boxes

Browse Source 
Compilation succeeds with verbatim environments for the other types
of boxes without \cprotect.

For more details, see the following ML thread:

https://www.mail-archive.com/search?l=mid&q=20180418191915.pfqbyeq44g7newro%40steph
This commit is contained in:
Scott Kostyshak 2018-04-18 15:11:55 -04:00
parent 39a80e5656
commit 80fe0dbe7e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/insets/InsetBox.cpp
View File

@ -407,10 +407,10 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
os << "{\\fboxsep " << from_ascii(separation_string); os << "{\\fboxsep " << from_ascii(separation_string);
if (!params_.inner_box && !width_string.empty()) { if (!params_.inner_box && !width_string.empty()) {
if (params_.framecolor != "black" || params_.backgroundcolor != "none") { if (params_.framecolor != "black" || params_.backgroundcolor != "none") {
os << cprotect << "\\fcolorbox{" << params_.framecolor << "}{" << params_.backgroundcolor << "}{"; os << "\\fcolorbox{" << params_.framecolor << "}{" << params_.backgroundcolor << "}{";
os << "\\makebox"; os << "\\makebox";
} else } else
os << cprotect << "\\framebox"; os << "\\framebox";
// Special widths, see usrguide sec. 3.5 // Special widths, see usrguide sec. 3.5
// FIXME UNICODE // FIXME UNICODE
if (params_.special != "none") { if (params_.special != "none") {
@ -425,7 +425,7 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
os << "[" << params_.hor_pos << "]"; os << "[" << params_.hor_pos << "]";
} else { } else {
if (params_.framecolor != "black" || params_.backgroundcolor != "none") if (params_.framecolor != "black" || params_.backgroundcolor != "none")
os << cprotect << "\\fcolorbox{" << params_.framecolor << "}{" << params_.backgroundcolor << "}"; os << "\\fcolorbox{" << params_.framecolor << "}{" << params_.backgroundcolor << "}";
else else
os << cprotect << "\\fbox"; os << cprotect << "\\fbox";
} }
@ -434,12 +434,12 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
case ovalbox: case ovalbox:
if (!separation_string.empty() && separation_string != defaultSep) if (!separation_string.empty() && separation_string != defaultSep)
os << "{\\fboxsep " << from_ascii(separation_string); os << "{\\fboxsep " << from_ascii(separation_string);
os << cprotect << "\\ovalbox{"; os << "\\ovalbox{";
break; break;
case Ovalbox: case Ovalbox:
if (!separation_string.empty() && separation_string != defaultSep) if (!separation_string.empty() && separation_string != defaultSep)
os << "{\\fboxsep " << from_ascii(separation_string); os << "{\\fboxsep " << from_ascii(separation_string);
os << cprotect << "\\Ovalbox{"; os << "\\Ovalbox{";
break; break;
case Shadowbox: case Shadowbox:
if (thickness_string != defaultThick) { if (thickness_string != defaultThick) {
@ -461,7 +461,7 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
&& separation_string == defaultSep && separation_string == defaultSep
&& thickness_string == defaultThick) && thickness_string == defaultThick)
os << "{\\shadowsize " << from_ascii(shadowsize_string); os << "{\\shadowsize " << from_ascii(shadowsize_string);
os << cprotect << "\\shadowbox{"; os << "\\shadowbox{";
break; break;
case Shaded: case Shaded:
// must be set later because e.g. the width settings only work when // must be set later because e.g. the width settings only work when
@ -475,7 +475,7 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
} }
if (separation_string != defaultSep && thickness_string == defaultThick) if (separation_string != defaultSep && thickness_string == defaultThick)
os << "{\\fboxsep " << from_ascii(separation_string); os << "{\\fboxsep " << from_ascii(separation_string);
os << cprotect << "\\doublebox{"; os << "\\doublebox{";
break; break;
} }