#include "BufferView.h"
#include "gettext.h"
#include "frontends/Painter.h"
-#include "font.h"
+#include "frontends/font_metrics.h"
#include "support/lyxlib.h"
#include "support/LOstream.h"
#include "debug.h"
}
-int InsetFormulaMacro::docbook(Buffer const * buf, ostream & os) const
+int InsetFormulaMacro::docbook(Buffer const * buf, ostream & os, bool) const
{
return ascii(buf, os, 0);
}
int InsetFormulaMacro::width(BufferView * bv, LyXFont const & f) const
{
metrics(bv, f);
- return 10 + lyxfont::width(prefix(), f) + par()->width();
+ return 10 + font_metrics::width(prefix(), f) + par()->width();
}
void InsetFormulaMacro::draw(BufferView * bv, LyXFont const & f,
int y, float & xx, bool /*cleared*/) const
{
- Painter & pain = bv->painter();
+ MathPainterInfo pain = MathPainterInfo(bv->painter());
LyXFont font(f);
// label
int const h = ascent(bv, font) + descent(bv, font) - 2;
// LColor::mathbg used to be "AntiqueWhite" but is "linen" now, too
- pain.fillRectangle(x, a, w, h, LColor::mathmacrobg);
- pain.rectangle(x, a, w, h, LColor::mathframe);
+ pain.pain.fillRectangle(x, a, w, h, LColor::mathmacrobg);
+ pain.pain.rectangle(x, a, w, h, LColor::mathframe);
if (mathcursor &&
const_cast<InsetFormulaBase const *>(mathcursor->formula()) == this)
mathcursor->drawSelection(pain);
- pain.text(x + 2, y, prefix(), font);
+ pain.pain.text(x + 2, y, prefix(), font);
// formula
- par()->draw(pain, x + lyxfont::width(prefix(), f) + 5, y);
+ par()->draw(pain, x + font_metrics::width(prefix(), f) + 5, y);
xx += w + 2;
xo_ = x;
yo_ = y;