revert last patch. there's something wrong, possibly unrelated to this

[lyx.git] / src / mathed / MathFactory.cpp

diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp
index 7f84c9536af8f2901a97ef50aa02e0647c00974d..284faadaaf8f54b279bd4e3a045172c030520350 100644 (file)
--- a/src/mathed/MathFactory.cpp
+++ b/src/mathed/MathFactory.cpp
@@ -302,9 +302,9 @@ MathAtom createInsetMath(docstring const & s)
        if (s == "fbox")
                return MathAtom(new InsetMathFBox());
        if (s == "framebox")
-               return MathAtom(new InsetMathFrameBox);
+               return MathAtom(new InsetMathMakebox(true));
        if (s == "makebox")
-               return MathAtom(new InsetMathMakebox);
+               return MathAtom(new InsetMathMakebox(false));
        if (s == "kern")
                return MathAtom(new InsetMathKern);
        if (s.substr(0, 8) == "xymatrix") {
@@ -352,8 +352,14 @@ MathAtom createInsetMath(docstring const & s)
                return MathAtom(new InsetMathTabular(s, 1, 1));
        if (s == "stackrel")
                return MathAtom(new InsetMathStackrel);
-       if (s == "binom" || s == "choose")
-               return MathAtom(new InsetMathBinom(s == "choose"));
+       if (s == "binom")
+               return MathAtom(new InsetMathBinom(InsetMathBinom::BINOM));
+       if (s == "choose")
+               return MathAtom(new InsetMathBinom(InsetMathBinom::CHOOSE));
+       if (s == "brace")
+               return MathAtom(new InsetMathBinom(InsetMathBinom::BRACE));
+       if (s == "brack")
+               return MathAtom(new InsetMathBinom(InsetMathBinom::BRACK));
        if (s == "frac")
                return MathAtom(new InsetMathFrac);
        if (s == "over")
@@ -376,7 +382,11 @@ MathAtom createInsetMath(docstring const & s)
        if (s == "lefteqn")
                return MathAtom(new InsetMathLefteqn);
        if (s == "boldsymbol")
-               return MathAtom(new InsetMathBoldSymbol);
+               return MathAtom(new InsetMathBoldSymbol(InsetMathBoldSymbol::AMS_BOLD));
+       if (s == "bm")
+               return MathAtom(new InsetMathBoldSymbol(InsetMathBoldSymbol::BM_BOLD));
+       if (s == "heavysymbol" || s == "hm")
+               return MathAtom(new InsetMathBoldSymbol(InsetMathBoldSymbol::BM_HEAVY));
        if (s == "color" || s == "normalcolor")
                return MathAtom(new InsetMathColor(true));
        if (s == "textcolor")
@@ -412,7 +422,7 @@ bool createInsetMath_fromDialogStr(docstring const & str, MathData & ar)
 
        InsetCommandParams icp(REF_CODE);
        // FIXME UNICODE
-       InsetCommandMailer::string2params("ref", to_utf8(str), icp);
+       InsetCommand::string2params("ref", to_utf8(str), icp);
        mathed_parse_cell(ar, icp.getCommand());
        if (ar.size() != 1)
                return false;