]> git.lyx.org Git - lyx.git/blobdiff - src/mathed/MathFactory.cpp
Merge branch 'master' of git.lyx.org:lyx
[lyx.git] / src / mathed / MathFactory.cpp
index f8b9185028a3b644d493da25fd927c2ee482604c..82f885b3132229ece9d951df40448113c6ccc46b 100644 (file)
@@ -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"
@@ -60,6 +63,7 @@
 #include "support/FileName.h"
 #include "support/filetools.h" // LibFileSearch
 #include "support/lstrings.h"
+#include "support/textutils.h"
 
 #include "frontends/FontLoader.h"
 
@@ -82,7 +86,7 @@ namespace {
 MathWordList theMathWordList;
 
 
-bool isMathFontAvailable(docstring & name)
+bool isMathFontAvailable(string & name)
 {
        if (!use_gui)
                return false;
@@ -96,16 +100,42 @@ 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;
 }
 
 
+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()
 {
        FileName const filename = libFileSearch(string(), "symbols");
@@ -130,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;
@@ -145,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(0, 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;
                }
@@ -177,54 +260,70 @@ 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") {
                                LYXERR(Debug::MATHED, "symbol abuse for " << to_utf8(tmp.name));
                                tmp.draw = tmp.name;
-                       } else if (isMathFontAvailable(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 && isMathFontAvailable(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 (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
                        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");
+       string tmp = "cmm";
+       string tmp2 = "cmsy";
        has_math_fonts = isMathFontAvailable(tmp) && isMathFontAvailable(tmp2);
 }
 
@@ -237,7 +336,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 == '_';
 }
 
 
@@ -305,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);
 }
 
 
@@ -319,12 +422,12 @@ 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_mhchem == BufferParams::package_off)
+           && 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(buf, l->name));
@@ -339,10 +442,6 @@ MathAtom createInsetMath(docstring const & s, Buffer * buf)
                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(buf, l->name));
 //             if (inset == "fbox")
 //                     return MathAtom(new InsetMathFBox(l));
@@ -421,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));
@@ -438,7 +544,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")
@@ -498,10 +607,42 @@ MathAtom createInsetMath(docstring const & s, Buffer * buf)
                return MathAtom(new InsetMathPhantom(buf, InsetMathPhantom::phantom));
        if (s == "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));
+       // 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));
@@ -552,7 +693,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);
 }