#include "InsetMathHull.h"
#include "InsetMathXArrow.h"
#include "InsetMathXYMatrix.h"
+#include "InsetMathDiagram.h"
#include "MacroTable.h"
#include "MathMacro.h"
#include "MathMacroArgument.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;
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;
LYXERR(Debug::MATHED, "read symbol '" << to_utf8(tmp.name)
<< " inset: " << to_utf8(tmp.inset)
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;
}
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 (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;
+ odocstringstream ods;
+ otexstream os(ods);
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())