Fix to bug 2362: Deleting superscript also deletes subscript.

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

diff --git a/src/mathed/math_factory.C b/src/mathed/math_factory.C
index 271bf3fa3cad310d1033c452b5f0ce41c78405a6..9faf0e80909cffab68c29fff64874a606a21a425 100644 (file)
--- a/src/mathed/math_factory.C
+++ b/src/mathed/math_factory.C
@@ -50,6 +50,7 @@
 #include "math_undersetinset.h"
 #include "math_unknowninset.h"
 #include "math_xarrowinset.h"
+#include "math_xymatrixinset.h"
 
 //#include "insets/insetref.h"
 #include "ref_inset.h"
@@ -163,6 +164,13 @@ void initSymbols()
                        // tmp.inset _is_ the fontname here.
                        // create fallbacks if necessary
 
+                       // store requirements as long as we can
+                       if (tmp.inset == "msa" || tmp.inset == "msb")
+                               tmp.requires = "amssymb";
+                       // See http://bugzilla.lyx.org/show_bug.cgi?id=1942
+                       // else if (tmp.inset == "wasy")
+                       //      tmp.requires = "wasysym";
+
                        // symbol font is not available sometimes
                        string symbol_font = "lyxsymbol";
 
@@ -218,9 +226,9 @@ void initMath()
 {
        static bool initialized = false;
        if (!initialized) {
+               initialized = true;
                initParser();
                initSymbols();
-               initialized = true;
        }
 }
 
@@ -228,9 +236,7 @@ void initMath()
 latexkeys const * in_word_set(string const & str)
 {
        WordList::iterator it = theWordList.find(str);
-       //lyxerr << "looking up '" << str << "' found: "
-       // << (it != theWordList.end()) << endl;
-       return (it != theWordList.end()) ? &(it->second) : 0;
+       return it != theWordList.end() ? &(it->second) : 0;
 }
 
 
@@ -287,6 +293,8 @@ MathAtom createMathInset(string const & s)
                return MathAtom(new MathMakeboxInset);
        if (s == "kern")
                return MathAtom(new MathKernInset);
+       if (s == "xymatrix")
+               return MathAtom(new MathXYMatrixInset);
        if (s == "xrightarrow" || s == "xleftarrow")
                return MathAtom(new MathXArrowInset(s));
        if (s == "split" || s == "gathered" || s == "aligned" || s == "alignedat")
@@ -317,7 +325,7 @@ MathAtom createMathInset(string const & s)
                return MathAtom(new MathLefteqnInset);
        if (s == "boldsymbol")
                return MathAtom(new MathBoldsymbolInset);
-       if (s == "color")
+       if (s == "color" || s == "normalcolor")
                return MathAtom(new MathColorInset(true));
        if (s == "textcolor")
                return MathAtom(new MathColorInset(false));
@@ -360,3 +368,4 @@ bool createMathInset_fromDialogStr(string const & str, MathArray & ar)
 
        return ar[0].nucleus();
 }
+