* Purpose: Implementation of the formula macro LyX inset
* Author: André Pönitz, based on ideas of Alejandro Aguilar Sierra
* Created: March 2001
- * Description: Allows the edition of math macros inside Lyx.
+ * Description: Allows the edition of math macros inside Lyx.
*
* Copyright: 2001 The LyX Project
*
#include "math_mathmlstream.h"
#include "BufferView.h"
#include "gettext.h"
-#include "Painter.h"
-#include "font.h"
+#include "frontends/Painter.h"
+#include "frontends/font_metrics.h"
#include "support/lyxlib.h"
#include "support/LOstream.h"
#include "debug.h"
}
-InsetFormulaMacro::InsetFormulaMacro(string name, int nargs)
+InsetFormulaMacro::InsetFormulaMacro(string const & name, int nargs)
{
setInsetName(name);
- MathMacroTable::create(name, nargs, string());
+ MathMacroTable::create(name, nargs);
}
void InsetFormulaMacro::write(Buffer const *, ostream & os) const
{
os << "FormulaMacro ";
- WriteStream wi(os, false);
+ WriteStream wi(os, false, false);
par()->write(wi);
}
-int InsetFormulaMacro::latex(Buffer const *, ostream & os, bool fragile,
+int InsetFormulaMacro::latex(Buffer const *, ostream & os, bool fragile,
bool /*free_spacing*/) const
{
- WriteStream wi(os, fragile);
+ WriteStream wi(os, fragile, true);
par()->write(wi);
return 2;
}
int InsetFormulaMacro::ascii(Buffer const *, ostream & os, int) const
{
- WriteStream wi(os, false);
+ WriteStream wi(os, false, true);
par()->write(wi);
return 0;
}
}
-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 & x, bool /*cleared*/) const
+ int y, float & xx, bool /*cleared*/) const
{
- Painter & pain = bv->painter();
+ MathPainterInfo pain = MathPainterInfo(bv->painter());
LyXFont font(f);
// label
font.setColor(LColor::math);
-
+
+ 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;
// LColor::mathbg used to be "AntiqueWhite" but is "linen" now, too
- pain.fillRectangle(int(x), a , w, h, LColor::mathmacrobg);
- pain.rectangle(int(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(int(x + 2), y, prefix(), font);
- x += width(bv, font);
+ pain.pain.text(x + 2, y, prefix(), font);
// formula
- xo_ = int(x) - par()->width() - 5;
+ par()->draw(pain, x + font_metrics::width(prefix(), f) + 5, y);
+ xx += w + 2;
+ xo_ = x;
yo_ = y;
- par()->draw(pain, xo_, yo_);
-}
+ setCursorVisible(false);
+}