X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathFactory.cpp;h=79ae676fc39b3ddc3d583149fd7d306f41e6d568;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=34131278b5b52d6c173ca0534830f90d32f54d89;hpb=9c55af4a223ce4db29d643251109e245665344bd;p=lyx.git

diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp
index 34131278b5..79ae676fc3 100644
--- a/src/mathed/MathFactory.cpp
+++ b/src/mathed/MathFactory.cpp
@@ -19,6 +19,7 @@
 #include "InsetMathCancel.h"
 #include "InsetMathCancelto.h"
 #include "InsetMathCases.h"
+#include "InsetMathClass.h"
 #include "InsetMathColor.h"
 #include "InsetMathDecoration.h"
 #include "InsetMathDots.h"
@@ -73,6 +74,8 @@
 #include "LyX.h" // use_gui
 #include "OutputParams.h"
 
+#include <iomanip>
+
 using namespace std;
 using namespace lyx::support;
 
@@ -92,7 +95,7 @@ bool isMathFontAvailable(string & name)
 		return false;
 
 	FontInfo f;
-	augmentFont(f, from_ascii(name));
+	augmentFont(f, name);
 
 	// Do we have the font proper?
 	if (theFontLoader().available(f))
@@ -146,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)) {
@@ -157,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;
@@ -185,7 +192,8 @@ void initSymbols()
 			string requires;
 			string extra;
 			string xmlname;
-			is >> macro >> requires;
+			bool hidden = false;
+			is >> setw(65536) >> macro >> requires;
 			if ((is >> xmlname)) {
 				extra = requires;
 				if (!(is >> requires))
@@ -205,7 +213,11 @@ void initSymbols()
 					tmp.name = it->first;
 					tmp.extra = from_utf8(extra);
 					tmp.xmlname = from_utf8(xmlname);
-					tmp.requires = requires;
+					if (requires == "hiddensymbol") {
+						requires = "";
+						tmp.hidden = hidden = true;
+					} else
+						tmp.requires = requires;
 					theMathWordList[it->first] = tmp;
 					wit = theMathWordList.find(it->first);
 					it->second.setSymbol(&(wit->second));
@@ -218,7 +230,8 @@ void initSymbols()
 				<< "  draw: 0"
 				<< "  extra: " << extra
 				<< "  xml: " << xmlname
-				<< "  requires: " << requires << '\'');
+				<< "  requires: " << requires
+				<< "  hidden: " << hidden << '\'');
 			continue;
 		}
 
@@ -227,7 +240,7 @@ void initSymbols()
 		docstring help;
 		is >> tmp.name >> help;
 		tmp.inset = to_ascii(help);
-		if (isFontName(help))
+		if (isFontName(tmp.inset))
 			is >> charid >> fallbackid >> tmp.extra >> tmp.xmlname;
 		else
 			is >> tmp.extra;
@@ -247,7 +260,7 @@ void initSymbols()
 			continue;
 		}
 
-		if (isFontName(from_ascii(tmp.inset))) {
+		if (isFontName(tmp.inset)) {
 			// tmp.inset _is_ the fontname here.
 			// create fallbacks if necessary
 
@@ -294,6 +307,12 @@ void initSymbols()
 					      << " used for " << to_utf8(tmp.name));
 		}
 
+		if (tmp.requires == "hiddensymbol")
+		{
+			tmp.requires = "";
+			tmp.hidden = true;
+		}
+
 		if (theMathWordList.find(tmp.name) != theMathWordList.end())
 			LYXERR(Debug::MATHED, "readSymbols: inset " << to_utf8(tmp.name)
 				<< " already exists.");
@@ -307,7 +326,8 @@ 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.requires
+			<< "  hidden: " << tmp.hidden << '\'');
 	}
 	string tmp = "cmm";
 	string tmp2 = "cmsy";
@@ -346,23 +366,41 @@ void initMath()
 }
 
 
-bool ensureMath(WriteStream & os, bool needs_math_mode, bool macro)
+bool ensureMath(WriteStream & os, bool needs_mathmode, bool macro,
+                bool textmode_macro)
 {
 	bool brace = os.pendingBrace();
 	os.pendingBrace(false);
 	if (!os.latex())
 		return brace;
-	if (os.textMode() && needs_math_mode) {
-		os << "\\ensuremath{";
+	if (os.textMode() && needs_mathmode) {
+		if (brace) {
+			// close \lyxmathsym
+			os << '}';
+			brace = false;
+		} else {
+			os << "\\ensuremath{";
+			brace = true;
+		}
 		os.textMode(false);
-		brace = true;
-	} else if (macro && brace && !needs_math_mode) {
-		// This is a user defined macro, but not a MathMacro, so we
-		// cannot be sure what mode is needed. As it was entered in
-		// a text box, we restore the text mode.
-		os << '}';
+	} else if (macro && textmode_macro && !os.textMode()) {
+		if (brace) {
+			// close \ensuremath
+			os << '}';
+			brace = false;
+		} else {
+			os << "\\lyxmathsym{";
+			brace = true;
+		}
 		os.textMode(true);
+	} else if (macro && brace && !needs_mathmode && !textmode_macro) {
+		// This is a user defined macro, not a MathMacro, 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.
+		os << '}';
 		brace = false;
+		os.textMode(!os.textMode());
 	}
 	return brace;
 }
@@ -426,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")
@@ -462,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;
@@ -630,7 +668,6 @@ MathAtom createInsetMath(docstring const & s, Buffer * buf)
 		return MathAtom(new InsetMathSpecialChar(s));
 	if (s == " ")
 		return MathAtom(new InsetMathSpace(" ", ""));
-
 	if (s == "regexp")
 		return MathAtom(new InsetMathHull(buf, hullRegexp));
 
@@ -656,9 +693,8 @@ bool createInsetMath_fromDialogStr(docstring const & str, MathData & ar)
 		InsetSpaceParams isp(true);
 		InsetSpace::string2params(to_utf8(str), isp);
 		InsetSpace is(isp);
-		TexRow texrow;
 		odocstringstream ods;
-		otexstream os(ods, texrow);
+		otexstream os(ods);
 		Encoding const * const ascii = encodings.fromLyXName("ascii");
 		OutputParams op(ascii);
 		is.latex(os, op);