#include "insetbox.h"
-#include "BufferView.h"
+#include "cursor.h"
#include "dispatchresult.h"
#include "debug.h"
#include "funcrequest.h"
#include "paragraph.h"
#include "support/std_sstream.h"
+#include "support/translator.h"
using std::auto_ptr;
using std::string;
namespace {
+typedef Translator<std::string, InsetBox::BoxType> BoxTranslator;
+
BoxTranslator const init_boxtranslator() {
BoxTranslator translator("Boxed", InsetBox::Boxed);
translator.addPair("Frameless", InsetBox::Frameless);
InsetBox::~InsetBox()
{
- InsetBoxMailer mailer(*this);
- mailer.hideDialog();
+ InsetBoxMailer(*this).hideDialog();
}
BoxType btype = boxtranslator().find(params_.type);
if (btype == Frameless) {
if (params_.use_parbox)
- setLabel(_("Parbox"));
+ setLabel(_("Box") + " (" + _("Parbox") + ")");
else
- setLabel(_("Minipage"));
+ setLabel(_("Box") + " (" + _("Minipage") + ")");
} else
- setLabel(boxtranslator_loc().find(btype));
+ setLabel(_("Box") + " (" + boxtranslator_loc().find(btype) + ")");
font.setColor(LColor::foreground);
setBackgroundColor(LColor::background);
}
-void InsetBox::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetBox::metrics(MetricsInfo & m, Dimension & dim) const
{
+ MetricsInfo mi = m;
+ mi.base.textwidth = params_.width.inPixels(m.base.textwidth);
InsetCollapsable::metrics(mi, dim);
- if (params_.inner_box && isOpen())
- dim.wid = mi.base.textwidth;
+ //if (params_.inner_box && isOpen())
+ // dim.wid = mi.base.textwidth;
dim_ = dim;
}
}
-DispatchResult
-InsetBox::priv_dispatch(FuncRequest const & cmd,
- idx_type & idx, pos_type & pos)
+void InsetBox::priv_dispatch(LCursor & cur, FuncRequest & cmd)
{
- BufferView * bv = cmd.view();
-
switch (cmd.action) {
case LFUN_INSET_MODIFY: {
+ lyxerr << "InsetBox::dispatch MODIFY" << endl;
InsetBoxMailer::string2params(cmd.argument, params_);
setButtonLabel();
- bv->updateInset(this);
- return DISPATCHED;
+ break;
}
+
case LFUN_INSET_DIALOG_UPDATE:
- InsetBoxMailer(*this).updateDialog(bv);
- return DISPATCHED;
+ InsetBoxMailer(*this).updateDialog(&cur.bv());
+ break;
case LFUN_MOUSE_RELEASE:
if (cmd.button() == mouse_button::button3 && hitButton(cmd)) {
- InsetBoxMailer(*this).showDialog(bv);
- return DISPATCHED;
+ InsetBoxMailer(*this).showDialog(&cur.bv());
+ break;
}
- // fallthrough:
+ InsetCollapsable::priv_dispatch(cur, cmd);
+ break;
default:
- return InsetCollapsable::priv_dispatch(cmd, idx, pos);
+ InsetCollapsable::priv_dispatch(cur, cmd);
+ break;
}
}
int InsetBox::latex(Buffer const & buf, ostream & os,
- LatexRunParams const & runparams) const
+ OutputParams const & runparams) const
{
BoxType btype = boxtranslator().find(params_.type);
i += 1;
}
- i += inset.latex(buf, os, runparams);
+ i += InsetText::latex(buf, os, runparams);
if (params_.inner_box) {
if (params_.use_parbox)
}
-int InsetBox::linuxdoc(Buffer const & buf, std::ostream & os) const
+int InsetBox::linuxdoc(Buffer const & buf, std::ostream & os,
+ OutputParams const & runparams) const
{
- return inset.linuxdoc(buf, os);
+ return InsetText::linuxdoc(buf, os, runparams);
}
-int InsetBox::docbook(Buffer const & buf, std::ostream & os, bool mixcont) const
+int InsetBox::docbook(Buffer const & buf, std::ostream & os,
+ OutputParams const & runparams) const
{
- return inset.docbook(buf, os, mixcont);
+ return InsetText::docbook(buf, os, runparams);
}
-int InsetBox::ascii(Buffer const & buf, std::ostream & os, int ll) const
+int InsetBox::plaintext(Buffer const & buf, std::ostream & os,
+ OutputParams const & runparams) const
{
- int i = 0;
- string const pt = params_.type;
- BoxType btype = boxtranslator().find(params_.type);
+ BoxType const btype = boxtranslator().find(params_.type);
+
switch (btype) {
- case Frameless:
- break;
- case Boxed:
- os << "[";
- break;
- case ovalbox:
- os << "(";
- break;
- case Ovalbox:
- os << "((";
- break;
- case Shadowbox:
- os << "[";
- break;
- case Doublebox:
- os << "[[";
- break;
+ case Frameless: break;
+ case Boxed: os << "["; break;
+ case ovalbox: os << "("; break;
+ case Ovalbox: os << "(("; break;
+ case Shadowbox: os << "["; break;
+ case Doublebox: os << "[["; break;
}
- i = inset.ascii(buf, os, ll);
+ int i = InsetText::plaintext(buf, os, runparams);
switch (btype) {
- case Frameless:
- break;
- case Boxed:
- os << "]";
- break;
- case ovalbox:
- os << ")";
- break;
- case Ovalbox:
- os << "))";
- break;
- case Shadowbox:
- os << "]/";
- break;
- case Doublebox:
- os << "]]";
- break;
+ case Frameless: break;
+ case Boxed: os << "]"; break;
+ case ovalbox: os << ")"; break;
+ case Ovalbox: os << "))"; break;
+ case Shadowbox: os << "]/"; break;
+ case Doublebox: os << "]]"; break;
}
return i;
features.require("fancybox");
break;
}
- inset.validate(features);
+ InsetText::validate(features);
}
InsetBoxMailer::InsetBoxMailer(InsetBox & inset)
: inset_(inset)
-{
-}
+{}
string const InsetBoxMailer::name_ = "box";
void InsetBoxMailer::string2params(string const & in,
- InsetBoxParams & params)
+ InsetBoxParams & params)
{
params = InsetBoxParams(string());
-
if (in.empty())
return;
LyXLex lex(0,0);
lex.setStream(data);
- string token;
- lex.next();
- token = lex.getString();
- lex.next();
+ string name;
+ lex >> name;
+ if (!lex || name != name_)
+ return print_mailer_error("InsetBoxMailer", in, 1, name_);
+
+ // This is part of the inset proper that is usually swallowed
+ // by LyXText::readInset
+ string id;
+ lex >> id;
+ if (!lex || id != "Box")
+ return print_mailer_error("InsetBoxMailer", in, 2, "Box");
params.read(lex);
}
void InsetBoxParams::write(ostream & os) const
{
- os << type << "\n";
+ os << "Box " << type << "\n";
os << "position \"" << pos << "\"\n";
os << "hor_pos \"" << hor_pos << "\"\n";
os << "has_inner_box " << inner_box << "\n";
void InsetBoxParams::read(LyXLex & lex)
{
+ if (!lex.isOK())
+ return;
+
if (lex.isOK()) {
+ lex.next();
type = lex.getString();
}
- string token;
if (!lex.isOK())
return;
lex.next();
+ string token;
token = lex.getString();
if (token == "position") {
lex.next();