#include "Lexer.h"
#include "MetricsInfo.h"
#include "output_xhtml.h"
+#include "TexRow.h"
+#include "texstream.h"
#include "TextClass.h"
#include "support/debug.h"
label = bformat(_("%1$s (%2$s, %3$s)"),
type, inner, frame);
setLabel(label);
+
+ // set the frame color for the inset if the type is Boxed
+ if (btype == Boxed)
+ setFrameColor(lcolor.getFromLaTeXName(params_.framecolor));
+ else
+ setFrameColor(Color_collapsableframe);
}
bool InsetBox::hasFixedWidth() const
{
- return !params_.width.empty();
+ return !params_.width.empty() && params_.special == "none";
}
// we only support background color for 3 types
if (params_.type != "Shaded" && params_.type != "Frameless" && params_.type != "Boxed")
return getLayout().bgcolor();
+
if (params_.type == "Shaded") {
// FIXME: This hardcoded color is a hack!
if (buffer().params().boxbgcolor == lyx::rgbFromHexName("#ff0000"))
return getLayout().bgcolor();
-
+
ColorCode c = lcolor.getFromLyXName("boxbgcolor");
if (c == Color_none)
return getLayout().bgcolor();
return c;
- } else {
- if (params_.backgroundcolor == "none")
- return getLayout().bgcolor();
- ColorCode boxbackground = lcolor.getFromLyXName(params_.backgroundcolor);
- return boxbackground;
}
+
+ if (params_.backgroundcolor != "none")
+ return lcolor.getFromLaTeXName(params_.backgroundcolor);
+
return getLayout().bgcolor();
}
+LyXAlignment InsetBox::contentAlignment() const
+{
+ if (!params_.use_makebox)
+ return LYX_ALIGN_NONE;
+
+ // The default value below is actually irrelevant
+ LyXAlignment align = LYX_ALIGN_NONE;
+ switch (params_.hor_pos) {
+ case 'l':
+ align = LYX_ALIGN_LEFT;
+ break;
+ case 'c':
+ align = LYX_ALIGN_CENTER;
+ break;
+ case 'r':
+ align = LYX_ALIGN_RIGHT;
+ break;
+ case 's':
+ align = LYX_ALIGN_BLOCK;
+ break;
+ }
+ return align;
+}
+
+
void InsetBox::doDispatch(Cursor & cur, FuncRequest & cmd)
{
switch (cmd.action()) {
return;
}
cur.recordUndoInset(this);
- if (change_type)
+ if (change_type) {
params_.type = cmd.getArg(1);
- else // if (for_box)
+ // set a makebox if there is no inner box but Frameless was exectued
+ // otherwise the result would be a non existent box (no inner AND outer box)
+ // (this was LyX bug 8712)
+ if (params_.type == "Frameless" && !params_.inner_box) {
+ params_.use_makebox = true;
+ params_.inner_box = true;
+ }
+ // handle the opposite case
+ if (params_.type == "Boxed" && params_.use_makebox) {
+ params_.use_makebox = false;
+ params_.inner_box = false;
+ }
+ } else
string2params(to_utf8(cmd.argument()), params_);
setButtonLabel();
break;
case Frameless:
break;
case Framed:
- if (!(thickness_string.find(defaultThick) != string::npos)) {
+ if (thickness_string != defaultThick) {
os << "{\\FrameRule " << from_ascii(thickness_string);
- if (!(separation_string.find(defaultSep) != string::npos))
+ if (separation_string != defaultSep)
os << "\\FrameSep " << from_ascii(separation_string);
}
- if (!(separation_string.find(defaultSep) != string::npos)
- && (thickness_string.find(defaultThick) != string::npos))
+ if (separation_string != defaultSep && thickness_string == defaultThick)
os << "{\\FrameSep " << from_ascii(separation_string);
os << "\\begin{framed}%\n";
break;
case Boxed:
- if (!(thickness_string.find(defaultThick) != string::npos)) {
+ if (thickness_string != defaultThick) {
os << "{\\fboxrule " << from_ascii(thickness_string);
- if (!(separation_string.find(defaultSep) != string::npos))
+ if (separation_string != defaultSep)
os << "\\fboxsep " << from_ascii(separation_string);
}
- if (!(separation_string.find(defaultSep) != string::npos)
- && (thickness_string.find(defaultThick) != string::npos))
+ if (separation_string != defaultSep && thickness_string == defaultThick)
os << "{\\fboxsep " << from_ascii(separation_string);
if (!params_.inner_box && !width_string.empty()) {
if (params_.framecolor != "black" || params_.backgroundcolor != "none") {
} else
os << '[' << from_ascii(width_string)
<< ']';
+ // default horizontal alignment is 'c'
if (params_.hor_pos != 'c')
os << "[" << params_.hor_pos << "]";
} else {
os << "{";
break;
case ovalbox:
- if (!separation_string.empty() && separation_string.find(defaultSep) == string::npos)
+ if (!separation_string.empty() && separation_string != defaultSep)
os << "{\\fboxsep " << from_ascii(separation_string);
os << "\\ovalbox{";
break;
case Ovalbox:
- if (!separation_string.empty() && separation_string.find(defaultSep) == string::npos)
+ if (!separation_string.empty() && separation_string != defaultSep)
os << "{\\fboxsep " << from_ascii(separation_string);
os << "\\Ovalbox{";
break;
case Shadowbox:
- if (!(thickness_string.find(defaultThick) != string::npos)) {
+ if (thickness_string != defaultThick) {
os << "{\\fboxrule " << from_ascii(thickness_string);
- if (!(separation_string.find(defaultSep) != string::npos)) {
+ if (separation_string != defaultSep) {
os << "\\fboxsep " << from_ascii(separation_string);
- if (!(shadowsize_string.find(defaultShadow) != string::npos))
+ if (shadowsize_string != defaultShadow)
os << "\\shadowsize " << from_ascii(shadowsize_string);
}
- if (!(shadowsize_string.find(defaultShadow) != string::npos)
- && (separation_string.find(defaultSep) != string::npos))
+ if (shadowsize_string != defaultShadow && separation_string == defaultSep)
os << "\\shadowsize " << from_ascii(shadowsize_string);
}
- if (!(separation_string.find(defaultSep) != string::npos)
- && (thickness_string.find(defaultThick) != string::npos)) {
+ if (separation_string != defaultSep && thickness_string == defaultThick) {
os << "{\\fboxsep " << from_ascii(separation_string);
- if (!(shadowsize_string.find(defaultShadow) != string::npos))
+ if (shadowsize_string != defaultShadow)
os << "\\shadowsize " << from_ascii(shadowsize_string);
}
- if (!(shadowsize_string.find(defaultShadow) != string::npos)
- && (separation_string.find(defaultSep) != string::npos)
- && (thickness_string.find(defaultThick) != string::npos))
+ if (shadowsize_string != defaultShadow
+ && separation_string == defaultSep
+ && thickness_string == defaultThick)
os << "{\\shadowsize " << from_ascii(shadowsize_string);
os << "\\shadowbox{";
break;
// it is inside a minipage or parbox
break;
case Doublebox:
- if (!(thickness_string.find(defaultThick) != string::npos)) {
+ if (thickness_string != defaultThick) {
os << "{\\fboxrule " << from_ascii(thickness_string);
- if (!(separation_string.find(defaultSep) != string::npos))
+ if (separation_string != defaultSep)
os << "\\fboxsep " << from_ascii(separation_string);
}
- if (!(separation_string.find(defaultSep) != string::npos)
- && (thickness_string.find(defaultThick) != string::npos))
+ if (separation_string != defaultSep && thickness_string == defaultThick)
os << "{\\fboxsep " << from_ascii(separation_string);
os << "\\doublebox{";
break;
if (!width_string.empty()) {
if (params_.backgroundcolor != "none")
os << "\\colorbox{" << params_.backgroundcolor << "}{";
- os << "\\makebox{";
+ os << "\\makebox";
// FIXME UNICODE
// output the width and horizontal position
if (params_.special != "none") {
os << "[" << params_.hor_pos << "]";
} else {
if (params_.backgroundcolor != "none")
- os << "\\colorbox{" << params_.backgroundcolor << "}{";
+ os << "\\colorbox{" << params_.backgroundcolor << "}";
else
- os << "\\mbox{";
+ os << "\\mbox";
}
+ os << "{";
}
else {
if (params_.backgroundcolor != "none" && btype == Frameless)
os << "\\begin{shaded}%\n";
}
- // \framebox and \makebox handle hor_pos their own way
- // hor_pos is senseless for \mbox and \fbox
- if (!(params_.use_makebox)
- && !(btype == Boxed && !params_.inner_box)) {
- switch (params_.hor_pos) {
- case 'l':
- // do nothing because this is LaTeX's default
- break;
- case 'c':
- os << "\\centering ";
- break;
- case 'r':
- os << "\\raggedleft ";
- break;
- }
- }
-
InsetText::latex(os, runparams);
if (btype == Shaded)
break;
case Framed:
os << "\\end{framed}";
- if (!(separation_string.find(defaultSep) != string::npos)
- || !(thickness_string.find(defaultThick) != string::npos))
+ if (separation_string != defaultSep || thickness_string != defaultThick)
os << "}";
break;
case Boxed:
if (!params_.inner_box && !width_string.empty()
&& (params_.framecolor != "black" || params_.backgroundcolor != "none"))
os << "}";
- if (!(separation_string.find(defaultSep) != string::npos)
- || !(thickness_string.find(defaultThick) != string::npos))
+ if (separation_string != defaultSep || thickness_string != defaultThick)
os << "}";
break;
case ovalbox:
os << "}";
- if (!(separation_string.find(defaultSep) != string::npos))
+ if (separation_string != defaultSep)
os << "}";
break;
case Ovalbox:
os << "}";
- if (!(separation_string.find(defaultSep) != string::npos))
+ if (separation_string != defaultSep)
os << "}";
break;
case Doublebox:
os << "}";
- if (!(separation_string.find(defaultSep) != string::npos)
- || !(thickness_string.find(defaultThick) != string::npos))
+ if (separation_string != defaultSep || thickness_string != defaultThick)
os << "}";
break;
case Shadowbox:
os << "}";
- if (!(separation_string.find(defaultSep) != string::npos)
- || !(thickness_string.find(defaultThick) != string::npos)
- || !(shadowsize_string.find(defaultShadow) != string::npos))
+ if (separation_string != defaultSep
+ || thickness_string != defaultThick
+ || shadowsize_string != defaultShadow)
os << "}";
break;
case Shaded:
projects / lyx.git / blobdiff