change "support/std_sstream.h" to <sstream>

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

diff --git a/src/mathed/math_factory.C b/src/mathed/math_factory.C
index b4e6418d604eef624250611870881b9b8bb672d0..3da237bd528201a84c1ce5488fa569ef598c94d4 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,11 +31,13 @@
 #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"
+#include "math_parser.h"
 #include "math_rootinset.h"
 #include "math_sizeinset.h"
 #include "math_spaceinset.h"
@@ -48,21 +54,23 @@
 //#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/filetools.h" // LibFileSearch
 #include "support/lstrings.h"
+
 #include "frontends/lyx_gui.h"
 
-#include <map>
 #include <fstream>
+#include <sstream>
 
-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;
 
@@ -116,7 +124,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;
@@ -132,13 +140,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));
-                       MathMacroTable::create(MathAtom(new MathMacroTemplate(is)));
+                       //lyxerr << "macro definition: '" << line << '\'' << endl;
+                       MacroTable::globalMacros().insert(line);
                        continue;
                }
 
-               istringstream is(STRCONV(line));
+               istringstream is(line);
                latexkeys tmp;
                is >> tmp.name >> tmp.inset;
                if (isFontName(tmp.inset))
@@ -211,6 +218,7 @@ void initMath()
 {
        static bool initialized = false;
        if (!initialized) {
+               initParser();
                initSymbols();
                initialized = true;
        }
@@ -228,15 +236,15 @@ 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")
+                       return MathAtom(new MathOversetInset);
                if (inset == "underset")
                        return MathAtom(new MathUndersetInset);
                if (inset == "decoration")
@@ -303,11 +311,22 @@ 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 (MacroTable::globalMacros().has(s))
+               return MathAtom(new MathMacro(s,
+                       MacroTable::globalMacros().get(s).numargs()));
+       //if (MacroTable::localMacros().has(s))
+       //      return MathAtom(new MathMacro(s,
+       //              MacroTable::localMacros().get(s).numargs()));
 
-       if (MathMacroTable::has(s))
-               return MathAtom(new MathMacro(s));
-
-       //lyxerr[Debug::MATHED] << "creating inset 2 with name: '" << s << '\'' << endl;
        return MathAtom(new MathUnknownInset(s));
 }