X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmathed%2FMathFactory.cpp;h=79ae676fc39b3ddc3d583149fd7d306f41e6d568;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=7266bb0f8da651d2027df45685ba6a752930fc36;hpb=cc87f81002f60cc5ab9263d97fe4b37791376af0;p=lyx.git diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp index 7266bb0f8d..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 + using namespace std; using namespace lyx::support; @@ -86,7 +89,7 @@ namespace { MathWordList theMathWordList; -bool isMathFontAvailable(docstring & name) +bool isMathFontAvailable(string & name) { if (!use_gui) return false; @@ -100,12 +103,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; } @@ -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,11 +162,12 @@ 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; - docstring t = from_utf8(tmp); - skip = !isMathFontAvailable(t); + skip = !isMathFontAvailable(tmp); continue; } else if (line.size() >= 4 && line.substr(0, 4) == "else") { skip = !skip; @@ -186,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)) @@ -202,11 +209,15 @@ void initSymbols() << to_utf8(it->first) << " already exists."); else { latexkeys tmp; - tmp.inset = from_ascii("macro"); + tmp.inset = "macro"; tmp.name = it->first; tmp.extra = from_utf8(extra); tmp.xmlname = from_utf8(xmlname); - tmp.requires = from_utf8(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)); @@ -219,26 +230,32 @@ void initSymbols() << " draw: 0" << " extra: " << extra << " xml: " << xmlname - << " requires: " << requires << '\''); + << " requires: " << requires + << " hidden: " << hidden << '\''); continue; } idocstringstream is(from_utf8(line)); latexkeys tmp; - is >> tmp.name >> tmp.inset; + docstring help; + is >> tmp.name >> help; + tmp.inset = to_ascii(help); if (isFontName(tmp.inset)) 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; } @@ -250,15 +267,15 @@ void initSymbols() // 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") { @@ -270,26 +287,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."); @@ -299,14 +322,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) << " xml: " << to_utf8(tmp.xmlname) - << " requires: " << to_utf8(tmp.requires) << '\''); + << " 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); } @@ -342,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; } @@ -410,7 +452,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)); @@ -422,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") @@ -458,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; @@ -626,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)); @@ -652,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);