#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 "InsetMathPhantom.h"
#include "InsetMathRef.h"
#include "InsetMathRoot.h"
+#include "InsetMathSideset.h"
#include "InsetMathSize.h"
#include "InsetMathSpace.h"
#include "InsetMathSpecialChar.h"
#include "InsetMathHull.h"
#include "InsetMathXArrow.h"
#include "InsetMathXYMatrix.h"
+#include "InsetMathDiagram.h"
#include "MacroTable.h"
#include "MathMacro.h"
#include "MathMacroArgument.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"
namespace {
-MathWordList theWordList;
+MathWordList theMathWordList;
bool isMathFontAvailable(docstring & name)
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;
string macro;
string requires;
is >> macro >> requires;
- MacroTable::globalMacros().insert(0, 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;
}
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));
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
<< " 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])
char_type const c = name.at(0);
return c == '{' || c == '}' || c == '&' || c == '$' ||
- c == '#' || c == '%' || c == '_' || c == ' ';
+ c == '#' || c == '%' || c == '_';
}
MathWordList const & mathedWordList()
{
- return theWordList;
+ return theMathWordList;
}
}
-int ensureMode(WriteStream & os, InsetMath::mode_type mode, bool locked)
+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.pendingSpace(false);
os.textMode(true);
}
- int oldmodes = os.textMode() ? 1 : 0;
+ int oldmodes = os.textMode() ? 0x01 : 0;
os.textMode(textmode);
- oldmodes |= os.lockedMode() ? 2 : 0;
+ 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(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;
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<char>(s[i]);
+ }
+ }
+ } else if (i < len) {
switch (s[i]) {
case 'R':
case 'C':
++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(buf, 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(buf, s));
- if (s == "split" || s == "gathered" || s == "aligned" || s == "alignedat")
+ if (s == "split" || s == "alignedat")
return MathAtom(new InsetMathSplit(buf, s));
if (s == "cases")
return MathAtom(new InsetMathCases(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")
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));
+ 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));
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())
bool isAsciiOrMathAlpha(char_type c)
{
- return c < 0x80 || Encodings::isMathAlpha(c);
+ return isASCII(c) || Encodings::isMathAlpha(c);
}
projects / lyx.git / blobdiff