Another assertion that got transformed in 1b1f8dd2

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

diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp
index 6a5112925c690ed7938c67a281646dfa742ab2cc..bf468e8616b792dd665ccff1829874ab972825a9 100644 (file)
--- a/src/mathed/MathFactory.cpp
+++ b/src/mathed/MathFactory.cpp
@@ -16,6 +16,8 @@
 #include "InsetMathArray.h"
 #include "InsetMathBoldSymbol.h"
 #include "InsetMathBox.h"
+#include "InsetMathCancel.h"
+#include "InsetMathCancelto.h"
 #include "InsetMathCases.h"
 #include "InsetMathColor.h"
 #include "InsetMathDecoration.h"
@@ -30,6 +32,7 @@
 #include "InsetMathPhantom.h"
 #include "InsetMathRef.h"
 #include "InsetMathRoot.h"
+#include "InsetMathSideset.h"
 #include "InsetMathSize.h"
 #include "InsetMathSpace.h"
 #include "InsetMathSpecialChar.h"
@@ -44,6 +47,7 @@
 #include "InsetMathHull.h"
 #include "InsetMathXArrow.h"
 #include "InsetMathXYMatrix.h"
+#include "InsetMathDiagram.h"
 #include "MacroTable.h"
 #include "MathMacro.h"
 #include "MathMacroArgument.h"
@@ -59,6 +63,7 @@
 #include "support/FileName.h"
 #include "support/filetools.h" // LibFileSearch
 #include "support/lstrings.h"
+#include "support/textutils.h"
 
 #include "frontends/FontLoader.h"
 
@@ -148,7 +153,15 @@ void initSymbols()
                        string macro;
                        string requires;
                        is >> macro >> requires;
-                       MacroTable::globalMacros().insert(0, from_utf8(macro), requires);
+                       MacroTable::iterator it = MacroTable::globalMacros().insert(
+                                       0, from_utf8(macro), requires);
+                       // If you change the following output, please adjust
+                       // development/tools/generate_symbols_images.py.
+                       LYXERR(Debug::MATHED, "read symbol '" << to_utf8(it->first)
+                               << "  inset: macro"
+                               << "  draw: 0"
+                               << "  extra: "
+                               << "  requires: " << requires << '\'');
                        continue;
                }
 
@@ -160,9 +173,12 @@ void initSymbols()
                else
                        is >> tmp.extra;
                // requires is optional
-               if (is)
+               if (is) {
                        is >> tmp.requires;
-               else {
+                       // backward compatibility
+                       if (tmp.requires == "esintoramsmath")
+                               tmp.requires = from_ascii("esint|amsmath");
+               } else {
                        LYXERR(Debug::MATHED, "skipping line '" << line << "'\n"
                                << to_utf8(tmp.name) << ' ' << to_utf8(tmp.inset) << ' '
                                << to_utf8(tmp.extra));
@@ -216,6 +232,8 @@ void initSymbols()
                else
                        theMathWordList[tmp.name] = tmp;
 
+               // If you change the following output, please adjust
+               // development/tools/generate_symbols_images.py.
                LYXERR(Debug::MATHED, "read symbol '" << to_utf8(tmp.name)
                        << "  inset: " << to_utf8(tmp.inset)
                        << "  draw: " << int(tmp.draw.empty() ? 0 : tmp.draw[0])
@@ -236,7 +254,7 @@ bool isSpecialChar(docstring const & name)
 
        char_type const c = name.at(0);
        return  c == '{' || c == '}' || c == '&' || c == '$' ||
-               c == '#' || c == '%' || c == '_' || c == ' ';
+               c == '#' || c == '%' || c == '_';
 }
 
 
@@ -318,7 +336,7 @@ MathAtom createInsetMath(docstring const & s, Buffer * buf)
 {
        //lyxerr << "creating inset with name: '" << to_utf8(s) << '\'' << endl;
        if ((s == "ce" || s == "cf") && buf
-           && buf->params().use_mhchem == BufferParams::package_off)
+           && buf->params().use_package("mhchem") == BufferParams::package_off)
                return MathAtom(new MathMacro(buf, s));
 
        latexkeys const * l = in_word_set(s);
@@ -417,6 +435,9 @@ MathAtom createInsetMath(docstring const & s, Buffer * buf)
                return MathAtom(new InsetMathXYMatrix(buf, spacing, spacing_code,
                        equal_spacing));
        }
+
+       if (s == "Diagram")
+               return MathAtom(new InsetMathDiagram(buf));
        if (s == "xrightarrow" || s == "xleftarrow")
                return MathAtom(new InsetMathXArrow(buf, s));
        if (s == "split" || s == "alignedat")
@@ -434,7 +455,10 @@ MathAtom createInsetMath(docstring const & s, Buffer * buf)
        if (s == "tabular")
                return MathAtom(new InsetMathTabular(buf, s, 1, 1));
        if (s == "stackrel")
-               return MathAtom(new InsetMathStackrel(buf));
+               return MathAtom(new InsetMathStackrel(buf, false));
+       // This string value is only for math toolbar use, no LaTeX name
+       if (s == "stackrelthree")
+               return MathAtom(new InsetMathStackrel(buf, true));
        if (s == "binom")
                return MathAtom(new InsetMathBinom(buf, InsetMathBinom::BINOM));
        if (s == "dbinom")
@@ -494,10 +518,37 @@ MathAtom createInsetMath(docstring const & s, Buffer * buf)
                return MathAtom(new InsetMathPhantom(buf, InsetMathPhantom::phantom));
        if (s == "vphantom")
                return MathAtom(new InsetMathPhantom(buf, InsetMathPhantom::vphantom));
+       if (s == "cancel")
+               return MathAtom(new InsetMathCancel(buf, InsetMathCancel::cancel));
+       if (s == "bcancel")
+               return MathAtom(new InsetMathCancel(buf, InsetMathCancel::bcancel));
+       if (s == "xcancel")
+               return MathAtom(new InsetMathCancel(buf, InsetMathCancel::xcancel));
+       if (s == "cancelto")
+               return MathAtom(new InsetMathCancelto(buf));
+       if (s == "smash")
+               return MathAtom(new InsetMathPhantom(buf, InsetMathPhantom::smash));
+       if (s == "mathclap")
+               return MathAtom(new InsetMathPhantom(buf, InsetMathPhantom::mathclap));
+       if (s == "mathllap")
+               return MathAtom(new InsetMathPhantom(buf, InsetMathPhantom::mathllap));
+       if (s == "mathrlap")
+               return MathAtom(new InsetMathPhantom(buf, InsetMathPhantom::mathrlap));
        if (s == "ensuremath")
                return MathAtom(new InsetMathEnsureMath(buf));
+       if (s == "sideset")
+               return MathAtom(new InsetMathSideset(buf, true, true));
+       // The following 3 string values are only for math toolbar use, no LaTeX names
+       if (s == "sidesetr")
+               return MathAtom(new InsetMathSideset(buf, false, true));
+       if (s == "sidesetl")
+               return MathAtom(new InsetMathSideset(buf, true, false));
+       if (s == "sidesetn")
+               return MathAtom(new InsetMathSideset(buf, false, false));
        if (isSpecialChar(s))
                return MathAtom(new InsetMathSpecialChar(s));
+       if (s == " ")
+               return MathAtom(new InsetMathSpace(" ", ""));
 
        if (s == "regexp")
                return MathAtom(new InsetMathHull(buf, hullRegexp));
@@ -516,7 +567,7 @@ bool createInsetMath_fromDialogStr(docstring const & str, MathData & ar)
        if (name == "ref") {
                InsetCommandParams icp(REF_CODE);
                // FIXME UNICODE
-               InsetCommand::string2params("ref", to_utf8(str), icp);
+               InsetCommand::string2params(to_utf8(str), icp);
                Encoding const * const utf8 = encodings.fromLyXName("utf8");
                OutputParams op(utf8);
                mathed_parse_cell(ar, icp.getCommand(op));
@@ -524,11 +575,13 @@ bool createInsetMath_fromDialogStr(docstring const & str, MathData & ar)
                InsetSpaceParams isp(true);
                InsetSpace::string2params(to_utf8(str), isp);
                InsetSpace is(isp);
-               odocstringstream os;
+               TexRow texrow;
+               odocstringstream ods;
+               otexstream os(ods, texrow);
                Encoding const * const ascii = encodings.fromLyXName("ascii");
                OutputParams op(ascii);
                is.latex(os, op);
-               mathed_parse_cell(ar, os.str());
+               mathed_parse_cell(ar, ods.str());
                if (ar.size() == 2) {
                        // remove "{}"
                        if (ar[1].nucleus()->asBraceInset())
@@ -546,7 +599,7 @@ bool createInsetMath_fromDialogStr(docstring const & str, MathData & ar)
 
 bool isAsciiOrMathAlpha(char_type c)
 {
-       return c < 0x80 || Encodings::isMathAlpha(c);
+       return isASCII(c) || Encodings::isMathAlpha(c);
 }