#include "math_arrayinset.h"
#include "math_charinset.h"
#include "math_deliminset.h"
+#include "math_data.h"
#include "math_diffinset.h"
#include "math_exfuncinset.h"
#include "math_exintinset.h"
#include <algorithm>
-using namespace lyx::support;
+using lyx::support::cmd_ret;
+using lyx::support::getVectorFromString;
+using lyx::support::LibFileSearch;
+using lyx::support::RunCommand;
+using lyx::support::subst;
-using std::ostream;
-using std::istringstream;
-using std::find_if;
+using std::string;
using std::endl;
+using std::find_if;
+using std::auto_ptr;
+using std::istringstream;
+using std::ostream;
+using std::ostringstream;
+using std::swap;
+using std::vector;
ostream & operator<<(ostream & os, MathArray const & ar)
void extractStrings(MathArray & ar)
{
//lyxerr << "\nStrings from: " << ar << endl;
- for (MathArray::size_type i = 0; i < ar.size(); ++i) {
+ for (size_t i = 0; i < ar.size(); ++i) {
if (!ar[i]->asCharInset())
continue;
string s = charSequence(ar.begin() + i, ar.end());
{
//lyxerr << "\nMatrices from: " << ar << endl;
// first pass for explicitly delimited stuff
- for (MathArray::size_type i = 0; i < ar.size(); ++i) {
+ for (size_t i = 0; i < ar.size(); ++i) {
if (!ar[i]->asDelimInset())
continue;
MathArray const & arr = ar[i]->asDelimInset()->cell(0);
}
// second pass for AMS "pmatrix" etc
- for (MathArray::size_type i = 0; i < ar.size(); ++i)
+ for (size_t i = 0; i < ar.size(); ++i)
if (ar[i]->asAMSArrayInset())
ar[i] = MathAtom(new MathMatrixInset(*(ar[i]->asGridInset())));
//lyxerr << "\nMatrices to: " << ar << endl;
{
// use indices rather than iterators for the loop because we are going
// to modify the array.
- for (MathArray::size_type i = 0; i < ar.size(); ++i) {
+ for (size_t i = 0; i < ar.size(); ++i) {
// check whether this is the begin of the sequence
if (!testOpen(ar[i]))
continue;
void splitScripts(MathArray & ar)
{
//lyxerr << "\nScripts from: " << ar << endl;
- for (MathArray::size_type i = 0; i < ar.size(); ++i) {
+ for (size_t i = 0; i < ar.size(); ++i) {
// is this script inset?
if (!ar[i]->asScriptInset())
continue;
// create extra script inset and move superscript over
MathScriptInset * p = ar[i].nucleus()->asScriptInset();
- MathScriptInset * q = new MathScriptInset(true);
- std::swap(q->up(), p->up());
+ auto_ptr<MathScriptInset> q(new MathScriptInset(true));
+ swap(q->up(), p->up());
p->removeScript(true);
// insert new inset behind
++i;
- ar.insert(i, MathAtom(q));
+ ar.insert(i, MathAtom(q.release()));
}
//lyxerr << "\nScripts to: " << ar << endl;
}
void extractExps(MathArray & ar)
{
//lyxerr << "\nExps from: " << ar << endl;
- for (MathArray::size_type i = 0; i + 1 < ar.size(); ++i) {
+ for (size_t i = 0; i + 1 < ar.size(); ++i) {
// is this 'e'?
if (ar[i]->getChar() != 'e')
continue;
void extractNumbers(MathArray & ar)
{
//lyxerr << "\nNumbers from: " << ar << endl;
- for (MathArray::size_type i = 0; i < ar.size(); ++i) {
+ for (size_t i = 0; i < ar.size(); ++i) {
if (!ar[i]->asCharInset())
continue;
if (!isDigitOrSimilar(ar[i]->asCharInset()->getChar()))
return;
//lyxerr << "\nFunctions from: " << ar << endl;
- for (MathArray::size_type i = 0; i + 1 < ar.size(); ++i) {
+ for (size_t i = 0; i + 1 < ar.size(); ++i) {
MathArray::iterator it = ar.begin() + i;
MathArray::iterator jt = it + 1;
extractScript(exp, jt, ar.end());
// create a proper inset as replacement
- MathExFuncInset * p = new MathExFuncInset(name);
+ auto_ptr<MathExFuncInset> p(new MathExFuncInset(name));
// jt points to the "argument". Get hold of this.
MathArray::iterator st = extractArgument(p->cell(0), jt, ar.end());
// replace the function name by a real function inset
- *it = MathAtom(p);
+ *it = MathAtom(p.release());
// remove the source of the argument from the array
ar.erase(it + 1, st);
return;
//lyxerr << "\nIntegrals from: " << ar << endl;
- for (MathArray::size_type i = 0; i + 1 < ar.size(); ++i) {
+ for (size_t i = 0; i + 1 < ar.size(); ++i) {
MathArray::iterator it = ar.begin() + i;
// search 'd'
continue;
// core ist part from behind the scripts to the 'd'
- MathExIntInset * p = new MathExIntInset("int");
+ auto_ptr<MathExIntInset> p(new MathExIntInset("int"));
// handle scripts if available
if (!testIntSymbol(*it)) {
// remove used parts
ar.erase(it + 1, tt);
- *it = MathAtom(p);
+ *it = MathAtom(p.release());
}
//lyxerr << "\nIntegrals to: " << ar << endl;
}
return;
//lyxerr << "\nSums from: " << ar << endl;
- for (MathArray::size_type i = 0; i + 1 < ar.size(); ++i) {
+ for (size_t i = 0; i + 1 < ar.size(); ++i) {
MathArray::iterator it = ar.begin() + i;
// is this a sum name?
continue;
// create a proper inset as replacement
- MathExIntInset * p = new MathExIntInset("sum");
+ auto_ptr<MathExIntInset> p(new MathExIntInset("sum"));
// collect lower bound and summation index
MathScriptInset const * sub = ar[i]->asScriptInset();
// cleanup
ar.erase(it + 1, tt);
- *it = MathAtom(p);
+ *it = MathAtom(p.release());
}
//lyxerr << "\nSums to: " << ar << endl;
}
void extractDiff(MathArray & ar)
{
//lyxerr << "\nDiffs from: " << ar << endl;
- for (MathArray::size_type i = 0; i < ar.size(); ++i) {
+ for (size_t i = 0; i < ar.size(); ++i) {
MathArray::iterator it = ar.begin() + i;
// is this a "differential fraction"?
}
// create a proper diff inset
- MathDiffInset * diff = new MathDiffInset;
+ auto_ptr<MathDiffInset> diff(new MathDiffInset);
// collect function, let jt point behind last used item
MathArray::iterator jt = it + 1;
// cleanup
ar.erase(it + 1, jt);
- *it = MathAtom(diff);
+ *it = MathAtom(diff.release());
}
//lyxerr << "\nDiffs to: " << ar << endl;
}
return;
//lyxerr << "\nLimits from: " << ar << endl;
- for (MathArray::size_type i = 0; i + 2 < ar.size(); ++i) {
+ for (size_t i = 0; i + 2 < ar.size(); ++i) {
MathArray::iterator it = ar.begin() + i;
// is this a limit function?
ostringstream os;
MaximaStream ms(os);
ms << ar;
- string expr = STRCONV(os.str());
+ string expr = os.str();
string const header = "SIMPSUM:true;";
string out;
expr.insert(pos, "*");
}
- std::vector<string> tmp = getVectorFromString(out, "$$");
+ vector<string> tmp = getVectorFromString(out, "$$");
if (tmp.size() < 2)
return MathArray();
ostringstream os;
MapleStream ms(os);
ms << ar;
- string expr = STRCONV(os.str());
+ string expr = os.str();
lyxerr << "ar: '" << ar << "'\n"
<< "ms: '" << os.str() << "'" << endl;
ostringstream os;
OctaveStream vs(os);
vs << ar;
- string expr = STRCONV(os.str());
+ string expr = os.str();
string out;
lyxerr << "pipe: ar: '" << ar << "'\n"
os << '[' << extra << ' ';
ns << ar;
os << ']';
- string data = STRCONV(os.str());
+ string data = os.str();
// search external script
string file = LibFileSearch("mathed", "extern_" + lang);