further code uglification to make Jean-Marc's compiler happy

[lyx.git] / src / mathed / math_factory.C

diff --git a/src/mathed/math_factory.C b/src/mathed/math_factory.C
index 832d5ae0269c09ec3b1bd8dd652ec5c46b2feb1d..34b0ba5d3642f731d311c2dbc1e2a00f0670437f 100644 (file)
--- a/src/mathed/math_factory.C
+++ b/src/mathed/math_factory.C
@@ -1,18 +1,20 @@
 #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_funcinset.h"
 #include "math_funcliminset.h"
 #include "math_fracinset.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"
+#include "math_specialcharinset.h"
 #include "math_sqrtinset.h"
 #include "math_symbolinset.h"
 #include "math_stackrelinset.h"
@@ -21,33 +23,42 @@
 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_SYM: 
-                       return new MathSymbolInset(l);
-               case LM_TK_STACK:
-                       return new MathStackrelInset;
-               case LM_TK_BINOM:
-               case LM_TK_CHOOSE:
-                       return new MathBinomInset;
-               case LM_TK_OVER:
-               case LM_TK_FRAC:
-                       return new MathFracInset;
-               case LM_TK_SQRT:
-                       return new MathSqrtInset;
-               case LM_TK_ROOT:
-                       return new MathRootInset;
-               case LM_TK_DECORATION:
-                       return new MathDecorationInset(l);
-               case LM_TK_SPACE:
-                       return new MathSpaceInset(l->id);
-               case LM_TK_DOTS:
-                       return new MathDotsInset(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_MSA:
+       case LM_TK_MSB:
+               return new MathSymbolInset(l);
+       case LM_TK_STACK:
+               return new MathStackrelInset;
+       case LM_TK_KERN: 
+               return new MathKernInset;
+       case LM_TK_BINOM:
+       case LM_TK_CHOOSE:
+               return new MathBinomInset;
+       case LM_TK_OVER:
+       case LM_TK_FRAC:
+               return new MathFracInset;
+       case LM_TK_ATOP:
+               return new MathFracInset(true);
+       case LM_TK_NOT:
+               return new MathNotInset;
+       case LM_TK_SQRT:
+               return new MathSqrtInset;
+       case LM_TK_ROOT:
+               return new MathRootInset;
+       case LM_TK_DECORATION:
+               return new MathDecorationInset(l->name);
+       case LM_TK_SPACE:
+               return new MathSpaceInset(l->id);
+       case LM_TK_DOTS:
+               return new MathDotsInset(l->name);
        }
        return new MathFuncInset(l->name);
 }
@@ -55,8 +66,12 @@ MathInset * createMathInset(latexkeys const * l)
 
 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))