// define a function for tests
-typedef bool TestItemFunc(MathInset *);
+typedef bool TestItemFunc(MathAtom const &);
// define a function for replacing subexpressions
typedef MathInset * ReplaceArgumentFunc(const MathArray & ar);
if (!ar[i]->asCharInset())
continue;
string s = charSequence(ar.begin() + i, ar.end());
- ar[i].reset(new MathStringInset(s));
+ ar[i] = MathAtom(new MathStringInset(s));
ar.erase(i + 1, i + s.size());
}
//lyxerr << "\nStrings to: " << ar << "\n";
}
-MathInset * singleItem(MathArray & ar)
+MathInset const * singleItem(MathArray const & ar)
{
return ar.size() == 1 ? ar.begin()->nucleus() : 0;
}
//lyxerr << "\nMatrices from: " << ar << "\n";
// first pass for explicitly delimited stuff
for (MathArray::iterator it = ar.begin(); it != ar.end(); ++it) {
- MathDelimInset * del = (*it)->asDelimInset();
+ MathDelimInset const * del = (*it)->asDelimInset();
if (!del)
continue;
- MathInset * arr = singleItem(del->cell(0));
+ MathInset const * arr = singleItem(del->cell(0));
if (!arr || !arr->asGridInset())
continue;
*it = MathAtom(new MathMatrixInset(*(arr->asGridInset())));
// second pass for AMS "pmatrix" etc
for (MathArray::iterator it = ar.begin(); it != ar.end(); ++it) {
- MathAMSArrayInset * ams = (*it)->asAMSArrayInset();
+ MathAMSArrayInset const * ams = (*it)->asAMSArrayInset();
if (!ams)
continue;
*it = MathAtom(new MathMatrixInset(*ams));
// convert this inset somehow to a string
-bool extractString(MathInset * p, string & str)
+bool extractString(MathAtom const & at, string & str)
{
- if (!p)
- return false;
- if (p->getChar()) {
- str = string(1, p->getChar());
+ if (at->getChar()) {
+ str = string(1, at->getChar());
return true;
}
- if (p->asStringInset()) {
- str = p->asStringInset()->str();
+ if (at->asStringInset()) {
+ str = at->asStringInset()->str();
return true;
}
return false;
}
-bool testString(MathInset * p, const string & str)
+bool testString(MathAtom const & at, const string & str)
{
string s;
- return extractString(p, s) && str == s;
+ return extractString(at, s) && str == s;
}
)
{
for (int level = 0; it != last; ++it) {
- if (testOpen(it->nucleus()))
+ if (testOpen(*it))
++level;
- if (testClose(it->nucleus()))
+ if (testClose(*it))
--level;
if (level == 0)
break;
for (MathArray::size_type i = 0; i < ar.size(); ++i) {
// check whether this is the begin of the sequence
MathArray::iterator it = ar.begin() + i;
- if (!testOpen(it->nucleus()))
+ if (!testOpen(*it))
continue;
// search end of sequence
// replace the original stuff by the new inset
ar.erase(it + 1, jt + 1);
- (*it).reset(p);
+ *it = MathAtom(p);
}
}
MathArray::iterator it = ar.begin() + i;
// is this script inset?
- MathScriptInset * p = (*it)->asScriptInset();
+ MathScriptInset * p = (*it).nucleus()->asScriptInset();
if (!p)
continue;
continue;
// we need an exponent but no subscript
- MathScriptInset * sup = (*(it + 1))->asScriptInset();
+ MathScriptInset const * sup = (*(it + 1))->asScriptInset();
if (!sup || sup->hasDown())
continue;
// create a proper exp-inset as replacement
- *it = new MathExFuncInset("exp", sup->cell(1));
+ *it = MathAtom(new MathExFuncInset("exp", sup->cell(1)));
ar.erase(it + 1);
}
//lyxerr << "\nExps to: " << ar << "\n";
{
//lyxerr << "\ndet from: " << ar << "\n";
for (MathArray::iterator it = ar.begin(); it != ar.end(); ++it) {
- MathDelimInset * del = (*it)->asDelimInset();
+ MathDelimInset const * del = (*it)->asDelimInset();
if (!del)
continue;
if (!del->isAbs())
continue;
- *it = new MathExFuncInset("det", del->cell(0));
+ *it = MathAtom(new MathExFuncInset("det", del->cell(0)));
}
//lyxerr << "\ndet to: " << ar << "\n";
}
string s = digitSequence(ar.begin() + i, ar.end());
- ar[i].reset(new MathNumberInset(s));
+ ar[i] = MathAtom(new MathNumberInset(s));
ar.erase(i + 1, i + s.size());
}
//lyxerr << "\nNumbers to: " << ar << "\n";
// search deliminiters
//
-bool testOpenParan(MathInset * p)
+bool testOpenParan(MathAtom const & at)
{
- return testString(p, "(");
+ return testString(at, "(");
}
-bool testCloseParan(MathInset * p)
+bool testCloseParan(MathAtom const & at)
{
- return testString(p, ")");
+ return testString(at, ")");
}
// is it a function?
if ((*it)->asUnknownInset()) {
// it certainly is if it is well known...
- name = (*it)->asUnknownInset()->name();
+ name = (*it)->name();
} else {
// is this a user defined function?
// it it probably not, if it doesn't have a name.
- if (!extractString((*it).nucleus(), name))
+ if (!extractString(*it, name))
continue;
// it is not if it has no argument
if (jt == ar.end())
continue;
// guess so, if this is followed by
// a DelimInset with a single item in the cell
- MathDelimInset * del = (*jt)->asDelimInset();
+ MathDelimInset const * del = (*jt)->asDelimInset();
if (!del || del->cell(0).size() != 1)
continue;
// fall trough into main branch
MathArray::iterator st = extractArgument(p->cell(0), jt, ar.end());
// replace the function name by a real function inset
- (*it).reset(p);
+ *it = MathAtom(p);
// remove the source of the argument from the array
ar.erase(it + 1, st);
// search integrals
//
-bool testSymbol(MathInset * p, string const & name)
+bool testSymbol(MathAtom const & at, string const & name)
{
- return p->asSymbolInset() && p->asSymbolInset()->name() == name;
+ return at->asSymbolInset() && at->asSymbolInset()->name() == name;
}
-bool testIntSymbol(MathInset * p)
+bool testIntSymbol(MathAtom const & at)
{
- return testSymbol(p, "int");
+ return testSymbol(at, "int");
}
-bool testIntDiff(MathInset * p)
+bool testIntegral(MathAtom const & at)
+{
+ return
+ testIntSymbol(at) ||
+ ( at->asScriptInset()
+ && at->asScriptInset()->nuc().size()
+ && testIntSymbol(at->asScriptInset()->nuc().back()) );
+}
+
+
+
+bool testIntDiff(MathAtom const & at)
{
- return testString(p, "d");
+ return testString(at, "d");
}
for (MathArray::size_type i = 0; i + 1 < ar.size(); ++i) {
MathArray::iterator it = ar.begin() + i;
- // is this a integral name?
- if (!testIntSymbol(it->nucleus()))
- continue;
-
// search 'd'
MathArray::iterator jt =
- endNestSearch(it, ar.end(), testIntSymbol, testIntDiff);
+ endNestSearch(it, ar.end(), testIntegral, testIntDiff);
// something sensible found?
if (jt == ar.end())
continue;
- // create a proper inset as replacement
- MathExIntInset * p = new MathExIntInset("int");
-
- // collect subscript if any
- MathArray::iterator st = it + 1;
- if (st != ar.end())
- if (MathScriptInset * sub = (*st)->asScriptInset())
- if (sub->hasDown()) {
- p->cell(2) = sub->down().data();
- ++st;
- }
-
- // collect superscript if any
- if (st != ar.end())
- if (MathScriptInset * sup = (*st)->asScriptInset())
- if (sup->hasUp()) {
- p->cell(3) = sup->up().data();
- ++st;
- }
+ // is this a integral name?
+ if (!testIntegral(*it))
+ continue;
// core ist part from behind the scripts to the 'd'
- p->cell(0) = MathArray(st, jt);
+ MathExIntInset * p = new MathExIntInset("int");
+
+ // handle scripts if available
+ if (!testIntSymbol(*it)) {
+ p->cell(2) = (*it)->asScriptInset()->down();
+ p->cell(3) = (*it)->asScriptInset()->up();
+ }
+ p->cell(0) = MathArray(it + 1, jt);
// use the "thing" behind the 'd' as differential
MathArray::iterator tt = extractArgument(p->cell(1), jt + 1, ar.end());
// remove used parts
ar.erase(it + 1, tt);
- (*it).reset(p);
+ *it = MathAtom(p);
}
//lyxerr << "\nIntegrals to: " << ar << "\n";
}
bool testEqualSign(MathAtom const & at)
{
- return testString(at.nucleus(), "=");
+ return testString(at, "=");
}
+bool testSumSymbol(MathAtom const & p)
+{
+ return testSymbol(p, "sum");
+}
+
+
+bool testSum(MathAtom const & at)
+{
+ return
+ testSumSymbol(at) ||
+ ( at->asScriptInset()
+ && at->asScriptInset()->nuc().size()
+ && testSumSymbol(at->asScriptInset()->nuc().back()) );
+}
+
// replace '\sum' ['_^'] f(x) sequences by a real MathExIntInset
// assume 'extractDelims' ran before
MathArray::iterator it = ar.begin() + i;
// is this a sum name?
- if (!testSymbol(it->nucleus(), "sum"))
+ if (!testSum(*it))
continue;
// create a proper inset as replacement
MathExIntInset * p = new MathExIntInset("sum");
// collect lower bound and summation index
- MathArray::iterator st = it + 1;
- if (st != ar.end())
- if (MathScriptInset * sub = (*st)->asScriptInset())
- if (sub->hasDown()) {
- // try to figure out the summation index from the subscript
- MathArray & ar = sub->down().data();
- MathArray::iterator it =
- find_if(ar.begin(), ar.end(), &testEqualSign);
- if (it != ar.end()) {
- // we found a '=', use everything in front of that as index,
- // and everything behind as lower index
- p->cell(1) = MathArray(ar.begin(), it);
- p->cell(2) = MathArray(it + 1, ar.end());
- } else {
- // use everything as summation index, don't use scripts.
- p->cell(1) = ar;
- }
- ++st;
- }
+ MathScriptInset const * sub = (*it)->asScriptInset();
+ if (sub && sub->hasDown()) {
+ // try to figure out the summation index from the subscript
+ MathArray const & ar = sub->down();
+ MathArray::const_iterator xt =
+ find_if(ar.begin(), ar.end(), &testEqualSign);
+ if (xt != ar.end()) {
+ // we found a '=', use everything in front of that as index,
+ // and everything behind as lower index
+ p->cell(1) = MathArray(ar.begin(), xt);
+ p->cell(2) = MathArray(xt + 1, ar.end());
+ } else {
+ // use everything as summation index, don't use scripts.
+ p->cell(1) = ar;
+ }
+ }
// collect upper bound
- if (st != ar.end())
- if (MathScriptInset * sup = (*st)->asScriptInset())
- if (sup->hasUp()) {
- p->cell(3) = sup->up().data();
- ++st;
- }
+ if (sub && sub->hasUp())
+ p->cell(3) = sub->up();
- // use some behind the script as core
- MathArray::iterator tt = extractArgument(p->cell(0), st, ar.end());
+ // use something behind the script as core
+ MathArray::iterator tt = extractArgument(p->cell(0), it + 1, ar.end());
// cleanup
ar.erase(it + 1, tt);
- (*it).reset(p);
+ *it = MathAtom(p);
}
//lyxerr << "\nSums to: " << ar << "\n";
}
// tests for 'd' or '\partial'
bool testDiffItem(MathAtom const & at)
{
- return testString(at.nucleus(), "d");
+ return testString(at, "d");
}
}
-bool testDiffFrac(MathInset * p)
-{
- MathFracInset * f = p->asFracInset();
- return f && testDiffArray(f->cell(0)) && testDiffArray(f->cell(1));
-}
-
-
-// is this something like ^number?
-bool extractDiffExponent(MathArray::iterator it, int & i)
+bool testDiffFrac(MathAtom const & at)
{
- if (!(*it)->asScriptInset())
- return false;
-
- string s;
- if (!extractString((*it).nucleus(), s))
- return false;
- istringstream is(s.c_str());
- is >> i;
- return is;
+ return
+ at->asFracInset()
+ && testDiffArray(at->asFracInset()->cell(0))
+ && testDiffArray(at->asFracInset()->cell(1));
}
MathArray::iterator it = ar.begin() + i;
// is this a "differential fraction"?
- if (!testDiffFrac(it->nucleus()))
+ if (!testDiffFrac(*it))
continue;
- MathFracInset * f = (*it)->asFracInset();
+ MathFracInset const * f = (*it)->asFracInset();
if (!f) {
lyxerr << "should not happen\n";
continue;
// collect function, let jt point behind last used item
MathArray::iterator jt = it + 1;
//int n = 1;
- MathArray & numer = f->cell(0);
+ MathArray const & numer = f->cell(0);
if (numer.size() > 1 && numer[1]->asScriptInset()) {
// this is something like d^n f(x) / d... or d^n / d...
// FIXME
}
// collect denominator parts
- MathArray & denom = f->cell(1);
- for (MathArray::iterator dt = denom.begin(); dt != denom.end();) {
+ MathArray const & denom = f->cell(1);
+ for (MathArray::const_iterator dt = denom.begin(); dt != denom.end();) {
// find the next 'd'
- MathArray::iterator et = find_if(dt + 1, denom.end(), &testDiffItem);
+ MathArray::const_iterator et
+ = find_if(dt + 1, denom.end(), &testDiffItem);
// point before this
- MathArray::iterator st = et - 1;
- MathScriptInset * script = (*st)->asScriptInset();
+ MathArray::const_iterator st = et - 1;
+ MathScriptInset const * script = (*st)->asScriptInset();
if (script && script->hasUp()) {
// things like d.../dx^n
int mult = 1;
- if (extractNumber(script->up().data(), mult)) {
+ if (extractNumber(script->up(), mult)) {
//lyxerr << "mult: " << mult << endl;
for (int i = 0; i < mult; ++i)
diff->addDer(MathArray(dt + 1, st));
// cleanup
ar.erase(it + 1, jt);
- (*it).reset(diff);
+ *it = MathAtom(diff);
}
//lyxerr << "\nDiffs to: " << ar << "\n";
}
bool testRightArrow(MathAtom const & at)
{
- return
- testSymbol(at.nucleus(), "to") ||
- testSymbol(at.nucleus(), "rightarrow");
+ return testSymbol(at, "to") || testSymbol(at, "rightarrow");
}
MathArray::iterator it = ar.begin() + i;
// is this a limit function?
- if (!testSymbol(it->nucleus(), "lim"))
+ if (!testSymbol(*it, "lim"))
continue;
// the next one must be a subscript (without superscript)
- MathScriptInset * sub = (*(it + 1))->asScriptInset();
+ MathScriptInset const * sub = (*(it + 1))->asScriptInset();
if (!sub || !sub->hasDown() || sub->hasUp())
continue;
// and it must contain a -> symbol
- MathArray & s = sub->down().data();
- MathArray::iterator st = find_if(s.begin(), s.end(), &testRightArrow);
+ MathArray const & s = sub->down();
+ MathArray::const_iterator st = find_if(s.begin(), s.end(), &testRightArrow);
if (st == s.end())
continue;
MathArray f;
MathArray::iterator tt = extractArgument(f, it + 2, ar.end());
- // create a proper inset as replacement
- MathLimInset * p = new MathLimInset(f, x, x0);
-
// cleanup
ar.erase(it + 1, tt);
- (*it).reset(p);
+
+ // create a proper inset as replacement
+ *it = MathAtom(new MathLimInset(f, x, x0));
}
//lyxerr << "\nLimits to: " << ar << "\n";
}
void extractStructure(MathArray & ar)
{
+ extractIntegrals(ar);
+ extractSums(ar);
splitScripts(ar);
extractNumbers(ar);
extractMatrices(ar);
extractDelims(ar);
extractFunctions(ar);
extractDets(ar);
- extractIntegrals(ar);
- extractSums(ar);
extractDiff(ar);
extractExps(ar);
extractLims(ar);
{
MathArray ar = dat;
extractStrings(ar);
- for (MathArray::const_iterator it = ar.begin(); it != ar.end(); ++it)
+ wi.firstitem() = true;
+ for (MathArray::const_iterator it = ar.begin(); it != ar.end(); ++it) {
(*it)->write(wi);
+ wi.firstitem() = false;
+ }
}
if (ar.size() == 0)
os << "<mrow/>";
else if (ar.size() == 1)
- os << ar.begin()->nucleus();
+ os << ar.front();
else {
os << MTag("mrow");
for (MathArray::const_iterator it = ar.begin(); it != ar.end(); ++it)
res.append(mat->cell(0));
else {
res.push_back(MathAtom(new MathDelimInset("(", ")")));
- res.back()->cell(0).push_back(at);
+ res.back().nucleus()->cell(0).push_back(at);
}
return res;
}
projects / lyx.git / blobdiff