#include "InsetBox.h"
+#include "Buffer.h"
+#include "BufferParams.h"
#include "BufferView.h"
#include "Cursor.h"
#include "DispatchResult.h"
-#include "debug.h"
#include "FuncStatus.h"
#include "FuncRequest.h"
-#include "gettext.h"
+#include "support/gettext.h"
#include "LaTeXFeatures.h"
-#include "Color.h"
#include "Lexer.h"
#include "MetricsInfo.h"
-#include "Paragraph.h"
-#include "TextMetrics.h"
+#include "TextClass.h"
+#include "support/debug.h"
#include "support/Translator.h"
#include <sstream>
+using namespace std;
namespace lyx {
-using std::auto_ptr;
-using std::string;
-using std::istringstream;
-using std::ostream;
-using std::ostringstream;
-using std::endl;
-
-
namespace {
-typedef Translator<std::string, InsetBox::BoxType> BoxTranslator;
+typedef Translator<string, InsetBox::BoxType> BoxTranslator;
typedef Translator<docstring, InsetBox::BoxType> BoxTranslatorLoc;
BoxTranslator const init_boxtranslator()
{
BoxTranslator translator("Boxed", InsetBox::Boxed);
translator.addPair("Frameless", InsetBox::Frameless);
+ translator.addPair("Framed", InsetBox::Framed);
translator.addPair("ovalbox", InsetBox::ovalbox);
translator.addPair("Ovalbox", InsetBox::Ovalbox);
translator.addPair("Shadowbox", InsetBox::Shadowbox);
+ translator.addPair("Shaded", InsetBox::Shaded);
translator.addPair("Doublebox",InsetBox::Doublebox);
return translator;
}
BoxTranslatorLoc const init_boxtranslator_loc()
{
- BoxTranslatorLoc translator(_("Boxed"), InsetBox::Boxed);
- translator.addPair(_("Frameless"), InsetBox::Frameless);
- translator.addPair(_("ovalbox"), InsetBox::ovalbox);
- translator.addPair(_("Ovalbox"), InsetBox::Ovalbox);
- translator.addPair(_("Shadowbox"), InsetBox::Shadowbox);
- translator.addPair(_("Doublebox"), InsetBox::Doublebox);
+ BoxTranslatorLoc translator(_("simple frame"), InsetBox::Boxed);
+ translator.addPair(_("frameless"), InsetBox::Frameless);
+ translator.addPair(_("simple frame, page breaks"), InsetBox::Framed);
+ translator.addPair(_("oval, thin"), InsetBox::ovalbox);
+ translator.addPair(_("oval, thick"), InsetBox::Ovalbox);
+ translator.addPair(_("drop shadow"), InsetBox::Shadowbox);
+ translator.addPair(_("shaded background"), InsetBox::Shaded);
+ translator.addPair(_("double frame"), InsetBox::Doublebox);
return translator;
}
} // anon
-void InsetBox::init()
-{
- setInsetName(from_ascii("Box"));
- setButtonLabel();
-}
-
-
InsetBox::InsetBox(BufferParams const & bp, string const & label)
: InsetCollapsable(bp), params_(label)
{
- init();
+ if (forceEmptyLayout())
+ paragraphs().back().setLayout(bp.getTextClass().emptyLayout());
}
InsetBox::InsetBox(InsetBox const & in)
: InsetCollapsable(in), params_(in.params_)
-{
- init();
-}
+{}
InsetBox::~InsetBox()
}
-auto_ptr<InsetBase> InsetBox::doClone() const
+Inset * InsetBox::clone() const
{
- return auto_ptr<InsetBase>(new InsetBox(*this));
+ return new InsetBox(*this);
}
}
+docstring InsetBox::name() const
+{
+ // FIXME: UNICODE
+ string name = string("Box");
+ if (boxtranslator().find(params_.type) == Shaded)
+ name += string(":Shaded");
+ return from_ascii(name);
+}
+
+
void InsetBox::write(Buffer const & buf, ostream & os) const
{
params_.write(os);
{
params_.read(lex);
InsetCollapsable::read(buf, lex);
- setButtonLabel();
}
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(Color::foreground);
- setBackgroundColor(Color::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;
}
-bool InsetBox::forceDefaultParagraphs(idx_type) const
+bool InsetBox::forceEmptyLayout() const
{
return !params_.inner_box;
}
case LFUN_INSET_MODIFY: {
//lyxerr << "InsetBox::dispatch MODIFY" << endl;
InsetBoxMailer::string2params(to_utf8(cmd.argument()), params_);
- setButtonLabel();
+ setLayout(cur.buffer().params());
break;
}
}
+bool InsetBox::isMacroScope(Buffer const &) const
+{
+ BoxType btype = boxtranslator().find(params_.type);
+ return btype != Frameless || params_.inner_box;
+}
+
+
int InsetBox::latex(Buffer const & buf, odocstream & os,
- OutputParams const & runparams) const
+ OutputParams const & runparams) const
{
BoxType btype = boxtranslator().find(params_.type);
stdwidth = true;
switch (btype) {
case Frameless:
+ case Framed:
break;
case Boxed:
+ case Shaded:
width_string += " - 2\\fboxsep - 2\\fboxrule";
break;
case ovalbox:
width_string += " - 2\\fboxsep - 2\\fboxrule"/* "-\\shadowsize"*/;
break;
case Doublebox:
- width_string += " - 2\\fboxsep - 7.5\\fboxrule - 1.0pt";
+ width_string += " - 2\\fboxsep - 7.5\\fboxrule - 1pt";
break;
}
}
switch (btype) {
case Frameless:
break;
+ case Framed:
+ os << "\\begin{framed}%\n";
+ i += 1;
+ break;
case Boxed:
os << "\\framebox";
if (!params_.inner_box) {
case Shadowbox:
os << "\\shadowbox{";
break;
+ case Shaded:
+ // later
+ break;
case Doublebox:
os << "\\doublebox{";
break;
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 << "]";
os << "%\n";
i += 1;
}
+ if (btype == Shaded)
+ os << "\\begin{shaded}%\n";
+ i += 1;
i += InsetText::latex(buf, os, runparams);
+ if (btype == Shaded)
+ os << "\\end{shaded}";
+
if (params_.inner_box) {
if (params_.use_parbox)
os << "%\n}";
switch (btype) {
case Frameless:
break;
+ case Framed:
+ os << "\\end{framed}";
+ break;
case Boxed:
if (!params_.inner_box)
os << "}"; // for makebox
case Shadowbox:
os << "}";
break;
+ case Shaded:
+ // already done
+ break;
}
- os << "%\n";
- i += 3;
+ i += 2;
return i;
}
int InsetBox::plaintext(Buffer const & buf, odocstream & os,
- OutputParams const & runparams) const
+ OutputParams const & runparams) const
{
BoxType const btype = boxtranslator().find(params_.type);
switch (btype) {
- case Frameless: break;
- case Boxed: os << "[\n"; break;
- case ovalbox: os << "(\n"; break;
- case Ovalbox: os << "((\n"; break;
- case Shadowbox: os << "[/\n"; break;
- case Doublebox: os << "[[\n"; break;
+ case Frameless:
+ break;
+ case Framed:
+ case Boxed:
+ os << "[\n";
+ break;
+ case ovalbox:
+ os << "(\n";
+ break;
+ case Ovalbox:
+ os << "((\n";
+ break;
+ case Shadowbox:
+ case Shaded:
+ os << "[/\n";
+ break;
+ case Doublebox:
+ os << "[[\n";
+ break;
}
InsetText::plaintext(buf, os, runparams);
int len = 0;
switch (btype) {
- case Frameless: os << "\n"; break;
- case Boxed: os << "\n]"; len = 1; break;
- case ovalbox: os << "\n)"; len = 1; break;
- case Ovalbox: os << "\n))"; len = 2; break;
- case Shadowbox: os << "\n/]"; len = 2; break;
- case Doublebox: os << "\n]]"; len = 2; break;
+ case Frameless:
+ os << "\n";
+ break;
+ case Framed:
+ case Boxed:
+ os << "\n]";
+ len = 1;
+ break;
+ case ovalbox:
+ os << "\n)";
+ len = 1;
+ break;
+ case Ovalbox:
+ os << "\n))";
+ len = 2;
+ break;
+ case Shadowbox:
+ case Shaded:
+ os << "\n/]";
+ len = 2;
+ break;
+ case Doublebox:
+ os << "\n]]";
+ len = 2;
+ break;
}
return PLAINTEXT_NEWLINE + len; // len chars on a separate line
int InsetBox::docbook(Buffer const & buf, odocstream & os,
- OutputParams const & runparams) const
+ OutputParams const & runparams) const
{
return InsetText::docbook(buf, os, runparams);
}
switch (btype) {
case Frameless:
break;
+ case Framed:
+ features.require("framed");
+ break;
case Boxed:
features.require("calc");
break;
features.require("calc");
features.require("fancybox");
break;
+ case Shaded:
+ features.require("color");
+ features.require("framed");
+ break;
}
InsetText::validate(features);
}
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);
projects / lyx.git / blobdiff