#include <config.h>
#include "math_parser.h"
-#include "math_bigopinset.h"
#include "math_binominset.h"
#include "math_decorationinset.h"
#include "math_dotsinset.h"
#include "math_kerninset.h"
#include "math_macro.h"
#include "math_macrotable.h"
-#include "math_noglyphinset.h"
+#include "math_macroarg.h"
#include "math_notinset.h"
#include "math_rootinset.h"
#include "math_spaceinset.h"
MathInset * createMathInset(latexkeys const * l)
{
switch (l->token) {
- case LM_TK_NOGLYPH:
- case LM_TK_NOGLYPHB:
- return new MathNoglyphInset(l);
- case LM_TK_BIGSYM:
- return new MathBigopInset(l);
case LM_TK_FUNCLIM:
return new MathFuncLimInset(l);
case LM_TK_SPECIAL:
return new MathSpecialCharInset(l->id);
case LM_TK_SYM:
+ case LM_TK_CMR:
case LM_TK_CMSY:
case LM_TK_CMM:
case LM_TK_CMEX:
case LM_TK_ROOT:
return new MathRootInset;
case LM_TK_DECORATION:
- return new MathDecorationInset(l);
+ return new MathDecorationInset(l->name);
case LM_TK_SPACE:
return new MathSpaceInset(l->id);
case LM_TK_DOTS:
- return new MathDotsInset(l);
+ return new MathDotsInset(l->name);
}
return new MathFuncInset(l->name);
}
MathInset * createMathInset(string const & s)
{
+ //cerr << "creating inset with name: '" << s << "'\n";
+ if (s.size() == 2 && s[0] == '#' && s[1] >= '1' && s[1] <= '9')
+ return new MathMacroArgument(s[1] - '0');
+
latexkeys const * l = in_word_set(s);
- if (l)
+ if (l)
return createMathInset(l);
if (MathMacroTable::hasTemplate(s))