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

Fix coloured boxes in RTL with [pdf]latex (#8642)

Browse Source
This commit is contained in:
Juergen Spitzmueller 2019-08-15 16:21:13 +02:00
parent 4e74dd0d42
commit 7ca267e1fe
1 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/insets/InsetBox.cpp
View File

@ -350,6 +350,14 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
string shadowsize_string = params_.shadowsize.asLatexString(); string shadowsize_string = params_.shadowsize.asLatexString();
bool stdwidth = false; bool stdwidth = false;
string const cprotect = hasCProtectContent(runparams.moving_arg) ? "\\cprotect" : string(); string const cprotect = hasCProtectContent(runparams.moving_arg) ? "\\cprotect" : string();
// Colored boxes in RTL need to be wrapped into \beginL...\endL
string maybeBeginL;
string maybeEndL;
bool needEndL = false;
if (!runparams.isFullUnicode() && runparams.local_font->isRightToLeft()) {
maybeBeginL = "\\beginL";
maybeEndL = "\\endL";
}
// in general the overall width of some decorated boxes is wider thean the inner box // in general the overall width of some decorated boxes is wider thean the inner box
// we could therefore calculate the real width for all sizes so that if the user wants // we could therefore calculate the real width for all sizes so that if the user wants
// e.g. 0.1\columnwidth or 2cm he gets exactly this size // e.g. 0.1\columnwidth or 2cm he gets exactly this size
@ -421,8 +429,9 @@ 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 << "\\fcolorbox{" << params_.framecolor << "}{" << params_.backgroundcolor << "}{"; os << maybeBeginL << "\\fcolorbox{" << params_.framecolor << "}{" << params_.backgroundcolor << "}{";
os << "\\makebox"; os << "\\makebox";
needEndL = !maybeBeginL.empty();
} else } else
os << "\\framebox"; os << "\\framebox";
// Special widths, see usrguide sec. 3.5 // Special widths, see usrguide sec. 3.5
@ -438,9 +447,10 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
if (params_.hor_pos != 'c') if (params_.hor_pos != 'c')
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 << "\\fcolorbox{" << params_.framecolor << "}{" << params_.backgroundcolor << "}"; os << maybeBeginL << "\\fcolorbox{" << params_.framecolor << "}{" << params_.backgroundcolor << "}";
else { needEndL = !maybeBeginL.empty();
} else {
if (!cprotect.empty() && contains(runparams.active_chars, '^')) { if (!cprotect.empty() && contains(runparams.active_chars, '^')) {
// cprotect relies on ^ being on catcode 7 // cprotect relies on ^ being on catcode 7
os << "\\begingroup\\catcode`\\^=7"; os << "\\begingroup\\catcode`\\^=7";
@ -486,6 +496,8 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
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
// it is inside a minipage or parbox // it is inside a minipage or parbox
os << maybeBeginL;
needEndL = !maybeBeginL.empty();
break; break;
case Doublebox: case Doublebox:
if (thickness_string != defaultThick) { if (thickness_string != defaultThick) {
@ -501,13 +513,17 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
if (params_.inner_box) { if (params_.inner_box) {
if (params_.use_parbox) { if (params_.use_parbox) {
if (params_.backgroundcolor != "none" && btype == Frameless) if (params_.backgroundcolor != "none" && btype == Frameless) {
os << "\\colorbox{" << params_.backgroundcolor << "}{"; os << maybeBeginL << "\\colorbox{" << params_.backgroundcolor << "}{";
needEndL = !maybeBeginL.empty();
}
os << "\\parbox"; os << "\\parbox";
} else if (params_.use_makebox) { } else if (params_.use_makebox) {
if (!width_string.empty()) { if (!width_string.empty()) {
if (params_.backgroundcolor != "none") if (params_.backgroundcolor != "none") {
os << "\\colorbox{" << params_.backgroundcolor << "}{"; os << maybeBeginL << "\\colorbox{" << params_.backgroundcolor << "}{";
needEndL = !maybeBeginL.empty();
}
os << "\\makebox"; os << "\\makebox";
// FIXME UNICODE // FIXME UNICODE
// output the width and horizontal position // output the width and horizontal position
@ -521,16 +537,20 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
if (params_.hor_pos != 'c') if (params_.hor_pos != 'c')
os << "[" << params_.hor_pos << "]"; os << "[" << params_.hor_pos << "]";
} else { } else {
if (params_.backgroundcolor != "none") if (params_.backgroundcolor != "none") {
os << "\\colorbox{" << params_.backgroundcolor << "}"; os << maybeBeginL << "\\colorbox{" << params_.backgroundcolor << "}";
needEndL = !maybeBeginL.empty();
}
else else
os << "\\mbox"; os << "\\mbox";
} }
os << "{"; os << "{";
} }
else { else {
if (params_.backgroundcolor != "none" && btype == Frameless) if (params_.backgroundcolor != "none" && btype == Frameless) {
os << "\\colorbox{" << params_.backgroundcolor << "}{"; os << maybeBeginL << "\\colorbox{" << params_.backgroundcolor << "}{";
needEndL = !maybeBeginL.empty();
}
os << "\\begin{minipage}"; os << "\\begin{minipage}";
} }
@ -589,7 +609,7 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
break; break;
case Framed: case Framed:
os << "\\end{framed}"; os << "\\end{framed}";
if (separation_string != defaultSep || thickness_string != defaultThick) if (separation_string != defaultSep || thickness_string != defaultThick)
os << "}"; os << "}";
break; break;
case Boxed: case Boxed:
@ -628,6 +648,8 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
// already done // already done
break; break;
} }
if (needEndL)
os << maybeEndL;
} }