tex2lyx/text.cpp: fix typos

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

diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp
index ee2841a2080b467928fdf186b9b97f116ab5cd63..160196c643697154c441061b37baa7202bf96559 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"
@@ -161,9 +163,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));
@@ -237,7 +242,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 == '_';
 }
 
 
@@ -319,7 +324,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);
@@ -498,10 +503,28 @@ 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 (isSpecialChar(s))
                return MathAtom(new InsetMathSpecialChar(s));
+       if (s == " ")
+               return MathAtom(new InsetMathSpace(" ", ""));
 
        if (s == "regexp")
                return MathAtom(new InsetMathHull(buf, hullRegexp));
@@ -520,7 +543,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));
@@ -528,11 +551,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())