X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathFactory.cpp;h=d21af7795001f21f4200c7cadce24de1701ce5ee;hb=7998616edb587d44938d377fec94a35547150c3b;hp=3198f80de66688c3da5617e6bc7820345906bf46;hpb=527cc8ca9c829cbe227667c5c2a57ebce2199606;p=lyx.git

diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp
index 3198f80de6..d21af77950 100644
--- 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))
@@ -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) {
@@ -485,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")
@@ -666,7 +671,7 @@ MathAtom createInsetMath(docstring const & s, Buffer * buf)
 	if (s == "regexp")
 		return MathAtom(new InsetMathHull(buf, hullRegexp));
 
-	return MathAtom(new MathMacro(buf, s));
+	return MathAtom(new InsetMathMacro(buf, s));
 }
 
 
@@ -709,10 +714,4 @@ bool createInsetMath_fromDialogStr(docstring const & str, MathData & ar)
 }
 
 
-bool isAsciiOrMathAlpha(char_type c)
-{
-	return isASCII(c) || Encodings::isMathAlpha(c);
-}
-
-
 } // namespace lyx