More requires --> required, for C++2a.

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

diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp
index f00093746f8ca73f37b3ac80d9cc4cff473cb690..f4b56687181807e019bca2092f386822bba14e95 100644 (file)
--- a/src/mathed/MathFactory.cpp
+++ b/src/mathed/MathFactory.cpp
@@ -50,8 +50,8 @@
 #include "InsetMathXYMatrix.h"
 #include "InsetMathDiagram.h"
 #include "MacroTable.h"
-#include "MathMacro.h"
-#include "MathMacroArgument.h"
+#include "InsetMathMacro.h"
+#include "InsetMathMacroArgument.h"
 #include "MathParser.h"
 #include "MathStream.h"
 #include "MathSupport.h"
@@ -74,6 +74,7 @@
 #include "LyX.h" // use_gui
 #include "OutputParams.h"
 
+#include <iomanip>
 
 using namespace std;
 using namespace lyx::support;
@@ -148,6 +149,8 @@ void initSymbols()
        }
 
        ifstream fs(filename.toFilesystemEncoding().c_str());
+       // limit the size of strings we read to avoid memory problems
+       fs >> setw(65636);
        string line;
        bool skip = false;
        while (getline(fs, line)) {
@@ -159,6 +162,8 @@ void initSymbols()
                // special case of iffont/else/endif
                if (line.size() >= 7 && line.substr(0, 6) == "iffont") {
                        istringstream is(line);
+                       // limit the size of strings we read to avoid memory problems
+                       is >> setw(65636);
                        string tmp;
                        is >> tmp;
                        is >> tmp;
@@ -188,7 +193,7 @@ void initSymbols()
                        string extra;
                        string xmlname;
                        bool hidden = false;
-                       is >> macro >> requires;
+                       is >> setw(65536) >> macro >> requires;
                        if ((is >> xmlname)) {
                                extra = requires;
                                if (!(is >> requires))
@@ -212,7 +217,7 @@ void initSymbols()
                                                requires = "";
                                                tmp.hidden = hidden = true;
                                        } else
-                                               tmp.requires = requires;
+                                               tmp.required = requires;
                                        theMathWordList[it->first] = tmp;
                                        wit = theMathWordList.find(it->first);
                                        it->second.setSymbol(&(wit->second));
@@ -244,9 +249,9 @@ void initSymbols()
                        if ((is >> help)) {
                                // backward compatibility
                                if (help == "esintoramsmath")
-                                       tmp.requires = "esint|amsmath";
+                                       tmp.required = "esint|amsmath";
                                else
-                                       tmp.requires = to_ascii(help);
+                                       tmp.required = to_ascii(help);
                        }
                } else {
                        LYXERR(Debug::MATHED, "skipping line '" << line << "'\n"
@@ -260,13 +265,13 @@ void initSymbols()
                        // create fallbacks if necessary
 
                        // store requirements as long as we can
-                       if (tmp.requires.empty()) {
+                       if (tmp.required.empty()) {
                                if (tmp.inset == "msa" || tmp.inset == "msb")
-                                       tmp.requires = "amssymb";
+                                       tmp.required = "amssymb";
                                else if (tmp.inset == "wasy")
-                                       tmp.requires = "wasysym";
+                                       tmp.required = "wasysym";
                                else if (tmp.inset == "mathscr")
-                                       tmp.requires = "mathrsfs";
+                                       tmp.required = "mathrsfs";
                        }
 
                        // symbol font is not available sometimes
@@ -302,9 +307,9 @@ void initSymbols()
                                              << " used for " << to_utf8(tmp.name));
                }
 
-               if (tmp.requires == "hiddensymbol")
+               if (tmp.required == "hiddensymbol")
                {
-                       tmp.requires = "";
+                       tmp.required = "";
                        tmp.hidden = true;
                }
 
@@ -321,7 +326,7 @@ void initSymbols()
                        << "  draw: " << int(tmp.draw.empty() ? 0 : tmp.draw[0])
                        << "  extra: " << to_utf8(tmp.extra)
                        << "  xml: " << to_utf8(tmp.xmlname)
-                       << "  requires: " << tmp.requires
+                       << "  requires: " << tmp.required
                        << "  hidden: " << tmp.hidden << '\'');
        }
        string tmp = "cmm";
@@ -342,7 +347,7 @@ bool isSpecialChar(docstring const & name)
 }
 
 
-} // namespace anon
+} // namespace
 
 MathWordList const & mathedWordList()
 {
@@ -389,7 +394,7 @@ bool ensureMath(WriteStream & os, bool needs_mathmode, bool macro,
                }
                os.textMode(true);
        } else if (macro && brace && !needs_mathmode && !textmode_macro) {
-               // This is a user defined macro, not a MathMacro, so we
+               // This is a user defined macro, not a InsetMathMacro, so we
                // cannot be sure what mode is needed. We leave it in the
                // same environment it was entered by closing either \lyxmathsym
                // or \ensuremath, whichever was opened.
@@ -443,7 +448,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_package("mhchem") == BufferParams::package_off)
-               return MathAtom(new MathMacro(buf, s));
+               return MathAtom(new InsetMathMacro(buf, s));
 
        latexkeys const * l = in_word_set(s);
        if (l) {
@@ -459,6 +464,8 @@ MathAtom createInsetMath(docstring const & s, Buffer * buf)
                        return MathAtom(new InsetMathDecoration(buf, l));
                if (inset == "space")
                        return MathAtom(new InsetMathSpace(to_ascii(l->name), ""));
+               if (inset == "class")
+                       return MathAtom(new InsetMathClass(buf, string_to_class(s)));
                if (inset == "dots")
                        return MathAtom(new InsetMathDots(l));
                if (inset == "mbox")
@@ -483,10 +490,10 @@ MathAtom createInsetMath(docstring const & s, Buffer * buf)
        }
 
        if (s.size() == 2 && s[0] == '#' && s[1] >= '1' && s[1] <= '9')
-               return MathAtom(new MathMacroArgument(s[1] - '0'));
+               return MathAtom(new InsetMathMacroArgument(s[1] - '0'));
        if (s.size() == 3 && s[0] == '\\' && s[1] == '#'
                        && s[2] >= '1' && s[2] <= '9')
-               return MathAtom(new MathMacroArgument(s[2] - '0'));
+               return MathAtom(new InsetMathMacroArgument(s[2] - '0'));
        if (s == "boxed")
                return MathAtom(new InsetMathBoxed(buf));
        if (s == "fbox")
@@ -495,8 +502,6 @@ MathAtom createInsetMath(docstring const & s, Buffer * buf)
                return MathAtom(new InsetMathMakebox(buf, true));
        if (s == "makebox")
                return MathAtom(new InsetMathMakebox(buf, false));
-       if (s == "kern")
-               return MathAtom(new InsetMathKern);
        if (s.substr(0, 8) == "xymatrix") {
                char spacing_code = '\0';
                Length spacing;
@@ -666,11 +671,7 @@ MathAtom createInsetMath(docstring const & s, Buffer * buf)
        if (s == "regexp")
                return MathAtom(new InsetMathHull(buf, hullRegexp));
 
-       MathClass const mc = string_to_class(s);
-       if (mc != MC_UNKNOWN)
-               return MathAtom(new InsetMathClass(buf, mc));
-
-       return MathAtom(new MathMacro(buf, s));
+       return MathAtom(new InsetMathMacro(buf, s));
 }
 
 
@@ -713,10 +714,4 @@ bool createInsetMath_fromDialogStr(docstring const & str, MathData & ar)
 }
 
 
-bool isAsciiOrMathAlpha(char_type c)
-{
-       return isASCII(c) || Encodings::isMathAlpha(c);
-}
-
-
 } // namespace lyx