#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
#include "formulamacro.h"
-#include "commandtags.h"
+#include "lfuns.h"
#include "math_cursor.h"
#include "math_parser.h"
#include "math_macro.h"
#include "math_macrotable.h"
+#include "math_macrotemplate.h"
+#include "metricsinfo.h"
#include "math_support.h"
#include "math_mathmlstream.h"
#include "BufferView.h"
#include "lyxtext.h"
#include "lyxfont.h"
+#include "Lsstream.h"
+
+#include "support/BoostFormat.h"
+
using std::ostream;
extern MathCursor * mathcursor;
+
InsetFormulaMacro::InsetFormulaMacro()
{
// inset name is inherited from Inset
InsetFormulaMacro::InsetFormulaMacro(string const & name, int nargs)
{
setInsetName(name);
- MathMacroTable::create(name, nargs);
+ MathMacroTable::create(MathAtom(new MathMacroTemplate(name, nargs)));
}
InsetFormulaMacro::InsetFormulaMacro(string const & s)
{
- string name;
- mathed_parse_macro(name, s);
- setInsetName(name);
+ std::istringstream is(STRCONV(s));
+ read(is);
}
}
-int InsetFormulaMacro::docbook(Buffer const * buf, ostream & os) const
+int InsetFormulaMacro::docbook(Buffer const * buf, ostream & os, bool) const
{
return ascii(buf, os, 0);
}
void InsetFormulaMacro::read(Buffer const *, LyXLex & lex)
{
- string name;
- mathed_parse_macro(name, lex);
- setInsetName(name);
- //lyxerr << "metrics disabled";
+ read(lex.getStream());
+}
+
+
+void InsetFormulaMacro::read(std::istream & is)
+{
+ MathMacroTemplate * p = new MathMacroTemplate(is);
+ setInsetName(p->name());
+ MathMacroTable::create(MathAtom(p));
metrics();
}
string InsetFormulaMacro::prefix() const
{
- return string(" ") + _("Macro: ") + getInsetName() + ": ";
+#if USE_BOOST_FORMAT
+ return boost::io::str(boost::format(_(" Macro: %s: ")) % getInsetName());
+#else
+ return _(" Macro: ") + getInsetName() + ": ";
+#endif
}
}
-MathInsetTypes InsetFormulaMacro::getType() const
-{
- return LM_OT_MACRO;
-}
-
-
void InsetFormulaMacro::draw(BufferView * bv, LyXFont const & f,
- int y, float & xx, bool /*cleared*/) const
+ int y, float & xx) const
{
- Painter & pain = bv->painter();
- LyXFont font(f);
-
// label
+ LyXFont font(f);
font.setColor(LColor::math);
+ PainterInfo pi = PainterInfo(bv->painter());
+ 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;
// 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);
+ pi.pain.fillRectangle(x, a, w, h, LColor::mathmacrobg);
+ pi.pain.rectangle(x, a, w, h, LColor::mathframe);
if (mathcursor &&
const_cast<InsetFormulaBase const *>(mathcursor->formula()) == this)
- mathcursor->drawSelection(pain);
+ mathcursor->drawSelection(pi);
- pain.text(x + 2, y, prefix(), font);
+ pi.pain.text(x + 2, y, prefix(), font);
// formula
- par()->draw(pain, x + font_metrics::width(prefix(), f) + 5, y);
+ par()->draw(pi, x + font_metrics::width(prefix(), f) + 5, y);
xx += w + 2;
xo_ = x;
yo_ = y;