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 4cb8ebfbc6007ab016fe098713466d54697b98cb..9faf0e80909cffab68c29fff64874a606a21a425 100644 (file)
--- a/src/mathed/math_factory.C
+++ b/src/mathed/math_factory.C
@@ -23,7 +23,6 @@
 #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"
@@ -37,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"
@@ -48,9 +46,11 @@
 #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"
+#include "math_xymatrixinset.h"
 
 //#include "insets/insetref.h"
 #include "ref_inset.h"
@@ -164,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";
 
@@ -219,9 +226,9 @@ void initMath()
 {
        static bool initialized = false;
        if (!initialized) {
+               initialized = true;
                initParser();
                initSymbols();
-               initialized = true;
        }
 }
 
@@ -229,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;
 }
 
 
@@ -254,10 +259,12 @@ 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 == "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 == "fbox")
 //                     return MathAtom(new MathFboxInset(l));
                if (inset == "style")
@@ -278,8 +285,6 @@ MathAtom createMathInset(string const & s)
                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")
@@ -288,9 +293,11 @@ 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")
+       if (s == "split" || s == "gathered" || s == "aligned" || s == "alignedat")
                return MathAtom(new MathSplitInset(s));
        if (s == "cases")
                return MathAtom(new MathCasesInset);
@@ -316,16 +323,16 @@ 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")
+       if (s == "color" || s == "normalcolor")
                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,
@@ -334,7 +341,7 @@ MathAtom createMathInset(string const & s)
        //      return MathAtom(new MathMacro(s,
        //              MacroTable::localMacros().get(s).numargs()));
 
-       lyxerr << "creating unknown inset '" << s << "'" << endl;
+       //lyxerr << "creating unknown inset '" << s << "'" << endl;
        return MathAtom(new MathUnknownInset(s));
 }
 
@@ -361,3 +368,4 @@ bool createMathInset_fromDialogStr(string const & str, MathArray & ar)
 
        return ar[0].nucleus();
 }
+