#include "MathExtern.h"
+#include "InsetMathAMSArray.h"
#include "InsetMathArray.h"
#include "InsetMathChar.h"
#include "InsetMathDelim.h"
namespace lyx {
+namespace {
+
+enum ExternalMath {
+ HTML,
+ MAPLE,
+ MAXIMA,
+ MATHEMATICA,
+ MATHML,
+ OCTAVE
+};
+
+
static char const * function_names[] = {
"arccos", "arcsin", "arctan", "arg", "bmod",
"cos", "cosh", "cot", "coth", "csc", "deg",
// try to extract an "argument" to some function.
// returns position behind the argument
MathData::iterator extractArgument(MathData & ar,
- MathData::iterator pos, MathData::iterator last, bool function = false)
+ MathData::iterator pos, MathData::iterator last,
+ ExternalMath kind, bool function = false)
{
// nothing to get here
if (pos == last)
// something delimited _is_ an argument
if ((*pos)->asDelimInset()) {
// leave out delimiters if this is a function argument
- if (function) {
+ // unless we are doing MathML, in which case we do want
+ // the delimiters
+ if (function && kind != MATHML && kind != HTML) {
MathData const & arg = (*pos)->asDelimInset()->cell(0);
MathData::const_iterator cur = arg.begin();
MathData::const_iterator end = arg.end();
//lyxerr << "\nMatrices from: " << ar << endl;
// first pass for explicitly delimited stuff
for (size_t i = 0; i < ar.size(); ++i) {
- if (!ar[i]->asDelimInset())
+ InsetMathDelim const * const inset = ar[i]->asDelimInset();
+ if (!inset)
continue;
- MathData const & arr = ar[i]->asDelimInset()->cell(0);
+ MathData const & arr = inset->cell(0);
if (arr.size() != 1)
continue;
if (!arr.front()->asGridInset())
continue;
- ar[i] = MathAtom(new InsetMathMatrix(*(arr.front()->asGridInset())));
+ ar[i] = MathAtom(new InsetMathMatrix(*(arr.front()->asGridInset()),
+ inset->left_, inset->right_));
}
// second pass for AMS "pmatrix" etc
- for (size_t i = 0; i < ar.size(); ++i)
- if (ar[i]->asAMSArrayInset())
- ar[i] = MathAtom(new InsetMathMatrix(*(ar[i]->asGridInset())));
+ for (size_t i = 0; i < ar.size(); ++i) {
+ InsetMathAMSArray const * const inset = ar[i]->asAMSArrayInset();
+ if (inset) {
+ string left = inset->name_left();
+ if (left == "Vert")
+ left = "[";
+ string right = inset->name_right();
+ if (right == "Vert")
+ right = "]";
+ ar[i] = MathAtom(new InsetMathMatrix(*inset, from_ascii(left), from_ascii(right)));
+ }
+ }
//lyxerr << "\nMatrices to: " << ar << endl;
}
}
-// convert this inset somehow to a number
-bool extractNumber(MathData const & ar, int & i)
-{
- idocstringstream is(charSequence(ar.begin(), ar.end()));
- is >> i;
- return is;
-}
-
-
-bool extractNumber(MathData const & ar, double & d)
-{
- idocstringstream is(charSequence(ar.begin(), ar.end()));
- is >> d;
- return is;
-}
-
-
bool testString(MathAtom const & at, docstring const & str)
{
docstring s;
continue;
// we must have a nucleus if we only have a superscript
- if (!script->hasDown() && script->nuc().size() == 0)
+ if (!script->hasDown() && script->nuc().empty())
continue;
if (script->nuc().size() == 1) {
// replace 'f' '(...)' and 'f' '^n' '(...)' sequences by a real InsetMathExFunc
// assume 'extractDelims' ran before
-void extractFunctions(MathData & ar)
+void extractFunctions(MathData & ar, ExternalMath kind)
{
+ // FIXME From what I can see, this is quite broken right now, for reasons
+ // I will note below. (RGH)
+
// we need at least two items...
if (ar.size() < 2)
return;
docstring name;
// is it a function?
// it certainly is if it is well known...
+
+ // FIXME This will never give us anything. When we get here, *it will
+ // never point at a string, but only at a character. I.e., if we are
+ // working on "sin(x)", then we are seeing:
+ // [char s mathalpha][char i mathalpha][char n mathalpha][delim ( ) [char x mathalpha]]
+ // and of course we will not find the function name "sin" in there, but
+ // rather "n(x)".
+ //
+ // It appears that we original ran extractStrings() before we ran
+ // extractFunctions(), but Andre changed this at f200be55, I think
+ // because this messed up what he was trying to do with "dx" in the
+ // context of integrals.
+ //
+ // This could be fixed by looking at a charSequence instead of just at
+ // the various characters, one by one. But I am not sure I understand
+ // exactly what we are trying to do here. And it involves a lot of
+ // guessing.
if (!extractFunctionName(*it, name)) {
// is this a user defined function?
- // it it probably not, if it doesn't have a name.
+ // probably not, if it doesn't have a name.
if (!extractString(*it, name))
continue;
// it is not if it has no argument
InsetMathDelim const * del = (*jt)->asDelimInset();
if (!del || del->cell(0).size() != 1)
continue;
- // fall trough into main branch
+ // fall through into main branch
}
// do we have an exponent like in
auto_ptr<InsetMathExFunc> p(new InsetMathExFunc(buf, name));
// jt points to the "argument". Get hold of this.
- MathData::iterator st = extractArgument(p->cell(0), jt, ar.end(), true);
+ MathData::iterator st =
+ extractArgument(p->cell(0), jt, ar.end(), kind, true);
// replace the function name by a real function inset
*it = MathAtom(p.release());
return
testIntSymbol(at) ||
( at->asScriptInset()
- && at->asScriptInset()->nuc().size()
+ && !at->asScriptInset()->nuc().empty()
&& testIntSymbol(at->asScriptInset()->nuc().back()) );
}
// replace '\int' ['_^'] x 'd''x'(...)' sequences by a real InsetMathExInt
// assume 'extractDelims' ran before
-void extractIntegrals(MathData & ar)
+void extractIntegrals(MathData & ar, ExternalMath kind)
{
// we need at least three items...
if (ar.size() < 3)
p->cell(0) = MathData(buf, it + 1, jt);
// use the "thing" behind the 'd' as differential
- MathData::iterator tt = extractArgument(p->cell(1), jt + 1, ar.end());
+ MathData::iterator tt = extractArgument(p->cell(1), jt + 1, ar.end(), kind);
// remove used parts
ar.erase(it + 1, tt);
return
testSumSymbol(at) ||
( at->asScriptInset()
- && at->asScriptInset()->nuc().size()
+ && !at->asScriptInset()->nuc().empty()
&& testSumSymbol(at->asScriptInset()->nuc().back()) );
}
bool testDiffArray(MathData const & ar)
{
- return ar.size() && testDiffItem(ar.front());
+ return !ar.empty() && testDiffItem(ar.front());
}
// combine searches
//
-void extractStructure(MathData & ar)
+void extractStructure(MathData & ar, ExternalMath kind)
{
//lyxerr << "\nStructure from: " << ar << endl;
- splitScripts(ar);
+ if (kind != MATHML && kind != HTML)
+ splitScripts(ar);
extractDelims(ar);
- extractIntegrals(ar);
- extractSums(ar);
+ extractIntegrals(ar, kind);
+ if (kind != MATHML && kind != HTML)
+ extractSums(ar);
extractNumbers(ar);
extractMatrices(ar);
- extractFunctions(ar);
- extractDets(ar);
- extractDiff(ar);
- extractExps(ar);
- extractLims(ar);
- extractStrings(ar);
- //lyxerr << "\nStructure to: " << ar << endl;
-}
-
-
-void write(MathData const & dat, WriteStream & wi)
-{
- MathData ar = dat;
- extractStrings(ar);
- wi.firstitem() = true;
- for (MathData::const_iterator it = ar.begin(); it != ar.end(); ++it) {
- (*it)->write(wi);
- wi.firstitem() = false;
- }
-}
-
-
-void normalize(MathData const & ar, NormalStream & os)
-{
- for (MathData::const_iterator it = ar.begin(); it != ar.end(); ++it)
- (*it)->normalize(os);
-}
-
-
-void octave(MathData const & dat, OctaveStream & os)
-{
- MathData ar = dat;
- extractStructure(ar);
- for (MathData::const_iterator it = ar.begin(); it != ar.end(); ++it)
- (*it)->octave(os);
-}
-
-
-void maple(MathData const & dat, MapleStream & os)
-{
- MathData ar = dat;
- extractStructure(ar);
- for (MathData::const_iterator it = ar.begin(); it != ar.end(); ++it)
- (*it)->maple(os);
-}
-
-
-void maxima(MathData const & dat, MaximaStream & os)
-{
- MathData ar = dat;
- extractStructure(ar);
- for (MathData::const_iterator it = ar.begin(); it != ar.end(); ++it)
- (*it)->maxima(os);
-}
-
-
-void mathematica(MathData const & dat, MathematicaStream & os)
-{
- MathData ar = dat;
- extractStructure(ar);
- for (MathData::const_iterator it = ar.begin(); it != ar.end(); ++it)
- (*it)->mathematica(os);
-}
-
-
-void mathmlize(MathData const & dat, MathStream & os)
-{
- MathData ar = dat;
- extractStructure(ar);
- if (ar.size() == 0)
- os << "<mrow/>";
- else if (ar.size() == 1)
- os << ar.front();
- else {
- os << MTag("mrow");
- for (MathData::const_iterator it = ar.begin(); it != ar.end(); ++it)
- (*it)->mathmlize(os);
- os << ETag("mrow");
+ if (kind != MATHML && kind != HTML) {
+ extractFunctions(ar, kind);
+ extractDets(ar);
+ extractDiff(ar);
+ extractExps(ar);
+ extractLims(ar);
+ extractStrings(ar);
}
+ //lyxerr << "\nStructure to: " << ar << endl;
}
-
-
namespace {
string captureOutput(string const & cmd, string const & data)
}
+} // anon namespace
+
+void write(MathData const & dat, WriteStream & wi)
+{
+ MathData ar = dat;
+ extractStrings(ar);
+ wi.firstitem() = true;
+ for (MathData::const_iterator it = ar.begin(); it != ar.end(); ++it) {
+ (*it)->write(wi);
+ wi.firstitem() = false;
+ }
+}
+
+
+void normalize(MathData const & ar, NormalStream & os)
+{
+ for (MathData::const_iterator it = ar.begin(); it != ar.end(); ++it)
+ (*it)->normalize(os);
+}
+
+
+void octave(MathData const & dat, OctaveStream & os)
+{
+ MathData ar = dat;
+ extractStructure(ar, OCTAVE);
+ for (MathData::const_iterator it = ar.begin(); it != ar.end(); ++it)
+ (*it)->octave(os);
+}
+
+
+void maple(MathData const & dat, MapleStream & os)
+{
+ MathData ar = dat;
+ extractStructure(ar, MAPLE);
+ for (MathData::const_iterator it = ar.begin(); it != ar.end(); ++it)
+ (*it)->maple(os);
+}
+
+
+void maxima(MathData const & dat, MaximaStream & os)
+{
+ MathData ar = dat;
+ extractStructure(ar, MAXIMA);
+ for (MathData::const_iterator it = ar.begin(); it != ar.end(); ++it)
+ (*it)->maxima(os);
+}
+
+
+void mathematica(MathData const & dat, MathematicaStream & os)
+{
+ MathData ar = dat;
+ extractStructure(ar, MATHEMATICA);
+ for (MathData::const_iterator it = ar.begin(); it != ar.end(); ++it)
+ (*it)->mathematica(os);
+}
+
+
+void mathmlize(MathData const & dat, MathStream & os)
+{
+ MathData ar = dat;
+ extractStructure(ar, MATHML);
+ if (ar.empty())
+ os << "<mrow/>";
+ else if (ar.size() == 1)
+ os << ar.front();
+ else {
+ os << MTag("mrow");
+ for (MathData::const_iterator it = ar.begin(); it != ar.end(); ++it)
+ (*it)->mathmlize(os);
+ os << ETag("mrow");
+ }
+}
+
+
+void htmlize(MathData const & dat, HtmlStream & os)
+{
+ MathData ar = dat;
+ extractStructure(ar, HTML);
+ if (ar.empty())
+ return;
+ if (ar.size() == 1) {
+ os << ar.front();
+ return;
+ }
+ for (MathData::const_iterator it = ar.begin(); it != ar.end(); ++it)
+ (*it)->htmlize(os);
+}
+
+
+// convert this inset somehow to a number
+bool extractNumber(MathData const & ar, int & i)
+{
+ idocstringstream is(charSequence(ar.begin(), ar.end()));
+ is >> i;
+ // Do not convert is implicitly to bool, since that is forbidden in C++11.
+ return !is.fail();
+}
+
+
+bool extractNumber(MathData const & ar, double & d)
+{
+ idocstringstream is(charSequence(ar.begin(), ar.end()));
+ is >> d;
+ // Do not convert is implicitly to bool, since that is forbidden in C++11.
+ return !is.fail();
+}
+
MathData pipeThroughExtern(string const & lang, docstring const & extra,
MathData const & ar)
}
// run external sript
- string out = captureOutput(file.absFilename(), data);
+ string out = captureOutput(file.absFileName(), data);
MathData res;
mathed_parse_cell(res, from_utf8(out));
return res;
projects / lyx.git / blobdiff