split LyXText::rowlist_ into individual Paragraph::rows_ chunks

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

diff --git a/src/mathed/math_factory.C b/src/mathed/math_factory.C
index 1a124d08844214c014388c597d5e96b5fa6b04e0..ad680b28d1459ab9b68d3cb9a987862b8277ee06 100644 (file)
--- a/src/mathed/math_factory.C
+++ b/src/mathed/math_factory.C
@@ -1,7 +1,3 @@
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include <config.h>
 
 #include "math_parser.h"
@@ -19,12 +15,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_parboxinset.h"
 #include "math_rootinset.h"
 #include "math_sizeinset.h"
@@ -34,29 +30,32 @@
 #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 "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>
 
-bool has_math_fonts;
+using namespace lyx::support;
 
 using std::endl;
 
+bool has_math_fonts;
+
 
 namespace {
 
@@ -146,13 +145,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
@@ -256,10 +259,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 +277,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")
@@ -295,3 +300,27 @@ MathAtom createMathInset(string const & s)
        //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();
+}