get rid of broken_header.h and some unneeded tests

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

diff --git a/src/mathed/math_factory.C b/src/mathed/math_factory.C
index ba2d1d35229ca5f0d3f3906e22a549ca9b16b0aa..5f1a8a0167a5e08bf8fe0fdaafe0bb890b5e16bb 100644 (file)
--- a/src/mathed/math_factory.C
+++ b/src/mathed/math_factory.C
@@ -16,13 +16,13 @@
 #include "math_amsarrayinset.h"
 #include "math_binominset.h"
 #include "math_boxinset.h"
+#include "math_boxedinset.h"
 #include "math_boldsymbolinset.h"
 #include "math_casesinset.h"
 #include "math_colorinset.h"
 #include "math_decorationinset.h"
 #include "math_dfracinset.h"
 #include "math_dotsinset.h"
-#include "math_ertinset.h"
 #include "math_fboxinset.h"
 #include "math_frameboxinset.h"
 #include "math_fontinset.h"
@@ -36,7 +36,6 @@
 #include "math_macrotemplate.h"
 #include "math_makeboxinset.h"
 #include "math_oversetinset.h"
-#include "math_parboxinset.h"
 #include "math_parser.h"
 #include "math_rootinset.h"
 #include "math_sizeinset.h"
@@ -47,6 +46,7 @@
 #include "math_substackinset.h"
 #include "math_symbolinset.h"
 #include "math_tabularinset.h"
+#include "math_tfracinset.h"
 #include "math_undersetinset.h"
 #include "math_unknowninset.h"
 #include "math_xarrowinset.h"
@@ -57,13 +57,13 @@
 #include "debug.h"
 #include "math_support.h"
 
-#include "support/std_sstream.h"
 #include "support/filetools.h" // LibFileSearch
 #include "support/lstrings.h"
 
 #include "frontends/lyx_gui.h"
 
 #include <fstream>
+#include <sstream>
 
 using lyx::support::LibFileSearch;
 using lyx::support::split;
@@ -253,12 +253,10 @@ MathAtom createMathInset(string const & s)
                        return MathAtom(new MathSpaceInset(l->name));
                if (inset == "dots")
                        return MathAtom(new MathDotsInset(l));
-               if (inset == "mbox")
-                       return MathAtom(new MathBoxInset(l->name));
-               if (inset == "parbox")
-                       return MathAtom(new MathParboxInset);
-               if (inset == "fbox")
-                       return MathAtom(new MathFboxInset(l));
+//             if (inset == "mbox")
+//                     return MathAtom(new MathBoxInset(l->name));
+//             if (inset == "fbox")
+//                     return MathAtom(new MathFboxInset(l));
                if (inset == "style")
                        return MathAtom(new MathSizeInset(l));
                if (inset == "font")
@@ -275,6 +273,12 @@ MathAtom createMathInset(string const & s)
        if (s.size() == 3 && s[0] == '\\' && s[1] == '#'
                        && s[2] >= '1' && s[2] <= '9')
                return MathAtom(new MathMacroArgument(s[2] - '0'));
+       if (s == "boxed")
+               return MathAtom(new MathBoxedInset());
+       if (s == "mbox")
+               return MathAtom(new MathBoxInset("mbox"));
+       if (s == "fbox")
+               return MathAtom(new MathFboxInset());
        if (s == "framebox")
                return MathAtom(new MathFrameboxInset);
        if (s == "makebox")
@@ -283,7 +287,7 @@ MathAtom createMathInset(string const & s)
                return MathAtom(new MathKernInset);
        if (s == "xrightarrow" || s == "xleftarrow")
                return MathAtom(new MathXArrowInset(s));
-       if (s == "split" || s == "gathered" || s == "aligned")
+       if (s == "split" || s == "gathered" || s == "aligned" || s == "alignedat")
                return MathAtom(new MathSplitInset(s));
        if (s == "cases")
                return MathAtom(new MathCasesInset);
@@ -309,8 +313,6 @@ MathAtom createMathInset(string const & s)
                return MathAtom(new MathFracInset(true));
        if (s == "lefteqn")
                return MathAtom(new MathLefteqnInset);
-       if (s == "lyxert")
-               return MathAtom(new MathErtInset);
        if (s == "boldsymbol")
                return MathAtom(new MathBoldsymbolInset);
        if (s == "color")
@@ -319,8 +321,18 @@ MathAtom createMathInset(string const & s)
                return MathAtom(new MathColorInset(false));
        if (s == "dfrac")
                return MathAtom(new MathDfracInset);
-
-       return MathAtom(new MathMacro(s));
+       if (s == "tfrac")
+               return MathAtom(new MathTfracInset);
+
+       if (MacroTable::globalMacros().has(s))
+               return MathAtom(new MathMacro(s,
+                       MacroTable::globalMacros().get(s).numargs()));
+       //if (MacroTable::localMacros().has(s))
+       //      return MathAtom(new MathMacro(s,
+       //              MacroTable::localMacros().get(s).numargs()));
+
+       //lyxerr << "creating unknown inset '" << s << "'" << endl;
+       return MathAtom(new MathUnknownInset(s));
 }