#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)
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;
}
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;
}
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 == "alignedat")
if (name == "ref") {
InsetCommandParams icp(REF_CODE);
// FIXME UNICODE
- InsetCommand::string2params("ref", to_utf8(str), icp);
+ InsetCommand::string2params(to_utf8(str), icp);
Encoding const * const utf8 = encodings.fromLyXName("utf8");
OutputParams op(utf8);
mathed_parse_cell(ar, icp.getCommand(op));
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())