#include "Buffer.h"
#include "BufferParams.h"
#include "BufferView.h"
+#include "ColorSet.h"
#include "Cursor.h"
#include "DispatchResult.h"
#include "FuncStatus.h"
BoxTranslator const & boxtranslator()
{
- static BoxTranslator translator = initBoxtranslator();
+ static BoxTranslator const translator = initBoxtranslator();
return translator;
}
BoxTranslatorLoc const & boxtranslator_loc()
{
- static BoxTranslatorLoc translator = initBoxtranslatorLoc();
+ static BoxTranslatorLoc const translator = initBoxtranslatorLoc();
return translator;
}
{}
-docstring InsetBox::name() const
+docstring InsetBox::layoutName() const
{
// FIXME: UNICODE
- string name = "Box";
- if (boxtranslator().find(params_.type) == Shaded)
- name += ":Shaded";
- return from_ascii(name);
+ return from_ascii("Box:" + params_.type);
}
bool InsetBox::hasFixedWidth() const
{
- return params_.inner_box || params_.special != "width";
+ return !params_.width.empty();
}
bool InsetBox::forcePlainLayout(idx_type) const
{
- return !params_.inner_box && params_.type != "Framed";
+ return (!params_.inner_box || params_.use_makebox)
+ && params_.type != "Shaded" && params_.type != "Framed";
+}
+
+
+ColorCode InsetBox::backgroundColor(PainterInfo const &) const
+{
+ if (params_.type != "Shaded")
+ return getLayout().bgcolor();
+ // 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;
}
case LFUN_INSET_MODIFY: {
//lyxerr << "InsetBox::dispatch MODIFY" << endl;
- if (cmd.getArg(0) == "changetype")
+ string const first_arg = cmd.getArg(0);
+ bool const change_type = first_arg == "changetype";
+ bool const for_box = first_arg == "box";
+ if (!change_type && !for_box) {
+ // not for us
+ // this will not be handled higher up
+ cur.undispatched();
+ return;
+ }
+ cur.recordUndoInset(ATOMIC_UNDO, this);
+ if (change_type)
params_.type = cmd.getArg(1);
- else
+ else // if (for_box)
string2params(to_utf8(cmd.argument()), params_);
setButtonLabel();
break;
{
switch (cmd.action()) {
- case LFUN_INSET_MODIFY:
- if (cmd.getArg(0) == "changetype")
- flag.setOnOff(cmd.getArg(1) == params_.type);
- flag.setEnabled(true);
- return true;
+ case LFUN_INSET_MODIFY: {
+ string const first_arg = cmd.getArg(0);
+ if (first_arg == "changetype") {
+ string const type = cmd.getArg(1);
+ flag.setOnOff(type == params_.type);
+ flag.setEnabled(!params_.inner_box || type != "Framed");
+ return true;
+ }
+ if (first_arg == "box") {
+ flag.setEnabled(true);
+ return true;
+ }
+ return InsetCollapsable::getStatus(cur, cmd, flag);
+ }
case LFUN_INSET_DIALOG_UPDATE:
flag.setEnabled(true);
return true;
- case LFUN_BREAK_PARAGRAPH:
- if (params_.inner_box || params_.type == "Framed")
+ case LFUN_PARAGRAPH_BREAK:
+ if ((params_.inner_box && !params_.use_makebox)
+ || params_.type == "Shaded" || params_.type == "Framed")
return InsetCollapsable::getStatus(cur, cmd, flag);
flag.setEnabled(false);
return true;
}
-int InsetBox::latex(odocstream & os, OutputParams const & runparams) const
+void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
{
BoxType btype = boxtranslator().find(params_.type);
string width_string = params_.width.asLatexString();
bool stdwidth = false;
+ // FIXME: do not test explicitely values of width_string
if (params_.inner_box &&
(width_string.find("1.0\\columnwidth") != string::npos
|| width_string.find("1.0\\textwidth") != string::npos)) {
}
}
- int i = 0;
- os << "%\n";
+ os << safebreakln;
+ if (runparams.lastid != -1)
+ os.texrow().start(runparams.lastid, runparams.lastpos);
+
// Adapt to column/text width correctly also if paragraphs indented:
if (stdwidth)
os << "\\noindent";
break;
case Framed:
os << "\\begin{framed}%\n";
- i += 1;
break;
case Boxed:
- os << "\\framebox";
- if (!params_.inner_box) {
- // Special widths, see usrguide ยง3.5
- // FIXME UNICODE
- if (params_.special != "none") {
- os << "[" << params_.width.value()
- << '\\' << from_utf8(params_.special)
- << ']';
+ if (!width_string.empty()) {
+ if (!params_.inner_box) {
+ os << "\\framebox";
+ // Special widths, see usrguide sec. 3.5
+ // FIXME UNICODE
+ 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 << "]";
} else
- os << '[' << from_ascii(width_string)
- << ']';
- if (params_.hor_pos != 'c')
- os << "[" << params_.hor_pos << "]";
- }
+ os << "\\fbox";
+ } else
+ os << "\\fbox";
os << "{";
break;
case ovalbox:
os << "\\shadowbox{";
break;
case Shaded:
- // later
+ // must be set later because e.g. the width settings only work when
+ // it is inside a minipage or parbox
break;
case Doublebox:
os << "\\doublebox{";
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)
- << ']';
+ if (!width_string.empty()) {
+ 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 << "]";
} else
- os << '[' << from_ascii(width_string)
- << ']';
- if (params_.hor_pos != 'c')
- os << "[" << params_.hor_pos << "]";
+ os << "\\mbox";
os << "{";
}
else
}
os << "%\n";
- ++i;
} // end if inner_box
if (btype == Shaded) {
os << "\\begin{shaded}%\n";
- ++i;
}
- i += InsetText::latex(os, runparams);
+ InsetText::latex(os, runparams);
if (btype == Shaded)
os << "\\end{shaded}";
// already done
break;
}
-
- i += 2;
-
- return i;
}
-int InsetBox::plaintext(odocstream & os, OutputParams const & runparams) const
+int InsetBox::plaintext(odocstringstream & os,
+ OutputParams const & runparams, size_t max_length) const
{
BoxType const btype = boxtranslator().find(params_.type);
break;
}
- InsetText::plaintext(os, runparams);
+ InsetText::plaintext(os, runparams, max_length);
int len = 0;
switch (btype) {
// construct attributes
string attrs = "class='" + params_.type + "'";
string style;
- if (!params_.width.empty())
- style += ("width: " + params_.width.asHTMLString() + "; ");
+ if (!params_.width.empty()) {
+ string w = params_.width.asHTMLString();
+ if (w != "100%")
+ style += ("width: " + params_.width.asHTMLString() + "; ");
+ }
// The special heights don't really mean anything for us.
if (!params_.height.empty() && params_.height_special == "none")
style += ("height: " + params_.height.asHTMLString() + "; ");
}
-docstring InsetBox::contextMenu(BufferView const &, int, int) const
+string InsetBox::contextMenuName() const
{
- return from_ascii("context-box");
+ return "context-box";
}
void InsetBox::string2params(string const & in, InsetBoxParams & params)
{
- params = InsetBoxParams(string());
if (in.empty())
return;
"Expected arg 2 to be \"Box\"\n");
}
+ params = InsetBoxParams(string());
params.read(lex);
}
projects / lyx.git / blobdiff