X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathFactory.cpp;h=08f0b01e392157de8546663066a5f9366c4aaa60;hb=d9082639080b9de993742bd352f92e5183058cf5;hp=34131278b5b52d6c173ca0534830f90d32f54d89;hpb=0a93c9b70f861b12e27239167d9ba59ddd6ece1e;p=lyx.git

diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp
index 34131278b5..08f0b01e39 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"
@@ -49,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"
@@ -70,8 +71,10 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "Encoding.h"
+#include "FontInfo.h"
 #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,10 +149,13 @@ 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)) {
 		int charid     = 0;
+		int dsp_charid = 0;
 		int fallbackid = 0;
 		if (line.empty() || line[0] == '#')
 			continue;
@@ -157,6 +163,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;
@@ -179,22 +187,24 @@ void initSymbols()
 			// or
 			// \def\macroname{definition} requires
 			// or
-			// \def\macroname{definition} extra xmlname requires
+			// \def\macroname{definition} extra htmlname xmlname requires
 			istringstream is(line);
 			string macro;
-			string requires;
+			string required;
 			string extra;
+			string htmlname;
 			string xmlname;
-			is >> macro >> requires;
-			if ((is >> xmlname)) {
-				extra = requires;
-				if (!(is >> requires))
-					requires = "";
+			bool hidden = false;
+			is >> setw(65536) >> macro >> required;
+			if ((is >> htmlname >> xmlname)) {
+				extra = required;
+				if (!(is >> required))
+					required = "";
 			} else
-				xmlname = "";
+				htmlname = xmlname = "";
 			MacroTable::iterator it = MacroTable::globalMacros().insert(
-					0, from_utf8(macro));
-			if (!extra.empty() || !xmlname.empty() || !requires.empty()) {
+					nullptr, from_utf8(macro));
+			if (!extra.empty() || !htmlname.empty() || !xmlname.empty() || !required.empty()) {
 				MathWordList::iterator wit = theMathWordList.find(it->first);
 				if (wit != theMathWordList.end())
 					LYXERR(Debug::MATHED, "readSymbols: inset "
@@ -204,8 +214,13 @@ void initSymbols()
 					tmp.inset = "macro";
 					tmp.name = it->first;
 					tmp.extra = from_utf8(extra);
+					tmp.htmlname = from_utf8(htmlname);
 					tmp.xmlname = from_utf8(xmlname);
-					tmp.requires = requires;
+					if (required == "hiddensymbol") {
+						required = "";
+						tmp.hidden = hidden = true;
+					} else
+						tmp.required = required;
 					theMathWordList[it->first] = tmp;
 					wit = theMathWordList.find(it->first);
 					it->second.setSymbol(&(wit->second));
@@ -214,11 +229,13 @@ void initSymbols()
 			// 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: " << extra
-				<< "  xml: " << xmlname
-				<< "  requires: " << requires << '\'');
+			    << "  inset: macro"
+			    << "  draw: 0"
+			    << "  extra: " << extra
+			    << "  html: " << htmlname
+			    << "  xml: " << xmlname
+				<< "  requires: " << required
+				<< "  hidden: " << hidden << '\'');
 			continue;
 		}
 
@@ -227,18 +244,21 @@ void initSymbols()
 		docstring help;
 		is >> tmp.name >> help;
 		tmp.inset = to_ascii(help);
-		if (isFontName(help))
-			is >> charid >> fallbackid >> tmp.extra >> tmp.xmlname;
-		else
+		if (isFontName(tmp.inset)) {
+			is >> help >> fallbackid >> tmp.extra >> tmp.htmlname >> tmp.xmlname;
+			docstring cid, dsp_cid;
+			idocstringstream is2(subst(help, '|', ' '));
+			is2 >> charid >> dsp_charid;
+		} else
 			is >> tmp.extra;
 		// requires is optional
 		if (is) {
 			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"
@@ -247,18 +267,20 @@ void initSymbols()
 			continue;
 		}
 
-		if (isFontName(from_ascii(tmp.inset))) {
+		if (isFontName(tmp.inset)) {
 			// tmp.inset _is_ the fontname here.
 			// 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";
+				else if (tmp.inset == "mathds")
+					tmp.required = "dsfont";
 			}
 
 			// symbol font is not available sometimes
@@ -271,6 +293,10 @@ void initSymbols()
 			} else if (isMathFontAvailable(tmp.inset) && canBeDisplayed(charid)) {
 				LYXERR(Debug::MATHED, "symbol available for " << to_utf8(tmp.name));
 				tmp.draw.push_back(char_type(charid));
+				if (dsp_charid && canBeDisplayed(dsp_charid)) {
+					LYXERR(Debug::MATHED, "large symbol available for " << to_utf8(tmp.name));
+					tmp.dsp_draw.push_back(char_type(dsp_charid));
+				}
 			} else if (fallbackid && isMathFontAvailable(symbol_font) &&
 			           canBeDisplayed(fallbackid)) {
 				if (tmp.inset == "cmex")
@@ -294,6 +320,12 @@ void initSymbols()
 					      << " used for " << to_utf8(tmp.name));
 		}
 
+		if (tmp.required == "hiddensymbol")
+		{
+			tmp.required = "";
+			tmp.hidden = true;
+		}
+
 		if (theMathWordList.find(tmp.name) != theMathWordList.end())
 			LYXERR(Debug::MATHED, "readSymbols: inset " << to_utf8(tmp.name)
 				<< " already exists.");
@@ -306,8 +338,10 @@ void initSymbols()
 			<< "  inset: " << tmp.inset
 			<< "  draw: " << int(tmp.draw.empty() ? 0 : tmp.draw[0])
 			<< "  extra: " << to_utf8(tmp.extra)
+			<< "  html: " << to_utf8(tmp.htmlname)
 			<< "  xml: " << to_utf8(tmp.xmlname)
-			<< "  requires: " << tmp.requires << '\'');
+			<< "  requires: " << tmp.required
+			<< "  hidden: " << tmp.hidden << '\'');
 	}
 	string tmp = "cmm";
 	string tmp2 = "cmsy";
@@ -327,7 +361,7 @@ bool isSpecialChar(docstring const & name)
 }
 
 
-} // namespace anon
+} // namespace
 
 MathWordList const & mathedWordList()
 {
@@ -346,30 +380,48 @@ void initMath()
 }
 
 
-bool ensureMath(WriteStream & os, bool needs_math_mode, bool macro)
+bool ensureMath(TeXMathStream & 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 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.
+		os << '}';
 		brace = false;
+		os.textMode(!os.textMode());
 	}
 	return brace;
 }
 
 
-int ensureMode(WriteStream & os, InsetMath::mode_type mode,
-		bool locked, bool ascii)
+int ensureMode(TeXMathStream & os, InsetMath::mode_type mode,
+               bool locked, bool ascii)
 {
 	bool textmode = mode == InsetMath::TEXT_MODE;
 	if (os.latex() && textmode && os.pendingBrace()) {
@@ -392,9 +444,9 @@ latexkeys const * in_word_set(docstring const & str)
 {
 	MathWordList::iterator it = theMathWordList.find(str);
 	if (it == theMathWordList.end())
-		return 0;
+		return nullptr;
 	if (it->second.inset == "macro")
-		return 0;
+		return nullptr;
 	return &(it->second);
 }
 
@@ -410,7 +462,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) {
@@ -426,6 +478,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")
@@ -450,10 +504,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")
@@ -462,8 +516,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;
@@ -572,6 +624,8 @@ MathAtom createInsetMath(docstring const & s, Buffer * buf)
 		return MathAtom(new InsetMathFrac(buf, InsetMathFrac::CFRACLEFT));
 	if (s == "cfracright")
 		return MathAtom(new InsetMathFrac(buf, InsetMathFrac::CFRACRIGHT));
+	if (s == "case") // TODO: only if class is aastex(6|62)
+		return MathAtom(new InsetMathFrac(buf, InsetMathFrac::AASTEX_CASE));
 	//if (s == "infer")
 	//	return MathAtom(new MathInferInset);
 	if (s == "atop")
@@ -630,11 +684,10 @@ 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));
 
-	return MathAtom(new MathMacro(buf, s));
+	return MathAtom(new InsetMathMacro(buf, s));
 }
 
 
@@ -656,9 +709,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);
@@ -678,10 +730,4 @@ bool createInsetMath_fromDialogStr(docstring const & str, MathData & ar)
 }
 
 
-bool isAsciiOrMathAlpha(char_type c)
-{
-	return isASCII(c) || Encodings::isMathAlpha(c);
-}
-
-
 } // namespace lyx