X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathFactory.cpp;h=f2e980a2db7b47b0e8164a75cddaa9954c384678;hb=1840b5992c9d8b3546812f29cfb742cce05ff947;hp=d19899866fb25c7c8509107024a48ed168ef1704;hpb=c9a49d2145c60c71768d7df1a615f7e4e043e703;p=lyx.git

diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp
index d19899866f..f2e980a2db 100644
--- a/src/mathed/MathFactory.cpp
+++ b/src/mathed/MathFactory.cpp
@@ -86,13 +86,13 @@ namespace {
 MathWordList theMathWordList;
 
 
-bool isMathFontAvailable(docstring & name)
+bool isMathFontAvailable(string & name)
 {
 	if (!use_gui)
 		return false;
 
 	FontInfo f;
-	augmentFont(f, name);
+	augmentFont(f, from_ascii(name));
 
 	// Do we have the font proper?
 	if (theFontLoader().available(f))
@@ -100,12 +100,12 @@ bool isMathFontAvailable(docstring & name)
 
 	// can we fake it?
 	if (name == "eufrak") {
-		name = from_ascii("lyxfakefrak");
+		name = "lyxfakefrak";
 		return true;
 	}
 
 	LYXERR(Debug::MATHED,
-		"font " << to_utf8(name) << " not available and I can't fake it");
+		"font " << name << " not available and I can't fake it");
 	return false;
 }
 
@@ -118,10 +118,8 @@ bool canBeDisplayed(char_type c)
 }
 
 
-bool isUnicodeSymbolAvailable(docstring const & /*name*/, char_type & /*c*/)
+bool isUnicodeSymbolAvailable(docstring const & name, char_type & c)
 {
-	// this is too fragile, e.g. prodes W instead of capital omega on OS X
-#if 0
 	docstring cmd(from_ascii("\\") + name);
 	bool is_combining;
 	bool termination;
@@ -135,9 +133,6 @@ bool isUnicodeSymbolAvailable(docstring const & /*name*/, char_type & /*c*/)
 		                                is_combining, termination);
 	}
 	return c != 0 && !is_combining;
-#else
-	return false;
-#endif
 }
 
 
@@ -165,8 +160,7 @@ void initSymbols()
 			string tmp;
 			is >> tmp;
 			is >> tmp;
-			docstring t = from_utf8(tmp);
-			skip = !isMathFontAvailable(t);
+			skip = !isMathFontAvailable(tmp);
 			continue;
 		} else if (line.size() >= 4 && line.substr(0, 4) == "else") {
 			skip = !skip;
@@ -180,58 +174,101 @@ void initSymbols()
 		// special case of pre-defined macros
 		if (line.size() > 8 && line.substr(0, 5) == "\\def\\") {
 			//lyxerr << "macro definition: '" << line << '\'' << endl;
+			// syntax: Either
+			// \def\macroname{definition}
+			// or
+			// \def\macroname{definition} requires
+			// or
+			// \def\macroname{definition} extra xmlname requires
 			istringstream is(line);
 			string macro;
 			string requires;
+			string extra;
+			string xmlname;
+			bool hidden = false;
 			is >> macro >> requires;
+			if ((is >> xmlname)) {
+				extra = requires;
+				if (!(is >> requires))
+					requires = "";
+			} else
+				xmlname = "";
 			MacroTable::iterator it = MacroTable::globalMacros().insert(
-					0, from_utf8(macro), requires);
+					0, from_utf8(macro));
+			if (!extra.empty() || !xmlname.empty() || !requires.empty()) {
+				MathWordList::iterator wit = theMathWordList.find(it->first);
+				if (wit != theMathWordList.end())
+					LYXERR(Debug::MATHED, "readSymbols: inset "
+						<< to_utf8(it->first) << " already exists.");
+				else {
+					latexkeys tmp;
+					tmp.inset = "macro";
+					tmp.name = it->first;
+					tmp.extra = from_utf8(extra);
+					tmp.xmlname = from_utf8(xmlname);
+					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));
+				}
+			}
 			// 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 << '\'');
+				<< "  extra: " << extra
+				<< "  xml: " << xmlname
+				<< "  requires: " << requires
+				<< "  hidden: " << hidden << '\'');
 			continue;
 		}
 
 		idocstringstream is(from_utf8(line));
 		latexkeys tmp;
-		is >> tmp.name >> tmp.inset;
-		if (isFontName(tmp.inset))
+		docstring help;
+		is >> tmp.name >> help;
+		tmp.inset = to_ascii(help);
+		if (isFontName(help))
 			is >> charid >> fallbackid >> tmp.extra >> tmp.xmlname;
 		else
 			is >> tmp.extra;
 		// requires is optional
 		if (is) {
-			is >> tmp.requires;
-			// backward compatibility
-			if (tmp.requires == "esintoramsmath")
-				tmp.requires = from_ascii("esint|amsmath");
+			if ((is >> help)) {
+				// backward compatibility
+				if (help == "esintoramsmath")
+					tmp.requires = "esint|amsmath";
+				else
+					tmp.requires = to_ascii(help);
+			}
 		} else {
 			LYXERR(Debug::MATHED, "skipping line '" << line << "'\n"
-				<< to_utf8(tmp.name) << ' ' << to_utf8(tmp.inset) << ' '
+				<< to_utf8(tmp.name) << ' ' << tmp.inset << ' '
 				<< to_utf8(tmp.extra));
 			continue;
 		}
 
-		if (isFontName(tmp.inset)) {
+		if (isFontName(from_ascii(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.inset == "msa" || tmp.inset == "msb")
-					tmp.requires = from_ascii("amssymb");
+					tmp.requires = "amssymb";
 				else if (tmp.inset == "wasy")
-					tmp.requires = from_ascii("wasysym");
+					tmp.requires = "wasysym";
 				else if (tmp.inset == "mathscr")
-					tmp.requires = from_ascii("mathrsfs");
+					tmp.requires = "mathrsfs";
 			}
 
 			// symbol font is not available sometimes
-			docstring symbol_font = from_ascii("lyxsymbol");
+			string symbol_font = "lyxsymbol";
 			char_type unicodesymbol = 0;
 
 			if (tmp.extra == "func" || tmp.extra == "funclim" || tmp.extra == "special") {
@@ -243,26 +280,32 @@ void initSymbols()
 			} else if (fallbackid && isMathFontAvailable(symbol_font) &&
 			           canBeDisplayed(fallbackid)) {
 				if (tmp.inset == "cmex")
-					tmp.inset = from_ascii("lyxsymbol");
+					tmp.inset = "lyxsymbol";
 				else
-					tmp.inset = from_ascii("lyxboldsymbol");
+					tmp.inset = "lyxboldsymbol";
 				LYXERR(Debug::MATHED, "symbol fallback for " << to_utf8(tmp.name));
 				tmp.draw.push_back(char_type(fallbackid));
 			} else if (isUnicodeSymbolAvailable(tmp.name, unicodesymbol)) {
 				LYXERR(Debug::MATHED, "unicode fallback for " << to_utf8(tmp.name));
-				tmp.inset = from_ascii("mathnormal");
+				tmp.inset = "mathnormal";
 				tmp.draw.push_back(unicodesymbol);
 			} else {
 				LYXERR(Debug::MATHED, "faking " << to_utf8(tmp.name));
 				tmp.draw = tmp.name;
-				tmp.inset = from_ascii("lyxtex");
+				tmp.inset = "lyxtex";
 			}
 		} else {
 			// it's a proper inset
-			LYXERR(Debug::MATHED, "inset " << to_utf8(tmp.inset)
+			LYXERR(Debug::MATHED, "inset " << tmp.inset
 					      << " 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.");
@@ -272,13 +315,15 @@ void initSymbols()
 		// If you change the following output, please adjust
 		// development/tools/generate_symbols_images.py.
 		LYXERR(Debug::MATHED, "read symbol '" << to_utf8(tmp.name)
-			<< "  inset: " << to_utf8(tmp.inset)
+			<< "  inset: " << tmp.inset
 			<< "  draw: " << int(tmp.draw.empty() ? 0 : tmp.draw[0])
 			<< "  extra: " << to_utf8(tmp.extra)
-			<< "  requires: " << to_utf8(tmp.requires) << '\'');
+			<< "  xml: " << to_utf8(tmp.xmlname)
+			<< "  requires: " << tmp.requires
+			<< "  hidden: " << tmp.hidden << '\'');
 	}
-	docstring tmp = from_ascii("cmm");
-	docstring tmp2 = from_ascii("cmsy");
+	string tmp = "cmm";
+	string tmp2 = "cmsy";
 	has_math_fonts = isMathFontAvailable(tmp) && isMathFontAvailable(tmp2);
 }
 
@@ -359,7 +404,11 @@ int ensureMode(WriteStream & os, InsetMath::mode_type mode,
 latexkeys const * in_word_set(docstring const & str)
 {
 	MathWordList::iterator it = theMathWordList.find(str);
-	return it != theMathWordList.end() ? &(it->second) : 0;
+	if (it == theMathWordList.end())
+		return 0;
+	if (it->second.inset == "macro")
+		return 0;
+	return &(it->second);
 }
 
 
@@ -378,7 +427,7 @@ MathAtom createInsetMath(docstring const & s, Buffer * buf)
 
 	latexkeys const * l = in_word_set(s);
 	if (l) {
-		docstring const & inset = l->inset;
+		string const & inset = l->inset;
 		//lyxerr << " found inset: '" << inset << '\'' << endl;
 		if (inset == "ref")
 			return MathAtom(new InsetMathRef(buf, l->name));
@@ -471,7 +520,14 @@ MathAtom createInsetMath(docstring const & s, Buffer * buf)
 
 	if (s == "Diagram")
 		return MathAtom(new InsetMathDiagram(buf));
-	if (s == "xrightarrow" || s == "xleftarrow")
+	if (s == "xrightarrow" || s == "xleftarrow" ||
+		s == "xhookrightarrow" || s == "xhookleftarrow" ||
+		s == "xRightarrow" || s == "xLeftarrow" ||
+		s == "xleftrightarrow" || s == "xLeftrightarrow" ||
+		s == "xrightharpoondown" || s == "xrightharpoonup" ||
+		s == "xleftharpoondown" || s == "xleftharpoonup" ||
+		s == "xleftrightharpoons" || s == "xrightleftharpoons" ||
+		s == "xmapsto")
 		return MathAtom(new InsetMathXArrow(buf, s));
 	if (s == "split" || s == "alignedat")
 		return MathAtom(new InsetMathSplit(buf, s));
@@ -561,6 +617,11 @@ MathAtom createInsetMath(docstring const & s, Buffer * buf)
 		return MathAtom(new InsetMathCancelto(buf));
 	if (s == "smash")
 		return MathAtom(new InsetMathPhantom(buf, InsetMathPhantom::smash));
+	// The following 2 string values are only for math toolbar use, no LaTeX names
+	if (s == "smashb")
+		return MathAtom(new InsetMathPhantom(buf, InsetMathPhantom::smashb));
+	if (s == "smasht")
+		return MathAtom(new InsetMathPhantom(buf, InsetMathPhantom::smasht));
 	if (s == "mathclap")
 		return MathAtom(new InsetMathPhantom(buf, InsetMathPhantom::mathclap));
 	if (s == "mathllap")