#include "InsetBox.h"
+#include "Buffer.h"
#include "BufferView.h"
-#include "LCursor.h"
+#include "Cursor.h"
#include "DispatchResult.h"
#include "debug.h"
#include "FuncStatus.h"
#include "FuncRequest.h"
#include "gettext.h"
#include "LaTeXFeatures.h"
-#include "LColor.h"
#include "Lexer.h"
#include "MetricsInfo.h"
-#include "Paragraph.h"
-#include "TextMetrics.h"
#include "support/Translator.h"
namespace lyx {
-using std::auto_ptr;
using std::string;
using std::istringstream;
using std::ostream;
void InsetBox::init()
{
- setInsetName(from_ascii("Box"));
setButtonLabel();
}
}
-auto_ptr<InsetBase> InsetBox::doClone() const
+Inset * InsetBox::clone() const
{
- return auto_ptr<InsetBase>(new InsetBox(*this));
+ return new InsetBox(*this);
}
void InsetBox::setButtonLabel()
{
- LyXFont font(LyXFont::ALL_SANE);
- font.decSize();
- font.decSize();
-
BoxType btype = boxtranslator().find(params_.type);
docstring label;
label += ")";
setLabel(label);
-
- font.setColor(LColor::foreground);
- setBackgroundColor(LColor::background);
- setLabelFont(font);
}
}
-bool InsetBox::metrics(MetricsInfo & m, Dimension & dim) const
+void InsetBox::metrics(MetricsInfo & m, Dimension & dim) const
{
- MetricsInfo mi = m;
- // first round in order to know the minimum size.
- InsetCollapsable::metrics(mi, dim);
- TextMetrics & tm = mi.base.bv->textMetrics(&text_);
+ // back up textwidth.
+ int textwidth_backup = m.base.textwidth;
if (hasFixedWidth())
- mi.base.textwidth =
- std::max(tm.width() + 2 * border_ + (int) (2.5 * TEXT_TO_INSET_OFFSET),
- params_.width.inPixels(m.base.textwidth));
- InsetCollapsable::metrics(mi, dim);
- bool const changed = dim_ != dim;
- dim_ = dim;
- return changed;
+ m.base.textwidth = params_.width.inPixels(m.base.textwidth);
+ InsetCollapsable::metrics(m, dim);
+ // retore textwidth.
+ m.base.textwidth = textwidth_backup;
}
}
-void InsetBox::doDispatch(LCursor & cur, FuncRequest & cmd)
+void InsetBox::doDispatch(Cursor & cur, FuncRequest & cmd)
{
switch (cmd.action) {
case LFUN_INSET_MODIFY: {
//lyxerr << "InsetBox::dispatch MODIFY" << endl;
InsetBoxMailer::string2params(to_utf8(cmd.argument()), params_);
- setButtonLabel();
+ setLayout(cur.buffer().params());
break;
}
}
-bool InsetBox::getStatus(LCursor & cur, FuncRequest const & cmd,
+bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd,
FuncStatus & flag) const
{
switch (cmd.action) {
int InsetBox::latex(Buffer const & buf, odocstream & os,
- OutputParams const & runparams) const
+ OutputParams const & runparams) const
{
BoxType btype = boxtranslator().find(params_.type);
os << "[" << params_.pos << "]";
if (params_.height_special == "none") {
// FIXME UNICODE
- os << '[' << from_ascii(params_.height.asLatexString())
- << ']';
+ os << "[" << from_ascii(params_.height.asLatexString()) << "]";
} else {
// Special heights
- // FIXME UNICODE
- os << "[" << params_.height.value()
- << '\\' << from_utf8(params_.height_special)
- << ']';
+ // 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 << "]";
int InsetBox::plaintext(Buffer const & buf, odocstream & os,
- OutputParams const & runparams) const
+ OutputParams const & runparams) const
{
BoxType const btype = boxtranslator().find(params_.type);
int InsetBox::docbook(Buffer const & buf, odocstream & os,
- OutputParams const & runparams) const
+ OutputParams const & runparams) const
{
return InsetText::docbook(buf, os, runparams);
}
return print_mailer_error("InsetBoxMailer", in, 1, name_);
// This is part of the inset proper that is usually swallowed
- // by LyXText::readInset
+ // by Text::readInset
string id;
lex >> id;
if (!lex || id != "Box")
: type(label),
use_parbox(false),
inner_box(true),
- width(LyXLength("100col%")),
+ width(Length("100col%")),
special("none"),
pos('t'),
hor_pos('c'),
inner_pos('t'),
- height(LyXLength("1in")),
+ height(Length("1in")),
height_special("totalheight") // default is 1\\totalheight
{}
return;
if (token == "width") {
lex.next();
- width = LyXLength(lex.getString());
+ width = Length(lex.getString());
} else {
lyxerr << "InsetBox::Read: Missing 'width'-tag!" << endl;
lex.pushToken(token);
return;
if (token == "height") {
lex.next();
- height = LyXLength(lex.getString());
+ height = Length(lex.getString());
} else {
lyxerr << "InsetBox::Read: Missing 'height'-tag!" << endl;
lex.pushToken(token);