#include <sstream>
+
+namespace lyx {
+
using std::auto_ptr;
using std::string;
using std::istringstream;
namespace {
typedef Translator<std::string, InsetBox::BoxType> BoxTranslator;
+typedef Translator<docstring, InsetBox::BoxType> BoxTranslatorLoc;
-BoxTranslator const init_boxtranslator() {
+BoxTranslator const init_boxtranslator()
+{
BoxTranslator translator("Boxed", InsetBox::Boxed);
translator.addPair("Frameless", InsetBox::Frameless);
translator.addPair("ovalbox", InsetBox::ovalbox);
}
-BoxTranslator const init_boxtranslator_loc() {
- BoxTranslator translator(_("Boxed"), InsetBox::Boxed);
+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);
}
-BoxTranslator const & boxtranslator() {
+BoxTranslator const & boxtranslator()
+{
static BoxTranslator translator = init_boxtranslator();
return translator;
}
-BoxTranslator const & boxtranslator_loc() {
- static BoxTranslator translator = init_boxtranslator_loc();
+BoxTranslatorLoc const & boxtranslator_loc()
+{
+ static BoxTranslatorLoc translator = init_boxtranslator_loc();
return translator;
}
void InsetBox::init()
{
- setInsetName("Box");
+ setInsetName(from_ascii("Box"));
setButtonLabel();
}
}
-string const InsetBox::editMessage() const
+docstring const InsetBox::editMessage() const
{
return _("Opened Box Inset");
}
font.decSize();
BoxType btype = boxtranslator().find(params_.type);
+
+ docstring label;
+ label += _("Box");
+ label += " (";
if (btype == Frameless) {
if (params_.use_parbox)
- setLabel(_("Box") + " (" + _("Parbox") + ")");
+ label += _("Parbox");
else
- setLabel(_("Box") + " (" + _("Minipage") + ")");
+ label += _("Minipage");
} else
- setLabel(_("Box") + " (" + boxtranslator_loc().find(btype) + ")");
+ label += boxtranslator_loc().find(btype);
+ label += ")";
+
+ setLabel(label);
font.setColor(LColor::foreground);
setBackgroundColor(LColor::background);
}
-void InsetBox::metrics(MetricsInfo & m, Dimension & dim) const
+bool InsetBox::hasFixedWidth() const
+{
+ return params_.inner_box || params_.special != "width";
+}
+
+
+bool InsetBox::metrics(MetricsInfo & m, Dimension & dim) const
{
MetricsInfo mi = m;
- if (params_.inner_box || params_.special != "width")
+ if (hasFixedWidth())
mi.base.textwidth = params_.width.inPixels(m.base.textwidth);
InsetCollapsable::metrics(mi, dim);
+ bool const changed = dim_ != dim;
dim_ = dim;
+ return changed;
}
switch (cmd.action) {
case LFUN_INSET_MODIFY: {
- lyxerr << "InsetBox::dispatch MODIFY" << endl;
- InsetBoxMailer::string2params(lyx::to_utf8(cmd.argument()), params_);
+ //lyxerr << "InsetBox::dispatch MODIFY" << endl;
+ InsetBoxMailer::string2params(to_utf8(cmd.argument()), params_);
setButtonLabel();
break;
}
}
InsetCollapsable::doDispatch(cur, cmd);
break;
- case LFUN_PASTE:
- case LFUN_CLIPBOARD_PASTE:
- case LFUN_PRIMARY_SELECTION_PASTE:
- InsetCollapsable::doDispatch(cur, cmd);
- if (!params_.inner_box)
- forceParagraphsToDefault(cur);
- break;
default:
InsetCollapsable::doDispatch(cur, cmd);
}
-int InsetBox::latex(Buffer const & buf, ostream & os,
+int InsetBox::latex(Buffer const & buf, odocstream & os,
OutputParams const & runparams) const
{
BoxType btype = boxtranslator().find(params_.type);
if (!params_.inner_box) {
os << "{\\makebox";
// Special widths, see usrguide ยง3.5
+ // FIXME UNICODE
if (params_.special != "none") {
os << "[" << params_.width.value()
- << "\\" << params_.special << "]";
+ << '\\' << from_utf8(params_.special)
+ << ']';
} else
- os << "[" << width_string << "]";
+ os << '[' << from_ascii(width_string)
+ << ']';
if (params_.hor_pos != 'c')
os << "[" << params_.hor_pos << "]";
}
os << "[" << params_.pos << "]";
if (params_.height_special == "none") {
- os << "[" << params_.height.asLatexString() << "]";
+ // FIXME UNICODE
+ os << '[' << from_ascii(params_.height.asLatexString())
+ << ']';
} else {
// Special heights
+ // FIXME UNICODE
os << "[" << params_.height.value()
- << "\\" << params_.height_special << "]";
+ << '\\' << from_utf8(params_.height_special)
+ << ']';
}
if (params_.inner_pos != params_.pos)
os << "[" << params_.inner_pos << "]";
- os << "{" << width_string << "}";
+ // FIXME UNICODE
+ os << '{' << from_ascii(width_string) << '}';
if (params_.use_parbox)
os << "{";
}
-int InsetBox::docbook(Buffer const & buf, std::ostream & os,
+int InsetBox::docbook(Buffer const & buf, odocstream & os,
OutputParams const & runparams) const
{
return InsetText::docbook(buf, os, runparams);
}
-int InsetBox::plaintext(Buffer const & buf, std::ostream & os,
+int InsetBox::plaintext(Buffer const & buf, odocstream & os,
OutputParams const & runparams) const
{
BoxType const btype = boxtranslator().find(params_.type);
lex.pushToken(token);
}
}
+
+
+} // namespace lyx