if (params_.inner_box) {
if (params_.use_parbox)
inner = _("Parbox");
+ else if (params_.use_makebox)
+ inner = _("Makebox");
else
inner = _("Minipage");
}
bool InsetBox::forcePlainLayout(idx_type) const
{
- return !params_.inner_box && params_.type != "Framed";
+ return (!params_.inner_box || params_.use_makebox) && params_.type != "Shaded";
}
void InsetBox::doDispatch(Cursor & cur, FuncRequest & cmd)
{
- switch (cmd.action) {
+ switch (cmd.action()) {
case LFUN_INSET_MODIFY: {
//lyxerr << "InsetBox::dispatch MODIFY" << endl;
bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd,
FuncStatus & flag) const
{
- switch (cmd.action) {
+ switch (cmd.action()) {
case LFUN_INSET_MODIFY:
if (cmd.getArg(0) == "changetype")
return true;
case LFUN_BREAK_PARAGRAPH:
- if (params_.inner_box || params_.type == "Framed")
+ if ((params_.inner_box && !params_.use_makebox) || params_.type == "Shaded")
return InsetCollapsable::getStatus(cur, cmd, flag);
flag.setEnabled(false);
return true;
case Boxed:
os << "\\framebox";
if (!params_.inner_box) {
- os << "{\\makebox";
// Special widths, see usrguide ยง3.5
// FIXME UNICODE
if (params_.special != "none") {
if (params_.hor_pos != 'c')
os << "[" << params_.hor_pos << "]";
}
-
os << "{";
break;
case ovalbox:
if (params_.inner_box) {
if (params_.use_parbox)
os << "\\parbox";
+ else if (params_.use_makebox) {
+ os << "\\makebox";
+ // FIXME UNICODE
+ // output the width and horizontal position
+ if (params_.special != "none") {
+ os << "[" << params_.width.value()
+ << '\\' << from_utf8(params_.special)
+ << ']';
+ } else
+ os << '[' << from_ascii(width_string)
+ << ']';
+ if (params_.hor_pos != 'c')
+ os << "[" << params_.hor_pos << "]";
+ os << "{";
+ }
else
os << "\\begin{minipage}";
- os << "[" << params_.pos << "]";
- if (params_.height_special == "none") {
- // FIXME UNICODE
- os << "[" << from_ascii(params_.height.asLatexString()) << "]";
- } else {
- // Special heights
- // set no optional argument when the value is the default "1\height"
- // (special units like \height are handled as "in")
- // but when the user has chosen a non-default inner_pos, the height
- // must be given: \minipage[pos][height][inner-pos]{width}
- if ((params_.height != Length("1in") ||
- params_.height_special != "totalheight") ||
- params_.inner_pos != params_.pos) {
+ // output parameters for parbox and minipage
+ if (!params_.use_makebox) {
+ os << "[" << params_.pos << "]";
+ if (params_.height_special == "none") {
// FIXME UNICODE
- os << "[" << params_.height.value()
- << "\\" << from_utf8(params_.height_special) << "]";
+ os << "[" << from_ascii(params_.height.asLatexString()) << "]";
+ } else {
+ // Special heights
+ // set no optional argument when the value is the default "1\height"
+ // (special units like \height are handled as "in")
+ // but when the user has chosen a non-default inner_pos, the height
+ // must be given: \minipage[pos][height][inner-pos]{width}
+ if ((params_.height != Length("1in") ||
+ params_.height_special != "totalheight") ||
+ params_.inner_pos != params_.pos) {
+ // FIXME UNICODE
+ os << "[" << params_.height.value()
+ << "\\" << from_utf8(params_.height_special) << "]";
+ }
}
+ if (params_.inner_pos != params_.pos)
+ os << "[" << params_.inner_pos << "]";
+ // FIXME UNICODE
+ os << '{' << from_ascii(width_string) << '}';
+ if (params_.use_parbox)
+ os << "{";
}
- if (params_.inner_pos != params_.pos)
- os << "[" << params_.inner_pos << "]";
-
- // FIXME UNICODE
- os << '{' << from_ascii(width_string) << '}';
- if (params_.use_parbox)
- os << "{";
os << "%\n";
++i;
- }
+ } // end if inner_box
+
if (btype == Shaded) {
os << "\\begin{shaded}%\n";
++i;
os << "\\end{shaded}";
if (params_.inner_box) {
- if (params_.use_parbox)
+ if (params_.use_parbox || params_.use_makebox)
os << "%\n}";
else
os << "%\n\\end{minipage}";
os << "\\end{framed}";
break;
case Boxed:
- if (!params_.inner_box)
- os << "}"; // for makebox
os << "}";
break;
case ovalbox:
InsetBoxParams::InsetBoxParams(string const & label)
: type(label),
use_parbox(false),
+ use_makebox(false),
inner_box(true),
width(Length("100col%")),
special("none"),
os << "has_inner_box " << inner_box << "\n";
os << "inner_pos \"" << inner_pos << "\"\n";
os << "use_parbox " << use_parbox << "\n";
+ os << "use_makebox " << use_makebox << "\n";
os << "width \"" << width.asString() << "\"\n";
os << "special \"" << special << "\"\n";
os << "height \"" << height.asString() << "\"\n";
inner_box = false;
lex >> "inner_pos" >> inner_pos;
lex >> "use_parbox" >> use_parbox;
+ lex >> "use_makebox" >> use_makebox;
lex >> "width" >> width;
lex >> "special" >> special;
lex >> "height" >> height;