revert Buffer LyxText->InsetText commit

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

diff --git a/src/mathed/math_factory.C b/src/mathed/math_factory.C
index eaa9be204be406e011e9fe3397624ce52b26e5fa..dbf0223d3d452a2278f6046b999b99385abc43c8 100644 (file)
--- a/src/mathed/math_factory.C
+++ b/src/mathed/math_factory.C
@@ -10,13 +10,17 @@
 
 #include <config.h>
 
+#include "math_factory.h"
 #include "math_parser.h"
 #include "math_arrayinset.h"
 #include "math_amsarrayinset.h"
 #include "math_binominset.h"
 #include "math_boxinset.h"
+#include "math_boldsymbolinset.h"
 #include "math_casesinset.h"
+#include "math_colorinset.h"
 #include "math_decorationinset.h"
+#include "math_dfracinset.h"
 #include "math_dotsinset.h"
 #include "math_ertinset.h"
 #include "math_fboxinset.h"
@@ -27,9 +31,9 @@
 #include "math_kerninset.h"
 #include "math_lefteqninset.h"
 #include "math_macro.h"
+#include "math_macroarg.h"
 #include "math_macrotable.h"
 #include "math_macrotemplate.h"
-#include "math_macroarg.h"
 #include "math_makeboxinset.h"
 #include "math_oversetinset.h"
 #include "math_parboxinset.h"
@@ -49,21 +53,21 @@
 //#include "insets/insetref.h"
 #include "ref_inset.h"
 
-#include "metricsinfo.h"
-#include "math_data.h"
 #include "debug.h"
 #include "math_support.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "support/filetools.h" // LibFileSearch
 #include "support/lstrings.h"
 #include "frontends/lyx_gui.h"
 
-#include <map>
 #include <fstream>
 
-using namespace lyx::support;
+using lyx::support::LibFileSearch;
+using lyx::support::split;
 
+using std::string;
 using std::endl;
+using std::istringstream;
 
 bool has_math_fonts;
 
@@ -117,7 +121,7 @@ void initSymbols()
 
                // special case of iffont/else/endif
                if (line.size() >= 7 && line.substr(0, 6) == "iffont") {
-                       istringstream is(STRCONV(line));
+                       istringstream is(line);
                        string tmp;
                        is >> tmp;
                        is >> tmp;
@@ -134,12 +138,12 @@ void initSymbols()
                // special case of pre-defined macros
                if (line.size() > 8 && line.substr(0, 5) == "\\def\\") {
                        //lyxerr << "defining: '" << line << '\'' << endl;
-                       istringstream is(STRCONV(line));
+                       istringstream is(line);
                        MathMacroTable::create(MathAtom(new MathMacroTemplate(is)));
                        continue;
                }
 
-               istringstream is(STRCONV(line));
+               istringstream is(line);
                latexkeys tmp;
                is >> tmp.name >> tmp.inset;
                if (isFontName(tmp.inset))
@@ -229,13 +233,11 @@ latexkeys const * in_word_set(string const & str)
 
 MathAtom createMathInset(string const & s)
 {
-       lyxerr[Debug::MATHED] << "creating inset with name: '"
-                             << s << '\'' << endl;;
+       //lyxerr << "creating inset with name: '" << s << '\'' << endl;;
        latexkeys const * l = in_word_set(s);
        if (l) {
                string const & inset = l->inset;
-               lyxerr[Debug::MATHED] << " found inset: '" <<
-                       inset << '\'' << endl;
+               //lyxerr << " found inset: '" << inset << '\'' << endl;
                if (inset == "ref")
                        return MathAtom(new RefInset(l->name));
                if (inset == "overset")
@@ -306,11 +308,19 @@ MathAtom createMathInset(string const & s)
                return MathAtom(new MathLefteqnInset);
        if (s == "lyxert")
                return MathAtom(new MathErtInset);
+       if (s == "boldsymbol")
+               return MathAtom(new MathBoldsymbolInset);
+       if (s == "color")
+               return MathAtom(new MathColorInset(true));
+       if (s == "textcolor")
+               return MathAtom(new MathColorInset(false));
+       if (s == "dfrac")
+               return MathAtom(new MathDfracInset);
 
        if (MathMacroTable::has(s))
                return MathAtom(new MathMacro(s));
 
-       //lyxerr[Debug::MATHED] << "creating inset 2 with name: '" << s << '\'' << endl;
+       //lyxerr << "creating inset 2 with name: '" << s << '\'' << endl;
        return MathAtom(new MathUnknownInset(s));
 }