#include "insets/insetvspace.h"
#include "insets/insetwrap.h"
-#include "mathed/formulamacro.h"
+#include "mathed/math_macrotemplate.h"
#include "mathed/math_hullinset.h"
#include "frontends/Dialogs.h"
#include "frontends/LyXView.h"
#include "support/lstrings.h"
-#include "support/std_sstream.h"
#include <boost/assert.hpp>
+#include <sstream>
+
using lyx::support::compare_ascii_no_case;
using std::auto_ptr;
UpdatableInset * up = bv->cursor().inset().asUpdatableInset();
if (!up) {
auto_ptr<InsetCaption> inset(new InsetCaption(params));
- inset->setOwner(up);
inset->setAutoBreakRows(true);
- inset->setDrawFrame(InsetText::LOCKED);
+ inset->setDrawFrame(true);
inset->setFrameColor(LColor::captionframe);
return inset.release();
}
auto_ptr<InsetBase> inset;
LyXTextClass tclass = buf.params().getLyXTextClass();
-
+
lex.next();
string tmptok = lex.getString();
} else if (tmptok == "External") {
inset.reset(new InsetExternal);
} else if (tmptok == "FormulaMacro") {
- inset.reset(new InsetFormulaMacro);
+ inset.reset(new MathMacroTemplate);
} else if (tmptok == "Formula") {
inset.reset(new MathHullInset);
} else if (tmptok == "Graphics") {
}
inset->read(buf, lex);
+
+#ifdef WITH_WARNINGS
+#warning hack..
+#endif
+ if (inset->lyxCode() == InsetBase::MATHMACRO_CODE) {
+ MathMacroTemplate const * tmpl =
+ static_cast<MathMacroTemplate*>(inset.get());
+ MacroTable::globalMacros().insert
+ (tmpl->name(), tmpl->asMacroData());
+ lyxerr << "creating local macro " << tmpl->name() << endl;
+ }
}
return inset.release();