X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathFactory.cpp;h=bf468e8616b792dd665ccff1829874ab972825a9;hb=d243e53f54e861c90ce7135f3d1a8d68d6202555;hp=d41d4558cc821dd8e20b03ea0045182dbc2a6f00;hpb=8838648858532a8f1c323f25f37a72c4d2eba496;p=lyx.git

diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp
index d41d4558cc..bf468e8616 100644
--- a/src/mathed/MathFactory.cpp
+++ b/src/mathed/MathFactory.cpp
@@ -32,6 +32,7 @@
 #include "InsetMathPhantom.h"
 #include "InsetMathRef.h"
 #include "InsetMathRoot.h"
+#include "InsetMathSideset.h"
 #include "InsetMathSize.h"
 #include "InsetMathSpace.h"
 #include "InsetMathSpecialChar.h"
@@ -62,6 +63,7 @@
 #include "support/FileName.h"
 #include "support/filetools.h" // LibFileSearch
 #include "support/lstrings.h"
+#include "support/textutils.h"
 
 #include "frontends/FontLoader.h"
 
@@ -151,7 +153,15 @@ void initSymbols()
 			string macro;
 			string requires;
 			is >> macro >> requires;
-			MacroTable::globalMacros().insert(0, from_utf8(macro), requires);
+			MacroTable::iterator it = MacroTable::globalMacros().insert(
+					0, from_utf8(macro), requires);
+			// 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: "
+				<< "  requires: " << requires << '\'');
 			continue;
 		}
 
@@ -445,7 +455,10 @@ MathAtom createInsetMath(docstring const & s, Buffer * buf)
 	if (s == "tabular")
 		return MathAtom(new InsetMathTabular(buf, s, 1, 1));
 	if (s == "stackrel")
-		return MathAtom(new InsetMathStackrel(buf));
+		return MathAtom(new InsetMathStackrel(buf, false));
+	// This string value is only for math toolbar use, no LaTeX name
+	if (s == "stackrelthree")
+		return MathAtom(new InsetMathStackrel(buf, true));
 	if (s == "binom")
 		return MathAtom(new InsetMathBinom(buf, InsetMathBinom::BINOM));
 	if (s == "dbinom")
@@ -523,6 +536,15 @@ MathAtom createInsetMath(docstring const & s, Buffer * buf)
 		return MathAtom(new InsetMathPhantom(buf, InsetMathPhantom::mathrlap));
 	if (s == "ensuremath")
 		return MathAtom(new InsetMathEnsureMath(buf));
+	if (s == "sideset")
+		return MathAtom(new InsetMathSideset(buf, true, true));
+	// The following 3 string values are only for math toolbar use, no LaTeX names
+	if (s == "sidesetr")
+		return MathAtom(new InsetMathSideset(buf, false, true));
+	if (s == "sidesetl")
+		return MathAtom(new InsetMathSideset(buf, true, false));
+	if (s == "sidesetn")
+		return MathAtom(new InsetMathSideset(buf, false, false));
 	if (isSpecialChar(s))
 		return MathAtom(new InsetMathSpecialChar(s));
 	if (s == " ")
@@ -577,7 +599,7 @@ bool createInsetMath_fromDialogStr(docstring const & str, MathData & ar)
 
 bool isAsciiOrMathAlpha(char_type c)
 {
-	return c < 0x80 || Encodings::isMathAlpha(c);
+	return isASCII(c) || Encodings::isMathAlpha(c);
 }