Change the interface to a paragraph's layout. We still store a LayoutPtr, but now...

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

diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp
index 0bef08274c8479a91524e3c5007ddad5321ce528..b1e73b2a3a3ed38bb1232f2159c909310a7d8aed 100644 (file)
--- a/src/mathed/MathFactory.cpp
+++ b/src/mathed/MathFactory.cpp
@@ -14,6 +14,7 @@
 
 #include "InsetMathAMSArray.h"
 #include "InsetMathArray.h"
+#include "InsetMathBM.h"
 #include "InsetMathBoldSymbol.h"
 #include "InsetMathBox.h"
 #include "InsetMathCases.h"
@@ -69,13 +70,10 @@ bool has_math_fonts;
 
 namespace {
 
-// file scope
-typedef map<docstring, latexkeys> WordList;
+MathWordList theWordList;
 
-WordList theWordList;
 
-
-bool math_font_available(docstring & name)
+bool isMathFontAvailable(docstring & name)
 {
        FontInfo f;
        augmentFont(f, name);
@@ -124,7 +122,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;
@@ -180,10 +178,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
@@ -215,12 +213,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()
 {
@@ -235,7 +238,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;
 }
 
@@ -300,9 +303,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") {
@@ -375,6 +378,8 @@ MathAtom createInsetMath(docstring const & s)
                return MathAtom(new InsetMathLefteqn);
        if (s == "boldsymbol")
                return MathAtom(new InsetMathBoldSymbol);
+       if (s == "bm")
+               return MathAtom(new InsetMathBM);
        if (s == "color" || s == "normalcolor")
                return MathAtom(new InsetMathColor(true));
        if (s == "textcolor")