Andreas' patch to prevent crash on click on previewd inset

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

diff --git a/src/mathed/math_factory.C b/src/mathed/math_factory.C
index 5f1a8a0167a5e08bf8fe0fdaafe0bb890b5e16bb..c865d52e0aad230100bff7ad86729594a0512693 100644 (file)
--- a/src/mathed/math_factory.C
+++ b/src/mathed/math_factory.C
@@ -163,6 +163,12 @@ 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";
+                       else if (tmp.inset == "wasy")
+                               tmp.requires = "wasysym";
+
                        // symbol font is not available sometimes
                        string symbol_font = "lyxsymbol";
 
@@ -228,9 +234,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;
 }
 
 
@@ -253,8 +257,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 == "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")
@@ -275,8 +283,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")
@@ -315,7 +321,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));
@@ -358,3 +364,4 @@ bool createMathInset_fromDialogStr(string const & str, MathArray & ar)
 
        return ar[0].nucleus();
 }
+