#include "InsetMathAMSArray.h"
#include "InsetMathArray.h"
-#include "InsetMathBinom.h"
#include "InsetMathBoldSymbol.h"
-#include "InsetMathBoxed.h"
#include "InsetMathBox.h"
#include "InsetMathCases.h"
#include "InsetMathColor.h"
#include "InsetMathDecoration.h"
-#include "InsetMathDFrac.h"
#include "InsetMathDots.h"
-#include "InsetMathFBox.h"
+#include "InsetMathEnsureMath.h"
#include "InsetMathFont.h"
#include "InsetMathFontOld.h"
#include "InsetMathFrac.h"
-#include "InsetMathFrameBox.h"
#include "InsetMathKern.h"
#include "InsetMathLefteqn.h"
-#include "MathMacro.h"
-#include "InsetMathMakebox.h"
#include "InsetMathOverset.h"
#include "InsetMathPhantom.h"
#include "InsetMathRef.h"
#include "InsetMathSubstack.h"
#include "InsetMathSymbol.h"
#include "InsetMathTabular.h"
-#include "InsetMathTFrac.h"
#include "InsetMathUnderset.h"
#include "InsetMathUnknown.h"
#include "InsetMathXArrow.h"
#include "InsetMathXYMatrix.h"
+#include "MacroTable.h"
+#include "MathMacro.h"
#include "MathMacroArgument.h"
-#include "MathMacroTable.h"
#include "MathParser.h"
+#include "MathStream.h"
#include "MathSupport.h"
-#include "debug.h"
-
#include "insets/InsetCommand.h"
+#include "support/debug.h"
+#include "support/docstream.h"
+#include "support/FileName.h"
#include "support/filetools.h" // LibFileSearch
#include "support/lstrings.h"
#include "frontends/FontLoader.h"
+#include "LyX.h" // use_gui
-namespace lyx {
-
-using support::libFileSearch;
-using support::split;
+using namespace std;
+using namespace lyx::support;
-using std::string;
-using std::endl;
-using std::istringstream;
-using std::vector;
+namespace lyx {
bool has_math_fonts;
namespace {
-// file scope
-typedef std::map<docstring, latexkeys> WordList;
+MathWordList theWordList;
-WordList theWordList;
-
-bool math_font_available(docstring & name)
+bool isMathFontAvailable(docstring & name)
{
- LyXFont f;
+ FontInfo f;
augmentFont(f, name);
// Do we have the font proper?
return true;
}
- LYXERR(Debug::MATHED)
- << "font " << to_utf8(name) << " not available and I can't fake it"
- << endl;
+ LYXERR(Debug::MATHED,
+ "font " << to_utf8(name) << " not available and I can't fake it");
return false;
}
void initSymbols()
{
- support::FileName const filename = libFileSearch(string(), "symbols");
- LYXERR(Debug::MATHED) << "read symbols from " << filename << endl;
+ if (!use_gui)
+ return;
+
+ 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)) {
is >> tmp;
is >> tmp;
docstring t = from_utf8(tmp);
- skip = !math_font_available(t);
+ skip = !isMathFontAvailable(t);
continue;
} else if (line.size() >= 4 && line.substr(0, 4) == "else") {
skip = !skip;
if (is)
is >> tmp.requires;
else {
- LYXERR(Debug::MATHED) << "skipping line '" << line << '\'' << endl;
- LYXERR(Debug::MATHED)
- << to_utf8(tmp.name) << ' ' << to_utf8(tmp.inset) << ' ' << to_utf8(tmp.extra) << endl;
+ LYXERR(Debug::MATHED, "skipping line '" << line << "'\n"
+ << to_utf8(tmp.name) << ' ' << to_utf8(tmp.inset) << ' '
+ << to_utf8(tmp.extra));
continue;
}
// create fallbacks if necessary
// store requirements as long as we can
- if (tmp.requires.empty() &&
- (tmp.inset == "msa" || tmp.inset == "msb"))
- tmp.requires = from_ascii("amssymb");
- else if (tmp.inset == "wasy")
- tmp.requires = from_ascii("wasysym");
+ if (tmp.requires.empty()) {
+ if (tmp.inset == "msa" || tmp.inset == "msb")
+ tmp.requires = from_ascii("amssymb");
+ else if (tmp.inset == "wasy")
+ tmp.requires = from_ascii("wasysym");
+ }
// symbol font is not available sometimes
docstring symbol_font = from_ascii("lyxsymbol");
if (tmp.extra == "func" || tmp.extra == "funclim" || tmp.extra == "special") {
- LYXERR(Debug::MATHED) << "symbol abuse for " << to_utf8(tmp.name) << endl;
+ LYXERR(Debug::MATHED, "symbol abuse for " << to_utf8(tmp.name));
tmp.draw = tmp.name;
- } else if (math_font_available(tmp.inset)) {
- LYXERR(Debug::MATHED) << "symbol available for " << to_utf8(tmp.name) << endl;
+ } else if (isMathFontAvailable(tmp.inset)) {
+ 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)) {
if (tmp.inset == "cmex")
tmp.inset = from_ascii("lyxsymbol");
else
tmp.inset = from_ascii("lyxboldsymbol");
- LYXERR(Debug::MATHED) << "symbol fallback for " << to_utf8(tmp.name) << endl;
+ LYXERR(Debug::MATHED, "symbol fallback for " << to_utf8(tmp.name));
tmp.draw.push_back(char_type(fallbackid));
} else {
- LYXERR(Debug::MATHED) << "faking " << to_utf8(tmp.name) << endl;
+ LYXERR(Debug::MATHED, "faking " << to_utf8(tmp.name));
tmp.draw = tmp.name;
tmp.inset = from_ascii("lyxtex");
}
} else {
// it's a proper inset
- LYXERR(Debug::MATHED) << "inset " << to_utf8(tmp.inset)
- << " used for " << to_utf8(tmp.name)
- << endl;
+ LYXERR(Debug::MATHED, "inset " << to_utf8(tmp.inset)
+ << " used for " << to_utf8(tmp.name));
}
if (theWordList.find(tmp.name) != theWordList.end())
- LYXERR(Debug::MATHED)
- << "readSymbols: inset " << to_utf8(tmp.name)
- << " already exists." << endl;
+ LYXERR(Debug::MATHED, "readSymbols: inset " << to_utf8(tmp.name)
+ << " already exists.");
else
theWordList[tmp.name] = tmp;
- LYXERR(Debug::MATHED)
- << "read symbol '" << to_utf8(tmp.name)
+ LYXERR(Debug::MATHED, "read symbol '" << to_utf8(tmp.name)
<< " inset: " << to_utf8(tmp.inset)
<< " draw: " << int(tmp.draw.empty() ? 0 : tmp.draw[0])
<< " extra: " << to_utf8(tmp.extra)
- << " requires: " << to_utf8(tmp.requires)
- << '\'' << endl;
+ << " requires: " << to_utf8(tmp.requires) << '\'');
}
docstring tmp = from_ascii("cmm");
docstring tmp2 = from_ascii("cmsy");
- has_math_fonts = math_font_available(tmp) && math_font_available(tmp2);
+ has_math_fonts = isMathFontAvailable(tmp) && isMathFontAvailable(tmp2);
}
} // namespace anon
+MathWordList const & mathedWordList()
+{
+ return theWordList;
+}
+
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;
+}
+
+
+bool ensureMode(WriteStream & os, InsetMath::mode_type mode)
+{
+ bool textmode = mode == InsetMath::TEXT_MODE;
+ if (os.latex() && textmode && os.pendingBrace()) {
+ os.os() << '}';
+ os.pendingBrace(false);
+ os.pendingSpace(false);
+ os.textMode(true);
+ }
+ bool oldmode = os.textMode();
+ os.textMode(textmode);
+ return oldmode;
+}
+
+
latexkeys const * in_word_set(docstring const & str)
{
- WordList::iterator it = theWordList.find(str);
+ MathWordList::iterator it = theWordList.find(str);
return it != theWordList.end() ? &(it->second) : 0;
}
MathAtom createInsetMath(docstring const & s)
{
- //lyxerr << "creating inset with name: '" << s << '\'' << endl;
+ //lyxerr << "creating inset with name: '" << to_utf8(s) << '\'' << endl;
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 RefInset(l->name));
+ return MathAtom(new InsetMathRef(l->name));
if (inset == "overset")
return MathAtom(new InsetMathOverset);
if (inset == "underset")
if (s == "fbox")
return MathAtom(new InsetMathFBox());
if (s == "framebox")
- return MathAtom(new InsetMathFrameBox);
+ return MathAtom(new InsetMathMakebox(true));
if (s == "makebox")
- return MathAtom(new InsetMathMakebox);
+ return MathAtom(new InsetMathMakebox(false));
if (s == "kern")
return MathAtom(new InsetMathKern);
if (s.substr(0, 8) == "xymatrix") {
return MathAtom(new InsetMathTabular(s, 1, 1));
if (s == "stackrel")
return MathAtom(new InsetMathStackrel);
- if (s == "binom" || s == "choose")
- return MathAtom(new InsetMathBinom(s == "choose"));
+ if (s == "binom")
+ return MathAtom(new InsetMathBinom(InsetMathBinom::BINOM));
+ if (s == "choose")
+ return MathAtom(new InsetMathBinom(InsetMathBinom::CHOOSE));
+ if (s == "brace")
+ return MathAtom(new InsetMathBinom(InsetMathBinom::BRACE));
+ if (s == "brack")
+ return MathAtom(new InsetMathBinom(InsetMathBinom::BRACK));
if (s == "frac")
return MathAtom(new InsetMathFrac);
if (s == "over")
return MathAtom(new InsetMathFrac(InsetMathFrac::OVER));
if (s == "nicefrac")
return MathAtom(new InsetMathFrac(InsetMathFrac::NICEFRAC));
+ if (s == "unitfrac")
+ return MathAtom(new InsetMathFrac(InsetMathFrac::UNITFRAC));
+ // This string value is only for math toolbar use. Not a LaTeX name
+ if (s == "unitfracthree")
+ return MathAtom(new InsetMathFrac(InsetMathFrac::UNITFRAC, 3));
+ if (s == "unitone")
+ return MathAtom(new InsetMathFrac(InsetMathFrac::UNIT, 1));
+ if (s == "unittwo")
+ return MathAtom(new InsetMathFrac(InsetMathFrac::UNIT));
//if (s == "infer")
// return MathAtom(new MathInferInset);
if (s == "atop")
if (s == "lefteqn")
return MathAtom(new InsetMathLefteqn);
if (s == "boldsymbol")
- return MathAtom(new InsetMathBoldSymbol);
+ return MathAtom(new InsetMathBoldSymbol(InsetMathBoldSymbol::AMS_BOLD));
+ if (s == "bm")
+ return MathAtom(new InsetMathBoldSymbol(InsetMathBoldSymbol::BM_BOLD));
+ if (s == "heavysymbol" || s == "hm")
+ return MathAtom(new InsetMathBoldSymbol(InsetMathBoldSymbol::BM_HEAVY));
if (s == "color" || s == "normalcolor")
return MathAtom(new InsetMathColor(true));
if (s == "textcolor")
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);
if (s == "hphantom")
return MathAtom(new InsetMathPhantom(InsetMathPhantom::hphantom));
if (s == "phantom")
return MathAtom(new InsetMathPhantom(InsetMathPhantom::phantom));
if (s == "vphantom")
return MathAtom(new InsetMathPhantom(InsetMathPhantom::vphantom));
+ if (s == "ensuremath")
+ return MathAtom(new InsetMathEnsureMath);
- if (MacroTable::globalMacros().has(s))
- return MathAtom(new MathMacro(s,
- MacroTable::globalMacros().get(s).numargs()));
- //if (MacroTable::localMacros().has(s))
- // return MathAtom(new MathMacro(s,
- // MacroTable::localMacros().get(s).numargs()));
-
- //lyxerr << "creating unknown inset '" << s << "'" << endl;
- return MathAtom(new InsetMathUnknown(s));
+ return MathAtom(new MathMacro(s));
}
if (name != "ref" )
return false;
- InsetCommandParams icp("ref");
+ InsetCommandParams icp(REF_CODE);
// FIXME UNICODE
- InsetCommandMailer::string2params("ref", to_utf8(str), icp);
+ InsetCommand::string2params("ref", to_utf8(str), icp);
mathed_parse_cell(ar, icp.getCommand());
if (ar.size() != 1)
return false;
projects / lyx.git / blobdiff