Fix math cursor positioning bug

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

diff --git a/src/mathed/math_factory.C b/src/mathed/math_factory.C
index f92e7715e71640639501679750f7871ed447aa39..271bf3fa3cad310d1033c452b5f0ce41c78405a6 100644 (file)
--- a/src/mathed/math_factory.C
+++ b/src/mathed/math_factory.C
@@ -16,12 +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"
@@ -35,7 +36,7 @@
 #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"
 #include "math_spaceinset.h"
@@ -45,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"
@@ -54,16 +56,19 @@
 
 #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;
 
+using std::string;
 using std::endl;
 using std::istringstream;
 
@@ -135,9 +140,8 @@ void initSymbols()
 
                // special case of pre-defined macros
                if (line.size() > 8 && line.substr(0, 5) == "\\def\\") {
-                       //lyxerr << "defining: '" << line << '\'' << endl;
-                       istringstream is(line);
-                       MathMacroTable::create(MathAtom(new MathMacroTemplate(is)));
+                       //lyxerr << "macro definition: '" << line << '\'' << endl;
+                       MacroTable::globalMacros().insert(line);
                        continue;
                }
 
@@ -214,6 +218,7 @@ void initMath()
 {
        static bool initialized = false;
        if (!initialized) {
+               initParser();
                initSymbols();
                initialized = true;
        }
@@ -231,7 +236,7 @@ latexkeys const * in_word_set(string const & str)
 
 MathAtom createMathInset(string const & s)
 {
-       //lyxerr << "creating inset with name: '" << s << '\'' << endl;;
+       //lyxerr << "creating inset with name: '" << s << '\'' << endl;
        latexkeys const * l = in_word_set(s);
        if (l) {
                string const & inset = l->inset;
@@ -249,11 +254,13 @@ MathAtom createMathInset(string const & s)
                if (inset == "dots")
                        return MathAtom(new MathDotsInset(l));
                if (inset == "mbox")
+                       // return MathAtom(new MathMBoxInset);
+                       // MathMBoxInset is proposed to replace MathBoxInset,
+                       // but is not ready yet (it needs a BufferView for
+                       // construction)
                        return MathAtom(new MathBoxInset(l->name));
-               if (inset == "parbox")
-                       return MathAtom(new MathParboxInset);
-               if (inset == "fbox")
-                       return MathAtom(new MathFboxInset(l));
+//             if (inset == "fbox")
+//                     return MathAtom(new MathFboxInset(l));
                if (inset == "style")
                        return MathAtom(new MathSizeInset(l));
                if (inset == "font")
@@ -270,6 +277,10 @@ 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 == "fbox")
+               return MathAtom(new MathFboxInset());
        if (s == "framebox")
                return MathAtom(new MathFrameboxInset);
        if (s == "makebox")
@@ -278,7 +289,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);
@@ -304,17 +315,25 @@ 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")
-               return MathAtom(new MathColorInset);
-
-       if (MathMacroTable::has(s))
-               return MathAtom(new MathMacro(s));
-
-       //lyxerr << "creating inset 2 with name: '" << s << '\'' << endl;
+               return MathAtom(new MathColorInset(true));
+       if (s == "textcolor")
+               return MathAtom(new MathColorInset(false));
+       if (s == "dfrac")
+               return MathAtom(new MathDfracInset);
+       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));
 }