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 6ca7a4d9f6f39684b237289cb09842cb8e416e76..284faadaaf8f54b279bd4e3a045172c030520350 100644 (file)
--- a/src/mathed/MathFactory.cpp
+++ b/src/mathed/MathFactory.cpp
@@ -47,10 +47,9 @@
 #include "MathParser.h"
 #include "MathSupport.h"
 
-#include "support/debug.h"
-
 #include "insets/InsetCommand.h"
 
+#include "support/debug.h"
 #include "support/docstream.h"
 #include "support/FileName.h"
 #include "support/filetools.h" // LibFileSearch
@@ -70,13 +69,10 @@ bool has_math_fonts;
 
 namespace {
 
-// file scope
-typedef map<docstring, latexkeys> WordList;
-
-WordList theWordList;
+MathWordList theWordList;
 
 
-bool math_font_available(docstring & name)
+bool isMathFontAvailable(docstring & name)
 {
        FontInfo f;
        augmentFont(f, name);
@@ -125,7 +121,7 @@ void initSymbols()
                        is >> tmp;
                        is >> tmp;
                        docstring t = from_utf8(tmp);
-                       skip = !math_font_available(t);
+                       skip = !isMathFontAvailable(t);
                        continue;
                } else if (line.size() >= 4 && line.substr(0, 4) == "else") {
                        skip = !skip;
@@ -181,10 +177,10 @@ void initSymbols()
                        if (tmp.extra == "func" || tmp.extra == "funclim" || tmp.extra == "special") {
                                LYXERR(Debug::MATHED, "symbol abuse for " << to_utf8(tmp.name));
                                tmp.draw = tmp.name;
-                       } else if (math_font_available(tmp.inset)) {
+                       } else if (isMathFontAvailable(tmp.inset)) {
                                LYXERR(Debug::MATHED, "symbol available for " << to_utf8(tmp.name));
                                tmp.draw.push_back(char_type(charid));
-                       } else if (fallbackid && math_font_available(symbol_font)) {
+                       } else if (fallbackid && isMathFontAvailable(symbol_font)) {
                                if (tmp.inset == "cmex")
                                        tmp.inset = from_ascii("lyxsymbol");
                                else
@@ -216,12 +212,17 @@ void initSymbols()
        }
        docstring tmp = from_ascii("cmm");
        docstring tmp2 = from_ascii("cmsy");
-       has_math_fonts = math_font_available(tmp) && math_font_available(tmp2);
+       has_math_fonts = isMathFontAvailable(tmp) && isMathFontAvailable(tmp2);
 }
 
 
 } // namespace anon
 
+MathWordList const & mathedWordList()
+{
+       return theWordList;
+}
+
 
 void initMath()
 {
@@ -236,7 +237,7 @@ void initMath()
 
 latexkeys const * in_word_set(docstring const & str)
 {
-       WordList::iterator it = theWordList.find(str);
+       MathWordList::iterator it = theWordList.find(str);
        return it != theWordList.end() ? &(it->second) : 0;
 }
 
@@ -301,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") {
@@ -351,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")
@@ -375,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")
@@ -411,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;