#include "support/LOstream.h"
#include "debug.h"
#include "lyxlex.h"
+#include "lyxtext.h"
#include "lyxfont.h"
using std::ostream;
InsetFormulaMacro::InsetFormulaMacro(string nm, int na)
{
setInsetName(nm);
- MathMacroTable::createTemplate(nm, na, string());
+ MathMacroTable::create(nm, na, string());
}
InsetFormulaMacro::InsetFormulaMacro(string const & s)
{
- MathMacroTemplate * t = mathed_parse_macro(s);
- MathMacroTable::insertTemplate(*t);
- setInsetName(t->name());
- delete t;
- metrics();
+ string name = mathed_parse_macro(s);
+ setInsetName(name);
+#ifdef WITH_WARNINGS
+#warning "metrics disabled"
+#endif
+ //metrics();
}
}
-void InsetFormulaMacro::write(ostream & os) const
+void InsetFormulaMacro::write(Buffer const * buf, ostream & os) const
{
os << "FormulaMacro ";
- tmacro().write(os, false);
+ MathWriteInfo wi(buf, os, false);
+ par()->write(wi);
}
-int InsetFormulaMacro::latex(ostream & os, bool fragile,
+int InsetFormulaMacro::latex(Buffer const * buf, ostream & os, bool fragile,
bool /*free_spacing*/) const
{
- tmacro().write(os, fragile);
+ MathWriteInfo wi(buf, os, fragile);
+ par()->write(wi);
return 2;
}
-int InsetFormulaMacro::ascii(ostream & os, int) const
+
+int InsetFormulaMacro::ascii(Buffer const * buf, ostream & os, int) const
{
- tmacro().write(os, false);
+ MathWriteInfo wi(buf, os, false);
+ par()->write(wi);
return 0;
}
-int InsetFormulaMacro::linuxdoc(ostream & os) const
+int InsetFormulaMacro::linuxdoc(Buffer const * buf, ostream & os) const
{
- return ascii(os, 0);
+ return ascii(buf, os, 0);
}
-int InsetFormulaMacro::docBook(ostream & os) const
+int InsetFormulaMacro::docbook(Buffer const * buf, ostream & os) const
{
- return ascii(os, 0);
+ return ascii(buf, os, 0);
}
-void InsetFormulaMacro::read(LyXLex & lex)
+void InsetFormulaMacro::read(Buffer const *, LyXLex & lex)
{
- MathMacroTemplate * t = mathed_parse_macro(lex);
- if (!t)
- t = new MathMacroTemplate("{parse error}", 0);
- MathMacroTable::insertTemplate(*t);
- setInsetName(t->name());
- delete t;
+ string name = mathed_parse_macro(lex);
+ setInsetName(name);
+ lyxerr << "metrics disabled";
metrics();
}
string InsetFormulaMacro::prefix() const
{
- return string(" ") + _("Macro: ") + tmacro().name() + ": ";
+ return string(" ") + _("Macro: ") + getInsetName() + ": ";
}
int InsetFormulaMacro::ascent(BufferView *, LyXFont const &) const
{
- return tmacro().ascent() + 5;
+ return par()->ascent() + 5;
}
int InsetFormulaMacro::descent(BufferView *, LyXFont const &) const
{
- return tmacro().descent() + 5;
+ return par()->descent() + 5;
}
-int InsetFormulaMacro::width(BufferView *, LyXFont const & f) const
+int InsetFormulaMacro::width(BufferView * bv, LyXFont const & f) const
{
- metrics();
- return 10 + lyxfont::width(prefix(), f) + tmacro().width();
+ metrics(bv, &f);
+ return 10 + lyxfont::width(prefix(), f) + par()->width();
}
case LFUN_MATH_MACROARG: {
int const i = lyx::atoi(arg);
lyxerr << "inserting macro arg " << i << "\n";
- if (i > 0 && i <= tmacro().numargs()) {
- mathcursor->insert(new MathMacroArgument(i));
+ //if (i > 0 && i <= par()->numargs()) {
+ mathcursor->insert(MathAtom(new MathMacroArgument(i)));
updateLocal(bv, true);
- } else {
- lyxerr << "not in range 0.." << tmacro().numargs() << "\n";
- }
+ //} else {
+ // lyxerr << "not in range 0.." << par()->numargs() << "\n";
+ //}
break;
}
- default:
+ default: {
result = InsetFormulaBase::localDispatch(bv, action, arg);
+ // force redraw if anything happened
+ if (result != UNDISPATCHED) {
+ bv->text->status(bv, LyXText::NEED_MORE_REFRESH);
+ bv->updateInset(this, false);
+ }
+ }
}
return result;
}
-MathMacroTemplate const & InsetFormulaMacro::tmacro() const
+MathAtom const & InsetFormulaMacro::par() const
{
- return MathMacroTable::provideTemplate(getInsetName());
+ return MathMacroTable::provide(getInsetName());
}
-Inset::Code InsetFormulaMacro::lyxCode() const
+MathAtom & InsetFormulaMacro::par()
{
- return Inset::MATHMACRO_CODE;
+ return MathMacroTable::provide(getInsetName());
}
-MathInsetTypes InsetFormulaMacro::getType() const
-{
- return LM_OT_MACRO;
-}
-
-
-MathInset const * InsetFormulaMacro::par() const
+Inset::Code InsetFormulaMacro::lyxCode() const
{
- return &tmacro();
+ return Inset::MATHMACRO_CODE;
}
-void InsetFormulaMacro::metrics() const
+MathInsetTypes InsetFormulaMacro::getType() const
{
- tmacro().metrics(LM_ST_TEXT);
+ return LM_OT_MACRO;
}
x += width(bv, font);
// formula
- float t = tmacro().width() + 5;
+ float t = par()->width() + 5;
x -= t;
- tmacro().draw(pain, int(x), baseline);
+ par()->draw(pain, int(x), baseline);
x += t;
}