X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathFactory.cpp;h=82f885b3132229ece9d951df40448113c6ccc46b;hb=57b69a5efddf9f3c148007322f00dad6c253a2ed;hp=2cd60f055a93e8ffcd5a90ffc9dc2fa4201d74da;hpb=b89cc942eb458284f40f4d4e7db58890c3288979;p=lyx.git diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp index 2cd60f055a..82f885b313 100644 --- a/src/mathed/MathFactory.cpp +++ b/src/mathed/MathFactory.cpp @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author André Pönitz + * \author André Pönitz * * Full author contact details are available in file CREDITS. */ @@ -16,10 +16,13 @@ #include "InsetMathArray.h" #include "InsetMathBoldSymbol.h" #include "InsetMathBox.h" +#include "InsetMathCancel.h" +#include "InsetMathCancelto.h" #include "InsetMathCases.h" #include "InsetMathColor.h" #include "InsetMathDecoration.h" #include "InsetMathDots.h" +#include "InsetMathEnsureMath.h" #include "InsetMathFont.h" #include "InsetMathFontOld.h" #include "InsetMathFrac.h" @@ -29,8 +32,10 @@ #include "InsetMathPhantom.h" #include "InsetMathRef.h" #include "InsetMathRoot.h" +#include "InsetMathSideset.h" #include "InsetMathSize.h" #include "InsetMathSpace.h" +#include "InsetMathSpecialChar.h" #include "InsetMathSplit.h" #include "InsetMathSqrt.h" #include "InsetMathStackrel.h" @@ -39,24 +44,35 @@ #include "InsetMathTabular.h" #include "InsetMathUnderset.h" #include "InsetMathUnknown.h" +#include "InsetMathHull.h" #include "InsetMathXArrow.h" #include "InsetMathXYMatrix.h" +#include "InsetMathDiagram.h" #include "MacroTable.h" #include "MathMacro.h" #include "MathMacroArgument.h" #include "MathParser.h" +#include "MathStream.h" #include "MathSupport.h" -#include "support/debug.h" - #include "insets/InsetCommand.h" +#include "insets/InsetSpace.h" +#include "support/debug.h" #include "support/docstream.h" +#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" + using namespace std; using namespace lyx::support; @@ -67,14 +83,14 @@ bool has_math_fonts; namespace { -// file scope -typedef std::map WordList; - -WordList theWordList; +MathWordList theMathWordList; -bool math_font_available(docstring & name) +bool isMathFontAvailable(string & name) { + if (!use_gui) + return false; + FontInfo f; augmentFont(f, name); @@ -84,26 +100,52 @@ bool math_font_available(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; } +bool canBeDisplayed(char_type c) +{ + if (!use_gui) + return true; + return theFontLoader().canBeDisplayed(c); +} + + +bool isUnicodeSymbolAvailable(docstring const & name, char_type & c) +{ + docstring cmd(from_ascii("\\") + name); + bool is_combining; + bool termination; + c = Encodings::fromLaTeXCommand(cmd, Encodings::MATH_CMD, + is_combining, termination); + if (c == 0 && name == "varOmega") { + // fallback for bug 7954, unicodesymbols does not list + // \\varOmega because of requirements, but this might change + cmd = from_ascii("\\mathit{\\Omega}"); + c = Encodings::fromLaTeXCommand(cmd, Encodings::MATH_CMD, + is_combining, termination); + } + return c != 0 && !is_combining; +} + + void initSymbols() { - support::FileName const filename = libFileSearch(string(), "symbols"); + FileName const filename = libFileSearch(string(), "symbols"); LYXERR(Debug::MATHED, "read symbols from " << filename); if (filename.empty()) { lyxerr << "Could not find symbols file" << endl; return; } - std::ifstream fs(filename.toFilesystemEncoding().c_str()); + ifstream fs(filename.toFilesystemEncoding().c_str()); string line; bool skip = false; while (getline(fs, line)) { @@ -118,11 +160,11 @@ void initSymbols() string tmp; is >> tmp; is >> tmp; - docstring t = from_utf8(tmp); - skip = !math_font_available(t); + skip = !isMathFontAvailable(tmp); 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; @@ -132,27 +174,81 @@ 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; - MacroTable::globalMacros().insert(from_utf8(macro), requires); + if ((is >> xmlname)) { + extra = requires; + if (!(is >> requires)) + requires = ""; + } else + xmlname = ""; + MacroTable::iterator it = MacroTable::globalMacros().insert( + 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: " << extra + << " xml: " << xmlname + << " 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; - else { + if (is) { + 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; } @@ -164,58 +260,93 @@ 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 = "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") { LYXERR(Debug::MATHED, "symbol abuse for " << to_utf8(tmp.name)); tmp.draw = tmp.name; - } else if (math_font_available(tmp.inset)) { + } else if (isMathFontAvailable(tmp.inset) && canBeDisplayed(charid)) { LYXERR(Debug::MATHED, "symbol available for " << to_utf8(tmp.name)); tmp.draw.push_back(char_type(charid)); - } else if (fallbackid && math_font_available(symbol_font)) { + } 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 = "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 (theWordList.find(tmp.name) != theWordList.end()) + 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."); 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) + << " 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"); - has_math_fonts = math_font_available(tmp) && math_font_available(tmp2); + string tmp = "cmm"; + string tmp2 = "cmsy"; + has_math_fonts = isMathFontAvailable(tmp) && isMathFontAvailable(tmp2); +} + + +bool isSpecialChar(docstring const & name) +{ + if (name.size() != 1) + return name == "textasciicircum" || name == "mathcircumflex" || + name == "textasciitilde" || name == "textbackslash"; + + char_type const c = name.at(0); + return c == '{' || c == '}' || c == '&' || c == '$' || + c == '#' || c == '%' || c == '_'; } } // namespace anon +MathWordList const & mathedWordList() +{ + return theMathWordList; +} + void initMath() { @@ -228,56 +359,102 @@ void initMath() } +bool ensureMath(WriteStream & os, bool needs_math_mode, bool macro) +{ + bool brace = os.pendingBrace(); + os.pendingBrace(false); + if (!os.latex()) + return brace; + if (os.textMode() && needs_math_mode) { + os << "\\ensuremath{"; + 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 << '}'; + os.textMode(true); + brace = false; + } + return brace; +} + + +int ensureMode(WriteStream & os, InsetMath::mode_type mode, + bool locked, bool ascii) +{ + bool textmode = mode == InsetMath::TEXT_MODE; + if (os.latex() && textmode && os.pendingBrace()) { + os.os() << '}'; + os.pendingBrace(false); + os.pendingSpace(false); + os.textMode(true); + } + int oldmodes = os.textMode() ? 0x01 : 0; + os.textMode(textmode); + 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) { - WordList::iterator it = theWordList.find(str); - return it != theWordList.end() ? &(it->second) : 0; + MathWordList::iterator it = theMathWordList.find(str); + if (it == theMathWordList.end()) + return 0; + if (it->second.inset == "macro") + return 0; + return &(it->second); } -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; + string 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(l->name)); + return MathAtom(new InsetMathSpace(to_ascii(l->name), "")); if (inset == "dots") return MathAtom(new InsetMathDots(l)); if (inset == "mbox") - // return MathAtom(new InsetMathMBox); - // 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. @@ -291,23 +468,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 InsetMathFrameBox); + return MathAtom(new InsetMathMakebox(buf, true)); if (s == "makebox") - return MathAtom(new InsetMathMakebox); + 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': @@ -319,77 +508,146 @@ 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 == "xrightarrow" || s == "xleftarrow") - return MathAtom(new InsetMathXArrow(s)); - if (s == "split" || s == "gathered" || s == "aligned" || s == "alignedat") - return MathAtom(new InsetMathSplit(s)); + + if (s == "Diagram") + return MathAtom(new InsetMathDiagram(buf)); + 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)); 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); - if (s == "binom" || s == "choose") - return MathAtom(new InsetMathBinom(s == "choose")); + 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") + return MathAtom(new InsetMathBinom(buf, InsetMathBinom::DBINOM)); + if (s == "tbinom") + return MathAtom(new InsetMathBinom(buf, InsetMathBinom::TBINOM)); + if (s == "choose") + return MathAtom(new InsetMathBinom(buf, InsetMathBinom::CHOOSE)); + if (s == "brace") + return MathAtom(new InsetMathBinom(buf, InsetMathBinom::BRACE)); + if (s == "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(buf, InsetMathFrac::CFRAC)); + if (s == "dfrac") + return MathAtom(new InsetMathFrac(buf, InsetMathFrac::DFRAC)); + if (s == "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)); - // This string value is only for math toolbar use. Not a LaTeX name + 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(buf, InsetMathFrac::CFRACLEFT)); + if (s == "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); + return MathAtom(new InsetMathBoldSymbol(buf, InsetMathBoldSymbol::AMS_BOLD)); + if (s == "bm") + return MathAtom(new InsetMathBoldSymbol(buf, InsetMathBoldSymbol::BM_BOLD)); + if (s == "heavysymbol" || s == "hm") + 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)); - if (s == "dfrac") - return MathAtom(new InsetMathDFrac); - if (s == "tfrac") - return MathAtom(new InsetMathTFrac); - if (s == "dbinom") - return MathAtom(new InsetMathDBinom); - if (s == "tbinom") - return MathAtom(new InsetMathTBinom); + 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 MathMacro(s)); + 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)); + // 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") + return MathAtom(new InsetMathPhantom(buf, InsetMathPhantom::mathllap)); + if (s == "mathrlap") + 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 == " ") + return MathAtom(new InsetMathSpace(" ", "")); + + if (s == "regexp") + return MathAtom(new InsetMathHull(buf, hullRegexp)); + + return MathAtom(new MathMacro(buf, s)); } @@ -400,13 +658,32 @@ bool createInsetMath_fromDialogStr(docstring const & str, MathData & ar) docstring name; docstring body = split(str, name, ' '); - if (name != "ref" ) + if (name == "ref") { + InsetCommandParams icp(REF_CODE); + // FIXME UNICODE + 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); + 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, ods.str()); + if (ar.size() == 2) { + // remove "{}" + if (ar[1].nucleus()->asBraceInset()) + ar.pop_back(); + } + } else return false; - InsetCommandParams icp(REF_CODE); - // FIXME UNICODE - InsetCommandMailer::string2params("ref", to_utf8(str), icp); - mathed_parse_cell(ar, icp.getCommand()); if (ar.size() != 1) return false; @@ -414,4 +691,10 @@ bool createInsetMath_fromDialogStr(docstring const & str, MathData & ar) } +bool isAsciiOrMathAlpha(char_type c) +{ + return isASCII(c) || Encodings::isMathAlpha(c); +} + + } // namespace lyx