Replace LString.h with support/std_string.h,

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

diff --git a/src/mathed/math_factory.C b/src/mathed/math_factory.C
index cd569034896fe5538971f3fa294aba401d900160..9c78975ef3e0dff7befde15b770998bf12ee0199 100644 (file)
--- a/src/mathed/math_factory.C
+++ b/src/mathed/math_factory.C
@@ -1,9 +1,16 @@
-#ifdef __GNUG__
-#pragma implementation
-#endif
+/**
+ * \file math_factory.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
 #include <config.h>
 
+#include "math_factory.h"
 #include "math_parser.h"
 #include "math_arrayinset.h"
 #include "math_amsarrayinset.h"
@@ -19,12 +26,12 @@
 #include "math_fontoldinset.h"
 #include "math_fracinset.h"
 #include "math_kerninset.h"
-#include "math_inferinset.h"
 #include "math_lefteqninset.h"
 #include "math_macro.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_rootinset.h"
 #include "math_sizeinset.h"
@@ -34,29 +41,29 @@
 #include "math_stackrelinset.h"
 #include "math_substackinset.h"
 #include "math_symbolinset.h"
+#include "math_tabularinset.h"
 #include "math_undersetinset.h"
 #include "math_unknowninset.h"
 #include "math_xarrowinset.h"
-#include "math_xymatrixinset.h"
-#include "math_xyarrowinset.h"
 
 //#include "insets/insetref.h"
 #include "ref_inset.h"
 
-#include "math_metricsinfo.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>
 
-bool has_math_fonts;
+using namespace lyx::support;
 
 using std::endl;
 
+bool has_math_fonts;
+
 
 namespace {
 
@@ -123,7 +130,7 @@ void initSymbols()
 
                // special case of pre-defined macros
                if (line.size() > 8 && line.substr(0, 5) == "\\def\\") {
-                       //lyxerr << "defining: '" << line << "'" << endl;
+                       //lyxerr << "defining: '" << line << '\'' << endl;
                        istringstream is(STRCONV(line));
                        MathMacroTable::create(MathAtom(new MathMacroTemplate(is)));
                        continue;
@@ -137,7 +144,7 @@ void initSymbols()
                else
                        is >> tmp.extra;
                if (!is) {
-                       lyxerr[Debug::MATHED] << "skipping line '" << line << "'" << endl;
+                       lyxerr[Debug::MATHED] << "skipping line '" << line << '\'' << endl;
                        lyxerr[Debug::MATHED]
                                << tmp.name << ' ' << tmp.inset << ' ' << tmp.extra << endl;
                        continue;
@@ -146,13 +153,17 @@ void initSymbols()
                if (isFontName(tmp.inset)) {
                        // tmp.inset _is_ the fontname here.
                        // create fallbacks if necessary
+
+                       // symbol font is not available sometimes
+                       string symbol_font = "lyxsymbol";
+
                        if (tmp.extra == "func" || tmp.extra == "funclim" || tmp.extra == "special") {
                                lyxerr[Debug::MATHED] << "symbol abuse for " << tmp.name << endl;
                                tmp.draw = tmp.name;
                        } else if (math_font_available(tmp.inset)) {
                                lyxerr[Debug::MATHED] << "symbol available for " << tmp.name << endl;
                                tmp.draw += char(charid);
-                       } else if (fallbackid) {
+                       } else if (fallbackid && math_font_available(symbol_font)) {
                                if (tmp.inset == "cmex")
                                        tmp.inset  = "lyxsymbol";
                                else
@@ -183,7 +194,7 @@ void initSymbols()
                        << "  inset: " << tmp.inset
                        << "  draw: " << int(tmp.draw.empty() ? 0 : tmp.draw[0])
                        << "  extra: " << tmp.extra
-                       << "'" << endl;
+                       << '\'' << endl;
        }
        string tmp = "cmm";
        string tmp2 = "cmsy";
@@ -216,14 +227,16 @@ latexkeys const * in_word_set(string const & str)
 MathAtom createMathInset(string const & s)
 {
        lyxerr[Debug::MATHED] << "creating inset with name: '"
-                             << s << "'" << endl;;
+                             << s << '\'' << endl;;
        latexkeys const * l = in_word_set(s);
        if (l) {
                string const & inset = l->inset;
                lyxerr[Debug::MATHED] << " found inset: '" <<
-                       inset << "'" << endl;
+                       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")
@@ -256,10 +269,10 @@ MathAtom createMathInset(string const & s)
                return MathAtom(new MathMacroArgument(s[2] - '0'));
        if (s == "framebox")
                return MathAtom(new MathFrameboxInset);
+       if (s == "makebox")
+               return MathAtom(new MathMakeboxInset);
        if (s == "kern")
                return MathAtom(new MathKernInset);
-       if (s == "xymatrix")
-               return MathAtom(new MathXYMatrixInset);
        if (s == "xrightarrow" || s == "xleftarrow")
                return MathAtom(new MathXArrowInset(s));
        if (s == "split" || s == "gathered" || s == "aligned")
@@ -274,6 +287,8 @@ MathAtom createMathInset(string const & s)
                return MathAtom(new MathSqrtInset);
        if (s == "root")
                return MathAtom(new MathRootInset);
+       if (s == "tabular")
+               return MathAtom(new MathTabularInset(s, 1, 1));
        if (s == "stackrel")
                return MathAtom(new MathStackrelInset);
        if (s == "binom" || s == "choose")
@@ -292,6 +307,30 @@ MathAtom createMathInset(string const & s)
        if (MathMacroTable::has(s))
                return MathAtom(new MathMacro(s));
 
-       //lyxerr[Debug::MATHED] << "creating inset 2 with name: '" << s << "'" << endl;
+       //lyxerr[Debug::MATHED] << "creating inset 2 with name: '" << s << '\'' << endl;
        return MathAtom(new MathUnknownInset(s));
 }
+
+
+bool createMathInset_fromDialogStr(string const & str, MathArray & ar)
+{
+       // An example str:
+       // "ref LatexCommand \\ref{sec:Title}\n\\end_inset\n\n";
+       string name;
+       string body = split(str, name, ' ');
+
+       if (name != "ref" )
+               return false;
+
+       // body comes with a head "LatexCommand " and a
+       // tail "\nend_inset\n\n". Strip them off.
+       string trimmed;
+       body = split(body, trimmed, ' ');
+       split(body, trimmed, '\n');
+
+       mathed_parse_cell(ar, trimmed);
+       if (ar.size() != 1)
+               return false;
+
+       return ar[0].nucleus();
+}