X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathFactory.cpp;h=bf468e8616b792dd665ccff1829874ab972825a9;hb=d243e53f54e861c90ce7135f3d1a8d68d6202555;hp=81d03aec6c4467e613b6e62c874b9e099acf6f7f;hpb=8225a56dfe848b3482069d856393fa07e2dd9f39;p=lyx.git diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp index 81d03aec6c..bf468e8616 100644 --- a/src/mathed/MathFactory.cpp +++ b/src/mathed/MathFactory.cpp @@ -16,6 +16,8 @@ #include "InsetMathArray.h" #include "InsetMathBoldSymbol.h" #include "InsetMathBox.h" +#include "InsetMathCancel.h" +#include "InsetMathCancelto.h" #include "InsetMathCases.h" #include "InsetMathColor.h" #include "InsetMathDecoration.h" @@ -30,6 +32,7 @@ #include "InsetMathPhantom.h" #include "InsetMathRef.h" #include "InsetMathRoot.h" +#include "InsetMathSideset.h" #include "InsetMathSize.h" #include "InsetMathSpace.h" #include "InsetMathSpecialChar.h" @@ -44,6 +47,7 @@ #include "InsetMathHull.h" #include "InsetMathXArrow.h" #include "InsetMathXYMatrix.h" +#include "InsetMathDiagram.h" #include "MacroTable.h" #include "MathMacro.h" #include "MathMacroArgument.h" @@ -59,9 +63,12 @@ #include "support/FileName.h" #include "support/filetools.h" // LibFileSearch #include "support/lstrings.h" +#include "support/textutils.h" #include "frontends/FontLoader.h" +#include "Buffer.h" +#include "BufferParams.h" #include "Encoding.h" #include "LyX.h" // use_gui #include "OutputParams.h" @@ -76,7 +83,7 @@ bool has_math_fonts; namespace { -MathWordList theWordList; +MathWordList theMathWordList; bool isMathFontAvailable(docstring & name) @@ -132,6 +139,7 @@ void initSymbols() continue; } else if (line.size() >= 4 && line.substr(0, 4) == "else") { skip = !skip; + continue; } else if (line.size() >= 5 && line.substr(0, 5) == "endif") { skip = false; continue; @@ -145,7 +153,15 @@ void initSymbols() string macro; string requires; is >> macro >> requires; - MacroTable::globalMacros().insert(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; } @@ -157,9 +173,12 @@ void initSymbols() else is >> tmp.extra; // requires is optional - if (is) + if (is) { is >> tmp.requires; - else { + // backward compatibility + if (tmp.requires == "esintoramsmath") + tmp.requires = from_ascii("esint|amsmath"); + } else { LYXERR(Debug::MATHED, "skipping line '" << line << "'\n" << to_utf8(tmp.name) << ' ' << to_utf8(tmp.inset) << ' ' << to_utf8(tmp.extra)); @@ -176,6 +195,8 @@ void initSymbols() tmp.requires = from_ascii("amssymb"); else if (tmp.inset == "wasy") tmp.requires = from_ascii("wasysym"); + else if (tmp.inset == "mathscr") + tmp.requires = from_ascii("mathrsfs"); } // symbol font is not available sometimes @@ -205,12 +226,14 @@ void initSymbols() << " used for " << to_utf8(tmp.name)); } - if (theWordList.find(tmp.name) != theWordList.end()) + if (theMathWordList.find(tmp.name) != theMathWordList.end()) LYXERR(Debug::MATHED, "readSymbols: inset " << to_utf8(tmp.name) << " already exists."); else - theWordList[tmp.name] = tmp; + theMathWordList[tmp.name] = tmp; + // 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) << " draw: " << int(tmp.draw.empty() ? 0 : tmp.draw[0]) @@ -231,7 +254,7 @@ bool isSpecialChar(docstring const & name) char_type const c = name.at(0); return c == '{' || c == '}' || c == '&' || c == '$' || - c == '#' || c == '%' || c == '_' || c == ' '; + c == '#' || c == '%' || c == '_'; } @@ -239,7 +262,7 @@ bool isSpecialChar(docstring const & name) MathWordList const & mathedWordList() { - return theWordList; + return theMathWordList; } @@ -276,7 +299,8 @@ bool ensureMath(WriteStream & os, bool needs_math_mode, bool macro) } -bool ensureMode(WriteStream & os, InsetMath::mode_type mode) +int ensureMode(WriteStream & os, InsetMath::mode_type mode, + bool locked, bool ascii) { bool textmode = mode == InsetMath::TEXT_MODE; if (os.latex() && textmode && os.pendingBrace()) { @@ -285,40 +309,48 @@ bool ensureMode(WriteStream & os, InsetMath::mode_type mode) os.pendingSpace(false); os.textMode(true); } - bool oldmode = os.textMode(); + int oldmodes = os.textMode() ? 0x01 : 0; os.textMode(textmode); - return oldmode; + oldmodes |= os.lockedMode() ? 0x02 : 0; + os.lockedMode(locked); + oldmodes |= os.asciiOnly() ? 0x04 : 0; + os.asciiOnly(ascii); + return oldmodes; } latexkeys const * in_word_set(docstring const & str) { - MathWordList::iterator it = theWordList.find(str); - return it != theWordList.end() ? &(it->second) : 0; + MathWordList::iterator it = theMathWordList.find(str); + return it != theMathWordList.end() ? &(it->second) : 0; } -MathAtom createInsetMath(char const * const s) +MathAtom createInsetMath(char const * const s, Buffer * buf) { - return createInsetMath(from_utf8(s)); + return createInsetMath(from_utf8(s), buf); } -MathAtom createInsetMath(docstring const & s) +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)); + latexkeys const * l = in_word_set(s); if (l) { docstring const & inset = l->inset; //lyxerr << " found inset: '" << inset << '\'' << endl; if (inset == "ref") - return MathAtom(new InsetMathRef(l->name)); + return MathAtom(new InsetMathRef(buf, l->name)); if (inset == "overset") - return MathAtom(new InsetMathOverset); + return MathAtom(new InsetMathOverset(buf)); if (inset == "underset") - return MathAtom(new InsetMathUnderset); + return MathAtom(new InsetMathUnderset(buf)); if (inset == "decoration") - return MathAtom(new InsetMathDecoration(l)); + return MathAtom(new InsetMathDecoration(buf, l)); if (inset == "space") return MathAtom(new InsetMathSpace(to_ascii(l->name), "")); if (inset == "dots") @@ -328,19 +360,19 @@ MathAtom createInsetMath(docstring const & s) // InsetMathMBox is proposed to replace InsetMathBox, // but is not ready yet (it needs a BufferView for // construction) - return MathAtom(new InsetMathBox(l->name)); + return MathAtom(new InsetMathBox(buf, l->name)); // if (inset == "fbox") // return MathAtom(new InsetMathFBox(l)); if (inset == "style") - return MathAtom(new InsetMathSize(l)); + return MathAtom(new InsetMathSize(buf, l)); if (inset == "font") - return MathAtom(new InsetMathFont(l)); + return MathAtom(new InsetMathFont(buf, l)); if (inset == "oldfont") - return MathAtom(new InsetMathFontOld(l)); + return MathAtom(new InsetMathFontOld(buf, l)); if (inset == "matrix") - return MathAtom(new InsetMathAMSArray(s)); + return MathAtom(new InsetMathAMSArray(buf, s)); if (inset == "split") - return MathAtom(new InsetMathSplit(s)); + return MathAtom(new InsetMathSplit(buf, s)); if (inset == "big") // we can't create a InsetMathBig, since the argument // is missing. @@ -354,23 +386,35 @@ MathAtom createInsetMath(docstring const & s) && s[2] >= '1' && s[2] <= '9') return MathAtom(new MathMacroArgument(s[2] - '0')); if (s == "boxed") - return MathAtom(new InsetMathBoxed()); + return MathAtom(new InsetMathBoxed(buf)); if (s == "fbox") - return MathAtom(new InsetMathFBox()); + return MathAtom(new InsetMathFBox(buf)); if (s == "framebox") - return MathAtom(new InsetMathMakebox(true)); + return MathAtom(new InsetMathMakebox(buf, true)); if (s == "makebox") - return MathAtom(new InsetMathMakebox(false)); + 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; + bool equal_spacing = false; size_t const len = s.length(); size_t i = 8; if (i < len && s[i] == '@') { ++i; - if (i < len) { + if (i < len && s[i] == '!') { + equal_spacing = true; + ++i; + if (i < len) { + switch (s[i]) { + case '0': + case 'R': + case 'C': + spacing_code = static_cast(s[i]); + } + } + } else if (i < len) { switch (s[i]) { case 'R': case 'C': @@ -382,100 +426,134 @@ MathAtom createInsetMath(docstring const & s) ++i; break; } - } - if (i < len && s[i] == '=') { - ++i; - spacing = Length(to_ascii(s.substr(i))); + if (i < len && s[i] == '=') { + ++i; + spacing = Length(to_ascii(s.substr(i))); + } } } - return MathAtom(new InsetMathXYMatrix(spacing, spacing_code)); + return MathAtom(new InsetMathXYMatrix(buf, spacing, spacing_code, + equal_spacing)); } + + if (s == "Diagram") + return MathAtom(new InsetMathDiagram(buf)); if (s == "xrightarrow" || s == "xleftarrow") - return MathAtom(new InsetMathXArrow(s)); - if (s == "split" || s == "gathered" || s == "aligned" || s == "alignedat") - return MathAtom(new InsetMathSplit(s)); + return MathAtom(new InsetMathXArrow(buf, s)); + if (s == "split" || s == "alignedat") + return MathAtom(new InsetMathSplit(buf, s)); if (s == "cases") - return MathAtom(new InsetMathCases); + return MathAtom(new InsetMathCases(buf)); if (s == "substack") - return MathAtom(new InsetMathSubstack); + return MathAtom(new InsetMathSubstack(buf)); if (s == "subarray" || s == "array") - return MathAtom(new InsetMathArray(s, 1, 1)); + return MathAtom(new InsetMathArray(buf, s, 1, 1)); if (s == "sqrt") - return MathAtom(new InsetMathSqrt); + return MathAtom(new InsetMathSqrt(buf)); if (s == "root") - return MathAtom(new InsetMathRoot); + return MathAtom(new InsetMathRoot(buf)); if (s == "tabular") - return MathAtom(new InsetMathTabular(s, 1, 1)); + return MathAtom(new InsetMathTabular(buf, s, 1, 1)); if (s == "stackrel") - return MathAtom(new InsetMathStackrel); + 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(InsetMathBinom::BINOM)); + return MathAtom(new InsetMathBinom(buf, InsetMathBinom::BINOM)); if (s == "dbinom") - return MathAtom(new InsetMathBinom(InsetMathBinom::DBINOM)); + return MathAtom(new InsetMathBinom(buf, InsetMathBinom::DBINOM)); if (s == "tbinom") - return MathAtom(new InsetMathBinom(InsetMathBinom::TBINOM)); + return MathAtom(new InsetMathBinom(buf, InsetMathBinom::TBINOM)); if (s == "choose") - return MathAtom(new InsetMathBinom(InsetMathBinom::CHOOSE)); + return MathAtom(new InsetMathBinom(buf, InsetMathBinom::CHOOSE)); if (s == "brace") - return MathAtom(new InsetMathBinom(InsetMathBinom::BRACE)); + return MathAtom(new InsetMathBinom(buf, InsetMathBinom::BRACE)); if (s == "brack") - return MathAtom(new InsetMathBinom(InsetMathBinom::BRACK)); + return MathAtom(new InsetMathBinom(buf, InsetMathBinom::BRACK)); if (s == "frac") - return MathAtom(new InsetMathFrac); + return MathAtom(new InsetMathFrac(buf)); if (s == "cfrac") - return MathAtom(new InsetMathFrac(InsetMathFrac::CFRAC)); + return MathAtom(new InsetMathFrac(buf, InsetMathFrac::CFRAC)); if (s == "dfrac") - return MathAtom(new InsetMathFrac(InsetMathFrac::DFRAC)); + return MathAtom(new InsetMathFrac(buf, InsetMathFrac::DFRAC)); if (s == "tfrac") - return MathAtom(new InsetMathFrac(InsetMathFrac::TFRAC)); + return MathAtom(new InsetMathFrac(buf, InsetMathFrac::TFRAC)); if (s == "over") - return MathAtom(new InsetMathFrac(InsetMathFrac::OVER)); + return MathAtom(new InsetMathFrac(buf, InsetMathFrac::OVER)); if (s == "nicefrac") - return MathAtom(new InsetMathFrac(InsetMathFrac::NICEFRAC)); + return MathAtom(new InsetMathFrac(buf, InsetMathFrac::NICEFRAC)); if (s == "unitfrac") - return MathAtom(new InsetMathFrac(InsetMathFrac::UNITFRAC)); + return MathAtom(new InsetMathFrac(buf, InsetMathFrac::UNITFRAC)); // These string values are only for math toolbar use, no LaTeX names if (s == "unitfracthree") - return MathAtom(new InsetMathFrac(InsetMathFrac::UNITFRAC, 3)); + return MathAtom(new InsetMathFrac(buf, InsetMathFrac::UNITFRAC, 3)); if (s == "unitone") - return MathAtom(new InsetMathFrac(InsetMathFrac::UNIT, 1)); + return MathAtom(new InsetMathFrac(buf, InsetMathFrac::UNIT, 1)); if (s == "unittwo") - return MathAtom(new InsetMathFrac(InsetMathFrac::UNIT)); + return MathAtom(new InsetMathFrac(buf, InsetMathFrac::UNIT)); if (s == "cfracleft") - return MathAtom(new InsetMathFrac(InsetMathFrac::CFRACLEFT)); + return MathAtom(new InsetMathFrac(buf, InsetMathFrac::CFRACLEFT)); if (s == "cfracright") - return MathAtom(new InsetMathFrac(InsetMathFrac::CFRACRIGHT)); + return MathAtom(new InsetMathFrac(buf, InsetMathFrac::CFRACRIGHT)); //if (s == "infer") // return MathAtom(new MathInferInset); if (s == "atop") - return MathAtom(new InsetMathFrac(InsetMathFrac::ATOP)); + return MathAtom(new InsetMathFrac(buf, InsetMathFrac::ATOP)); if (s == "lefteqn") - return MathAtom(new InsetMathLefteqn); + return MathAtom(new InsetMathLefteqn(buf)); if (s == "boldsymbol") - return MathAtom(new InsetMathBoldSymbol(InsetMathBoldSymbol::AMS_BOLD)); + return MathAtom(new InsetMathBoldSymbol(buf, InsetMathBoldSymbol::AMS_BOLD)); if (s == "bm") - return MathAtom(new InsetMathBoldSymbol(InsetMathBoldSymbol::BM_BOLD)); + return MathAtom(new InsetMathBoldSymbol(buf, InsetMathBoldSymbol::BM_BOLD)); if (s == "heavysymbol" || s == "hm") - return MathAtom(new InsetMathBoldSymbol(InsetMathBoldSymbol::BM_HEAVY)); + return MathAtom(new InsetMathBoldSymbol(buf, InsetMathBoldSymbol::BM_HEAVY)); if (s == "color" || s == "normalcolor") - return MathAtom(new InsetMathColor(true)); + return MathAtom(new InsetMathColor(buf, true)); if (s == "textcolor") - return MathAtom(new InsetMathColor(false)); + return MathAtom(new InsetMathColor(buf, false)); if (s == "hphantom") - return MathAtom(new InsetMathPhantom(InsetMathPhantom::hphantom)); + return MathAtom(new InsetMathPhantom(buf, InsetMathPhantom::hphantom)); if (s == "phantom") - return MathAtom(new InsetMathPhantom(InsetMathPhantom::phantom)); + return MathAtom(new InsetMathPhantom(buf, InsetMathPhantom::phantom)); if (s == "vphantom") - return MathAtom(new InsetMathPhantom(InsetMathPhantom::vphantom)); + return MathAtom(new InsetMathPhantom(buf, InsetMathPhantom::vphantom)); + if (s == "cancel") + return MathAtom(new InsetMathCancel(buf, InsetMathCancel::cancel)); + if (s == "bcancel") + return MathAtom(new InsetMathCancel(buf, InsetMathCancel::bcancel)); + if (s == "xcancel") + return MathAtom(new InsetMathCancel(buf, InsetMathCancel::xcancel)); + if (s == "cancelto") + return MathAtom(new InsetMathCancelto(buf)); + if (s == "smash") + return MathAtom(new InsetMathPhantom(buf, InsetMathPhantom::smash)); + if (s == "mathclap") + return MathAtom(new InsetMathPhantom(buf, InsetMathPhantom::mathclap)); + if (s == "mathllap") + return MathAtom(new InsetMathPhantom(buf, InsetMathPhantom::mathllap)); + if (s == "mathrlap") + return MathAtom(new InsetMathPhantom(buf, InsetMathPhantom::mathrlap)); if (s == "ensuremath") - return MathAtom(new InsetMathEnsureMath); + 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 == " ") + return MathAtom(new InsetMathSpace(" ", "")); if (s == "regexp") - return MathAtom(new InsetMathHull(hullRegexp)); + return MathAtom(new InsetMathHull(buf, hullRegexp)); - return MathAtom(new MathMacro(s)); + return MathAtom(new MathMacro(buf, s)); } @@ -489,17 +567,21 @@ bool createInsetMath_fromDialogStr(docstring const & str, MathData & ar) if (name == "ref") { InsetCommandParams icp(REF_CODE); // FIXME UNICODE - InsetCommand::string2params("ref", to_utf8(str), icp); - mathed_parse_cell(ar, icp.getCommand()); + InsetCommand::string2params(to_utf8(str), icp); + Encoding const * const utf8 = encodings.fromLyXName("utf8"); + OutputParams op(utf8); + mathed_parse_cell(ar, icp.getCommand(op)); } else if (name == "mathspace") { InsetSpaceParams isp(true); InsetSpace::string2params(to_utf8(str), isp); InsetSpace is(isp); - odocstringstream os; + TexRow texrow; + odocstringstream ods; + otexstream os(ods, texrow); Encoding const * const ascii = encodings.fromLyXName("ascii"); OutputParams op(ascii); is.latex(os, op); - mathed_parse_cell(ar, os.str()); + mathed_parse_cell(ar, ods.str()); if (ar.size() == 2) { // remove "{}" if (ar[1].nucleus()->asBraceInset()) @@ -517,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); }