-
// This file contains most of the magic that extracts "context
// information" from the unstructered layout-oriented stuff in an
// MathArray.
#include <algorithm>
+#include "math_amsarrayinset.h"
#include "math_charinset.h"
#include "math_deliminset.h"
#include "math_diffinset.h"
#include "math_exfuncinset.h"
#include "math_exintinset.h"
-#include "math_funcinset.h"
#include "math_fracinset.h"
#include "math_matrixinset.h"
#include "math_mathmlstream.h"
#include "math_scriptinset.h"
#include "math_stringinset.h"
#include "math_symbolinset.h"
+#include "math_unknowninset.h"
#include "Lsstream.h"
#include "debug.h"
-std::ostream & operator<<(std::ostream & os, MathArray const & ar)
+using std::ostream;
+using std::istringstream;
+using std::find_if;
+
+
+ostream & operator<<(ostream & os, MathArray const & ar)
{
- NormalStream ns(os);
+ NormalStream ns(os);
ns << ar;
return os;
}
-// try to extract a super/subscript
+// try to extract a super/subscript
// modify iterator position to point behind the thing
bool extractScript(MathArray & ar,
MathArray::iterator & pos, MathArray::iterator last)
MathScriptInset const * asScript(MathArray::const_iterator it)
{
+ if (!it->nucleus())
+ return 0;
if (it->nucleus()->asScriptInset())
return 0;
++it;
// returns sequence of char with same code starting at it up to end
// it might be less, though...
MathArray::const_iterator charSequence(MathArray::const_iterator it,
- MathArray::const_iterator end, string & s, MathTextCodes & c)
+ MathArray::const_iterator end, string & s)
{
- MathCharInset const * p = (*it)->asCharInset();
- c = p->code();
- for (; it != end; ++it) {
- p = (*it)->asCharInset();
- if (!p || p->code() != c)
- break;
- s += p->getChar();
- }
+ for (; it != end && (*it)->asCharInset(); ++it)
+ s += (*it)->getChar();
return it;
}
// create proper string inset
MathStringInset * p = new MathStringInset;
MathArray::const_iterator
- jt = charSequence(it, ar.end(), p->str_, p->code_);
+ jt = charSequence(it, ar.end(), p->str_);
// clean up
(*it).reset(p);
void extractMatrices(MathArray & ar)
{
- lyxerr << "\nMatrices from: " << ar << "\n";
+ //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();
if (!del)
continue;
MathInset * arr = singleItem(del->cell(0));
- if (!arr || !arr->asArrayInset())
+ 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();
+ if (!ams)
continue;
- *it = MathAtom(new MathMatrixInset(*(arr->asArrayInset())));
+ *it = MathAtom(new MathMatrixInset(*ams));
}
- lyxerr << "\nMatrices to: " << ar << "\n";
+ //lyxerr << "\nMatrices to: " << ar << "\n";
}
bool extractNumber(MathArray const & ar, int & i)
{
string s;
- MathTextCodes c;
- charSequence(ar.begin(), ar.end(), s, c);
- std::istringstream is(s.c_str());
+ charSequence(ar.begin(), ar.end(), s);
+ istringstream is(s.c_str());
+ is >> i;
+ return is;
+}
+
+
+bool extractNumber(MathArray const & ar, double & i)
+{
+ string s;
+ charSequence(ar.begin(), ar.end(), s);
+ istringstream is(s.c_str());
is >> i;
return is;
}
ar.erase(it + 1, jt + 1);
(*it).reset(p);
}
-}
+}
//
// split scripts into seperate super- and subscript insets. sub goes in
-// front of super...
+// front of super...
//
void splitScripts(MathArray & ar)
{
- lyxerr << "\nScripts from: " << ar << "\n";
+ //lyxerr << "\nScripts from: " << ar << "\n";
for (MathArray::size_type i = 0; i < ar.size(); ++i) {
MathArray::iterator it = ar.begin() + i;
// create extra script inset and move superscript over
MathScriptInset * q = new MathScriptInset;
- q->ensure(true);
+ q->ensure(true);
q->up().data_.swap(p->up().data_);
p->removeScript(true);
// insert new inset behind
++i;
- ar.insert(i, MathAtom(q));
+ ar.insert(i, MathAtom(q));
}
- lyxerr << "\nScripts to: " << ar << "\n";
+ //lyxerr << "\nScripts to: " << ar << "\n";
}
void extractExps(MathArray & ar)
{
- lyxerr << "\nExps from: " << ar << "\n";
+ //lyxerr << "\nExps from: " << ar << "\n";
for (MathArray::size_type i = 0; i + 1 < ar.size(); ++i) {
MathArray::iterator it = ar.begin() + i;
(*it).reset(func);
ar.erase(it + 1);
}
- lyxerr << "\nExps to: " << ar << "\n";
+ //lyxerr << "\nExps to: " << ar << "\n";
}
// replace '('...')' sequences by a real MathDelimInset
void extractDelims(MathArray & ar)
{
- lyxerr << "\nDelims from: " << ar << "\n";
+ //lyxerr << "\nDelims from: " << ar << "\n";
replaceNested(ar, testOpenParan, testCloseParan, replaceDelims);
- lyxerr << "\nDelims to: " << ar << "\n";
+ //lyxerr << "\nDelims to: " << ar << "\n";
}
if (ar.size() <= 1)
return;
- lyxerr << "\nFunctions from: " << ar << "\n";
+ //lyxerr << "\nFunctions from: " << ar << "\n";
for (MathArray::size_type i = 0; i + 1 < ar.size(); ++i) {
MathArray::iterator it = ar.begin() + i;
MathArray::iterator jt = it + 1;
string name;
// is it a function?
- if ((*it)->asFuncInset()) {
+ if ((*it)->asUnknownInset()) {
// it certainly is if it is well known...
- name = (*it)->asFuncInset()->name();
- } else {
+ name = (*it)->asUnknownInset()->name();
+ } else {
// is this a user defined function?
// it it probably not, if it doesn't have a name.
if (!extractString((*it).nucleus(), name))
// 'sin' '^2' 'x' -> 'sin(x)' '^2'
MathArray exp;
extractScript(exp, jt, ar.end());
-
+
// create a proper inset as replacement
MathExFuncInset * p = new MathExFuncInset(name);
// replace the function name by a real function inset
(*it).reset(p);
-
+
// remove the source of the argument from the array
ar.erase(it + 1, st);
// re-insert exponent
ar.insert(i + 1, exp);
- lyxerr << "\nFunctions to: " << ar << "\n";
+ //lyxerr << "\nFunctions to: " << ar << "\n";
}
-}
+}
//
if (ar.size() <= 2)
return;
- lyxerr << "\nIntegrals from: " << ar << "\n";
+ //lyxerr << "\nIntegrals from: " << ar << "\n";
for (MathArray::size_type i = 0; i + 1 < ar.size(); ++i) {
MathArray::iterator it = ar.begin() + i;
// collect subscript if any
MathArray::iterator st = it + 1;
if (st != ar.end())
- if (MathScriptInset * sub = (*st)->asScriptInset())
+ 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 (MathScriptInset * sup = (*st)->asScriptInset())
if (sup->hasUp()) {
p->cell(3) = sup->up().data_;
++st;
// 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);
}
- lyxerr << "\nIntegrals to: " << ar << "\n";
+ //lyxerr << "\nIntegrals to: " << ar << "\n";
}
if (ar.size() <= 1)
return;
- lyxerr << "\nSums from: " << ar << "\n";
+ //lyxerr << "\nSums from: " << ar << "\n";
for (MathArray::size_type i = 0; i + 1< ar.size(); ++i) {
MathArray::iterator it = ar.begin() + i;
// try to figure out the summation index from the subscript
MathArray & ar = sub->down().data_;
MathArray::iterator it =
- std::find_if(ar.begin(), ar.end(), &testEqualSign);
+ 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
ar.erase(it + 1, tt);
(*it).reset(p);
}
- lyxerr << "\nSums to: " << ar << "\n";
+ //lyxerr << "\nSums to: " << ar << "\n";
}
string s;
if (!extractString((*it).nucleus(), s))
return false;
- std::istringstream is(s.c_str());
+ istringstream is(s.c_str());
is >> i;
return is;
}
void extractDiff(MathArray & ar)
{
- lyxerr << "\nDiffs from: " << ar << "\n";
+ //lyxerr << "\nDiffs from: " << ar << "\n";
for (MathArray::size_type i = 0; i < ar.size(); ++i) {
MathArray::iterator it = ar.begin() + i;
// is this a "differential fraction"?
if (!testDiffFrac(it->nucleus()))
continue;
-
+
MathFracInset * f = (*it)->asFracInset();
if (!f) {
lyxerr << "should not happen\n";
MathDiffInset * diff = new MathDiffInset;
// collect function, let jt point behind last used item
- MathArray::iterator jt = it + 1;
- //int n = 1;
+ MathArray::iterator jt = it + 1;
+ //int n = 1;
MathArray & numer = f->cell(0);
if (numer.size() > 1 && numer.at(1)->asScriptInset()) {
// this is something like d^n f(x) / d... or d^n / d...
// FIXME
- //n = 1;
- if (numer.size() > 2)
+ //n = 1;
+ if (numer.size() > 2)
diff->cell(0) = MathArray(numer.begin() + 2, numer.end());
else
jt = extractArgument(diff->cell(0), jt, ar.end());
} else {
// simply d f(x) / d... or d/d...
- if (numer.size() > 1)
+ if (numer.size() > 1)
diff->cell(0) = MathArray(numer.begin() + 1, numer.end());
else
jt = extractArgument(diff->cell(0), jt, ar.end());
// collect denominator parts
MathArray & denom = f->cell(1);
- for (MathArray::iterator dt = denom.begin(); dt != denom.end(); ) {
+ for (MathArray::iterator dt = denom.begin(); dt != denom.end();) {
// find the next 'd'
- MathArray::iterator et = std::find_if(dt + 1, denom.end(), &testDiffItem);
+ MathArray::iterator et = find_if(dt + 1, denom.end(), &testDiffItem);
// point before this
MathArray::iterator st = et - 1;
// things like d.../dx^n
int mult = 1;
if (extractNumber(script->up().data_, mult)) {
- lyxerr << "mult: " << mult << std::endl;
+ //lyxerr << "mult: " << mult << endl;
for (int i = 0; i < mult; ++i)
diff->addDer(MathArray(dt + 1, st));
}
ar.erase(it + 1, jt);
(*it).reset(diff);
}
- lyxerr << "\nDiffs to: " << ar << "\n";
+ //lyxerr << "\nDiffs to: " << ar << "\n";
}
MathArray ar = dat;
extractStrings(ar);
for (MathArray::const_iterator it = ar.begin(); it != ar.end(); ++it) {
- wi.firstitem = (it == ar.begin());
+ wi.firstitem() = (it == ar.begin());
MathInset const * p = it->nucleus();
if (it + 1 != ar.end()) {
if (MathScriptInset const * q = asScript(it)) {
q->write2(p, wi);
++it;
continue;
- }
+ }
}
p->write(wi);
}
if (it + 1 != ar.end()) {
if (MathScriptInset const * q = asScript(it)) {
q->octavize2(p, os);
- ++it;
+ ++it;
continue;
}
}
if (it + 1 != ar.end()) {
if (MathScriptInset const * q = asScript(it)) {
q->maplize2(p, os);
- ++it;
+ ++it;
continue;
}
}
if (it + 1 != ar.end()) {
if (MathScriptInset const * q = asScript(it)) {
q->mathmlize2(p, os);
- ++it;
+ ++it;
continue;
}
}
os << ETag("mrow");
}
}
-
projects / lyx.git / blobdiff