namespace {
enum ExternalMath {
+ HTML,
MAPLE,
MAXIMA,
MATHEMATICA,
// leave out delimiters if this is a function argument
// unless we are doing MathML, in which case we do want
// the delimiters
- if (function && kind != MATHML) {
+ 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();
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) {
// assume 'extractDelims' ran before
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
return
testIntSymbol(at) ||
( at->asScriptInset()
- && at->asScriptInset()->nuc().size()
+ && !at->asScriptInset()->nuc().empty()
&& testIntSymbol(at->asScriptInset()->nuc().back()) );
}
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());
}
void extractStructure(MathData & ar, ExternalMath kind)
{
//lyxerr << "\nStructure from: " << ar << endl;
- if (kind != MATHML)
+ if (kind != MATHML && kind != HTML)
splitScripts(ar);
extractDelims(ar);
extractIntegrals(ar, kind);
- if (kind != MATHML)
+ if (kind != MATHML && kind != HTML)
extractSums(ar);
extractNumbers(ar);
extractMatrices(ar);
- extractFunctions(ar, kind);
- extractDets(ar);
- extractDiff(ar);
- extractExps(ar);
- extractLims(ar);
- if (kind != MATHML)
+ if (kind != MATHML && kind != HTML) {
+ extractFunctions(ar, kind);
+ extractDets(ar);
+ extractDiff(ar);
+ extractExps(ar);
+ extractLims(ar);
extractStrings(ar);
+ }
//lyxerr << "\nStructure to: " << ar << endl;
}
{
MathData ar = dat;
extractStructure(ar, MATHML);
- if (ar.size() == 0)
+ if (ar.empty())
os << "<mrow/>";
else if (ar.size() == 1)
os << ar.front();
}
}
+
+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)
{
}
// 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;