#include <config.h>
-
#include "formulamacro.h"
#include "lfuns.h"
#include "math_cursor.h"
#include "math_mathmlstream.h"
#include "BufferView.h"
#include "gettext.h"
+#include "latexrunparams.h"
#include "frontends/Painter.h"
#include "frontends/font_metrics.h"
#include "support/lyxlib.h"
+#include "support/lstrings.h"
#include "support/LOstream.h"
#include "debug.h"
#include "lyxlex.h"
#include "lyxtext.h"
-#include "lyxfont.h"
-
#include "Lsstream.h"
-#include "support/BoostFormat.h"
+using namespace lyx::support;
using std::ostream;
+using std::auto_ptr;
extern MathCursor * mathcursor;
}
-InsetFormulaMacro::InsetFormulaMacro(string const & name, int nargs)
+InsetFormulaMacro::InsetFormulaMacro
+ (string const & name, int nargs, string const & type)
{
setInsetName(name);
- MathMacroTable::create(MathAtom(new MathMacroTemplate(name, nargs)));
+ MathMacroTable::create(MathAtom(new MathMacroTemplate(name, nargs, type)));
}
}
-Inset * InsetFormulaMacro::clone(Buffer const &, bool) const
+auto_ptr<InsetBase> InsetFormulaMacro::clone() const
{
- return new InsetFormulaMacro(*this);
+ return auto_ptr<InsetBase>(new InsetFormulaMacro(*this));
}
}
-int InsetFormulaMacro::latex(Buffer const *, ostream & os, LatexRunParams const &,
- bool fragile, bool /*free_spacing*/) const
+int InsetFormulaMacro::latex(Buffer const *, ostream & os,
+ LatexRunParams const & runparams) const
{
- WriteStream wi(os, fragile, true);
+ WriteStream wi(os, runparams.moving_arg, true);
par()->write(wi);
return 2;
}
MathMacroTemplate * p = new MathMacroTemplate(is);
setInsetName(p->name());
MathMacroTable::create(MathAtom(p));
- metrics();
+ //metrics();
}
string InsetFormulaMacro::prefix() const
{
-#if USE_BOOST_FORMAT
- return STRCONV(boost::io::str(boost::format(_(" Macro: %s: ")) %
- STRCONV(getInsetName())));
-#else
- return _(" Macro: ") + getInsetName() + ": ";
-#endif
+ return bformat(_(" Macro: %s: "), getInsetName());
}
-void InsetFormulaMacro::dimension(BufferView * bv, LyXFont const & font,
- Dimension & dim) const
+void InsetFormulaMacro::metrics(MetricsInfo & mi, Dimension & dim) const
{
- metrics(bv, font);
- dim = par()->dimensions();
- dim.a += 5;
- dim.d += 5;
- dim.w += 10 + font_metrics::width(prefix(), font);
+ par()->metrics(mi, dim_);
+ dim_.asc += 5;
+ dim_.des += 5;
+ dim_.wid += 10 + font_metrics::width(prefix(), mi.base.font);
+ dim = dim_;
}
}
-Inset::Code InsetFormulaMacro::lyxCode() const
+InsetOld::Code InsetFormulaMacro::lyxCode() const
{
- return Inset::MATHMACRO_CODE;
+ return InsetOld::MATHMACRO_CODE;
}
-void InsetFormulaMacro::draw(BufferView * bv, LyXFont const & f,
- int y, float & xx) const
+void InsetFormulaMacro::draw(PainterInfo & p, int x, int y) const
{
// label
- LyXFont font(f);
+ LyXFont font = p.base.font;
font.setColor(LColor::math);
- PainterInfo pi = PainterInfo(bv->painter());
+ PainterInfo pi(p.base.bv);
pi.base.style = LM_ST_TEXT;
pi.base.font = font;
- int const x = int(xx);
- int const a = y - ascent(bv, font) + 1;
- int const w = width(bv, font) - 2;
- int const h = ascent(bv, font) + descent(bv, font) - 2;
+ int const a = y - dim_.asc + 1;
+ int const w = dim_.wid - 2;
+ int const h = dim_.height() - 2;
// LColor::mathbg used to be "AntiqueWhite" but is "linen" now, too
pi.pain.fillRectangle(x, a, w, h, LColor::mathmacrobg);
pi.pain.text(x + 2, y, prefix(), font);
// formula
- par()->draw(pi, x + font_metrics::width(prefix(), f) + 5, y);
- xx += w + 2;
+ par()->draw(pi, x + font_metrics::width(prefix(), p.base.font) + 5, y);
xo_ = x;
yo_ = y;
}