+/**
+ * \file math_extern.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
// This file contains most of the magic that extracts "context
// information" from the unstructered layout-oriented stuff in an
// MathArray.
#include <config.h>
-#include "math_amsarrayinset.h"
+#include "math_extern.h"
#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 "math_scriptinset.h"
#include "math_stringinset.h"
#include "math_symbolinset.h"
-#include "math_unknowninset.h"
#include "math_parser.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
#include "debug.h"
-#include "support/lyxlib.h"
-#include "support/systemcall.h"
#include "support/filetools.h"
+#include "support/lstrings.h"
#include <algorithm>
-using std::ostream;
-using std::istringstream;
-using std::find_if;
+using lyx::support::cmd_ret;
+using lyx::support::getVectorFromString;
+using lyx::support::LibFileSearch;
+using lyx::support::RunCommand;
+using lyx::support::subst;
+
using std::endl;
+using std::find_if;
+
+using std::istringstream;
+using std::ostream;
+using std::ostringstream;
ostream & operator<<(ostream & os, MathArray const & ar)
// define a function for tests
-typedef bool TestItemFunc(MathInset const *);
+typedef bool TestItemFunc(MathAtom const &);
// define a function for replacing subexpressions
-typedef MathInset * ReplaceArgumentFunc(const MathArray & ar);
+typedef MathAtom ReplaceArgumentFunc(const MathArray & ar);
void extractStrings(MathArray & ar)
{
- //lyxerr << "\nStrings from: " << ar << "\n";
+ //lyxerr << "\nStrings from: " << ar << endl;
for (MathArray::size_type i = 0; i < ar.size(); ++i) {
if (!ar[i]->asCharInset())
continue;
ar[i] = MathAtom(new MathStringInset(s));
ar.erase(i + 1, i + s.size());
}
- //lyxerr << "\nStrings to: " << ar << "\n";
-}
-
-
-MathInset const * singleItem(MathArray const & ar)
-{
- return ar.size() == 1 ? ar.begin()->nucleus() : 0;
+ //lyxerr << "\nStrings to: " << ar << endl;
}
void extractMatrices(MathArray & ar)
{
- //lyxerr << "\nMatrices from: " << ar << "\n";
+ //lyxerr << "\nMatrices from: " << ar << endl;
// first pass for explicitly delimited stuff
- for (MathArray::iterator it = ar.begin(); it != ar.end(); ++it) {
- MathDelimInset * del = (*it)->asDelimInset();
- if (!del)
+ for (MathArray::size_type i = 0; i < ar.size(); ++i) {
+ if (!ar[i]->asDelimInset())
continue;
- MathInset const * arr = singleItem(del->cell(0));
- if (!arr || !arr->asGridInset())
+ MathArray const & arr = ar[i]->asDelimInset()->cell(0);
+ if (arr.size() != 1)
continue;
- *it = MathAtom(new MathMatrixInset(*(arr->asGridInset())));
+ if (!arr.front()->asGridInset())
+ continue;
+ ar[i] = MathAtom(new MathMatrixInset(*(arr.front()->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(*ams));
- }
- //lyxerr << "\nMatrices to: " << ar << "\n";
+ for (MathArray::size_type i = 0; i < ar.size(); ++i)
+ if (ar[i]->asAMSArrayInset())
+ ar[i] = MathAtom(new MathMatrixInset(*(ar[i]->asGridInset())));
+ //lyxerr << "\nMatrices to: " << ar << endl;
}
// convert this inset somehow to a string
-bool extractString(MathInset const * 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 const * p, const string & str)
+bool testString(MathAtom const & at, string const & 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;
// to modify the array.
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(ar[i]))
continue;
// search end of sequence
+ MathArray::iterator it = ar.begin() + i;
MathArray::iterator jt = endNestSearch(it, ar.end(), testOpen, testClose);
if (jt == ar.end())
continue;
- // create a proper inset as replacement
- MathInset * p = replaceArg(MathArray(it + 1, jt));
-
// replace the original stuff by the new inset
+ ar[i] = replaceArg(MathArray(it + 1, jt));
ar.erase(it + 1, jt + 1);
- *it = MathAtom(p);
}
}
void splitScripts(MathArray & ar)
{
- //lyxerr << "\nScripts from: " << ar << "\n";
+ //lyxerr << "\nScripts from: " << ar << endl;
for (MathArray::size_type i = 0; i < ar.size(); ++i) {
- MathArray::iterator it = ar.begin() + i;
-
// is this script inset?
- MathScriptInset * p = (*it)->asScriptInset();
- if (!p)
+ if (!ar[i]->asScriptInset())
continue;
// no problem if we don't have both...
- if (!p->hasUp() || !p->hasDown())
+ if (!ar[i]->asScriptInset()->hasUp())
+ continue;
+ if (!ar[i]->asScriptInset()->hasDown())
continue;
// create extra script inset and move superscript over
- MathScriptInset * q = new MathScriptInset;
- q->ensure(true);
+ MathScriptInset * p = ar[i].nucleus()->asScriptInset();
+ MathScriptInset * q = new MathScriptInset(true);
std::swap(q->up(), p->up());
p->removeScript(true);
++i;
ar.insert(i, MathAtom(q));
}
- //lyxerr << "\nScripts to: " << ar << "\n";
+ //lyxerr << "\nScripts to: " << ar << endl;
}
void extractExps(MathArray & ar)
{
- //lyxerr << "\nExps from: " << ar << "\n";
-
+ //lyxerr << "\nExps from: " << ar << endl;
for (MathArray::size_type i = 0; i + 1 < ar.size(); ++i) {
- MathArray::iterator it = ar.begin() + i;
-
// is this 'e'?
- MathCharInset const * p = (*it)->asCharInset();
- if (!p || p->getChar() != 'e')
+ if (ar[i]->getChar() != 'e')
continue;
// we need an exponent but no subscript
- MathScriptInset * sup = (*(it + 1))->asScriptInset();
+ MathScriptInset const * sup = ar[i + 1]->asScriptInset();
if (!sup || sup->hasDown())
continue;
- // create a proper exp-inset as replacement
- *it = MathAtom(new MathExFuncInset("exp", sup->cell(1)));
- ar.erase(it + 1);
+ // create a proper exp-inset as replacement
+ ar[i] = MathAtom(new MathExFuncInset("exp", sup->cell(1)));
+ ar.erase(i + 1);
}
- //lyxerr << "\nExps to: " << ar << "\n";
+ //lyxerr << "\nExps to: " << ar << endl;
}
//
void extractDets(MathArray & ar)
{
- //lyxerr << "\ndet from: " << ar << "\n";
+ //lyxerr << "\ndet from: " << ar << endl;
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 = MathAtom(new MathExFuncInset("det", del->cell(0)));
}
- //lyxerr << "\ndet to: " << ar << "\n";
+ //lyxerr << "\ndet to: " << ar << endl;
}
void extractNumbers(MathArray & ar)
{
- //lyxerr << "\nNumbers from: " << ar << "\n";
+ //lyxerr << "\nNumbers from: " << ar << endl;
for (MathArray::size_type i = 0; i < ar.size(); ++i) {
if (!ar[i]->asCharInset())
continue;
ar[i] = MathAtom(new MathNumberInset(s));
ar.erase(i + 1, i + s.size());
}
- //lyxerr << "\nNumbers to: " << ar << "\n";
+ //lyxerr << "\nNumbers to: " << ar << endl;
}
// search deliminiters
//
-bool testOpenParan(MathInset const * p)
+bool testOpenParan(MathAtom const & at)
{
- return testString(p, "(");
+ return testString(at, "(");
}
-bool testCloseParan(MathInset const * p)
+bool testCloseParan(MathAtom const & at)
{
- return testString(p, ")");
+ return testString(at, ")");
}
-MathInset * replaceDelims(const MathArray & ar)
+MathAtom replaceDelims(const MathArray & ar)
{
- return new MathDelimInset("(", ")", ar);
+ return MathAtom(new MathDelimInset("(", ")", ar));
}
// replace '('...')' sequences by a real MathDelimInset
void extractDelims(MathArray & ar)
{
- //lyxerr << "\nDelims from: " << ar << "\n";
+ //lyxerr << "\nDelims from: " << ar << endl;
replaceNested(ar, testOpenParan, testCloseParan, replaceDelims);
- //lyxerr << "\nDelims to: " << ar << "\n";
+ //lyxerr << "\nDelims to: " << ar << endl;
}
if (ar.size() < 2)
return;
- //lyxerr << "\nFunctions from: " << ar << "\n";
+ //lyxerr << "\nFunctions from: " << ar << endl;
for (MathArray::size_type i = 0; i + 1 < ar.size(); ++i) {
MathArray::iterator it = ar.begin() + i;
MathArray::iterator jt = it + 1;
} 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
// re-insert exponent
ar.insert(i + 1, exp);
- //lyxerr << "\nFunctions to: " << ar << "\n";
+ //lyxerr << "\nFunctions to: " << ar << endl;
}
}
// search integrals
//
-bool testSymbol(MathInset const * 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 const * p)
+bool testIntSymbol(MathAtom const & at)
{
- return testSymbol(p, "int");
+ return testSymbol(at, "int");
}
-bool testIntegral(MathInset const * p)
+bool testIntegral(MathAtom const & at)
{
return
- testIntSymbol(p) ||
- ( p->asScriptInset()
- && p->asScriptInset()->nuc().size()
- && testIntSymbol(p->asScriptInset()->nuc().back().nucleus()) );
+ testIntSymbol(at) ||
+ ( at->asScriptInset()
+ && at->asScriptInset()->nuc().size()
+ && testIntSymbol(at->asScriptInset()->nuc().back()) );
}
-bool testIntDiff(MathInset const * p)
+bool testIntDiff(MathAtom const & at)
{
- return testString(p, "d");
+ return testString(at, "d");
}
if (ar.size() < 3)
return;
- //lyxerr << "\nIntegrals from: " << ar << "\n";
+ //lyxerr << "\nIntegrals from: " << ar << endl;
for (MathArray::size_type i = 0; i + 1 < ar.size(); ++i) {
MathArray::iterator it = ar.begin() + i;
continue;
// is this a integral name?
- if (!testIntegral(it->nucleus()))
+ if (!testIntegral(*it))
continue;
// core ist part from behind the scripts to the 'd'
MathExIntInset * p = new MathExIntInset("int");
// handle scripts if available
- if (!testIntSymbol(it->nucleus())) {
- p->cell(2) = it->nucleus()->asScriptInset()->down();
- p->cell(3) = it->nucleus()->asScriptInset()->up();
+ if (!testIntSymbol(*it)) {
+ p->cell(2) = (*it)->asScriptInset()->down();
+ p->cell(3) = (*it)->asScriptInset()->up();
}
p->cell(0) = MathArray(it + 1, jt);
ar.erase(it + 1, tt);
*it = MathAtom(p);
}
- //lyxerr << "\nIntegrals to: " << ar << "\n";
+ //lyxerr << "\nIntegrals to: " << ar << endl;
}
bool testEqualSign(MathAtom const & at)
{
- return testString(at.nucleus(), "=");
+ return testString(at, "=");
}
-bool testSumSymbol(MathInset const * p)
+bool testSumSymbol(MathAtom const & p)
{
return testSymbol(p, "sum");
}
-bool testSum(MathInset const * p)
+bool testSum(MathAtom const & at)
{
return
- testSumSymbol(p) ||
- ( p->asScriptInset()
- && p->asScriptInset()->nuc().size()
- && testSumSymbol(p->asScriptInset()->nuc().back().nucleus()) );
+ testSumSymbol(at) ||
+ ( at->asScriptInset()
+ && at->asScriptInset()->nuc().size()
+ && testSumSymbol(at->asScriptInset()->nuc().back()) );
}
if (ar.size() < 2)
return;
- //lyxerr << "\nSums from: " << ar << "\n";
+ //lyxerr << "\nSums from: " << ar << endl;
for (MathArray::size_type i = 0; i + 1 < ar.size(); ++i) {
MathArray::iterator it = ar.begin() + i;
// is this a sum name?
- if (!testSum(it->nucleus()))
+ if (!testSum(ar[i]))
continue;
// create a proper inset as replacement
MathExIntInset * p = new MathExIntInset("sum");
// collect lower bound and summation index
- MathScriptInset * sub = (*it)->asScriptInset();
+ MathScriptInset const * sub = ar[i]->asScriptInset();
if (sub && sub->hasDown()) {
// try to figure out the summation index from the subscript
- MathArray & ar = sub->down();
- MathArray::iterator xt =
+ 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,
ar.erase(it + 1, tt);
*it = MathAtom(p);
}
- //lyxerr << "\nSums to: " << ar << "\n";
+ //lyxerr << "\nSums to: " << ar << endl;
}
// tests for 'd' or '\partial'
bool testDiffItem(MathAtom const & at)
{
- return testString(at.nucleus(), "d");
+ return testString(at, "d");
}
}
-bool testDiffFrac(MathInset const * p)
+bool testDiffFrac(MathAtom const & at)
{
- MathFracInset const * 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)
-{
- 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));
}
void extractDiff(MathArray & ar)
{
- //lyxerr << "\nDiffs from: " << ar << "\n";
+ //lyxerr << "\nDiffs from: " << ar << endl;
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()))
+ if (!testDiffFrac(*it))
continue;
- MathFracInset * f = (*it)->asFracInset();
+ MathFracInset const * f = (*it)->asFracInset();
if (!f) {
- lyxerr << "should not happen\n";
+ lyxerr << "should not happen" << endl;
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;
ar.erase(it + 1, jt);
*it = MathAtom(diff);
}
- //lyxerr << "\nDiffs to: " << ar << "\n";
+ //lyxerr << "\nDiffs to: " << ar << endl;
}
bool testRightArrow(MathAtom const & at)
{
- return
- testSymbol(at.nucleus(), "to") ||
- testSymbol(at.nucleus(), "rightarrow");
+ return testSymbol(at, "to") || testSymbol(at, "rightarrow");
}
if (ar.size() < 3)
return;
- //lyxerr << "\nLimits from: " << ar << "\n";
+ //lyxerr << "\nLimits from: " << ar << endl;
for (MathArray::size_type i = 0; i + 2 < ar.size(); ++i) {
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();
- 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;
// the -> splits the subscript int x and x0
MathArray x = MathArray(s.begin(), st);
MathArray x0 = MathArray(st + 1, s.end());
-
+
// use something behind the script as core
MathArray f;
MathArray::iterator tt = extractArgument(f, it + 2, ar.end());
// create a proper inset as replacement
*it = MathAtom(new MathLimInset(f, x, x0));
}
- //lyxerr << "\nLimits to: " << ar << "\n";
+ //lyxerr << "\nLimits to: " << ar << endl;
}
void extractStructure(MathArray & ar)
{
+ //lyxerr << "\nStructure from: " << ar << endl;
extractIntegrals(ar);
extractSums(ar);
splitScripts(ar);
extractExps(ar);
extractLims(ar);
extractStrings(ar);
+ //lyxerr << "\nStructure to: " << ar << endl;
}
}
-void octavize(MathArray const & dat, OctaveStream & os)
+void octave(MathArray const & dat, OctaveStream & os)
{
MathArray ar = dat;
extractStructure(ar);
for (MathArray::const_iterator it = ar.begin(); it != ar.end(); ++it)
- (*it)->octavize(os);
+ (*it)->octave(os);
}
-void maplize(MathArray const & dat, MapleStream & os)
+void maple(MathArray const & dat, MapleStream & os)
{
MathArray ar = dat;
extractStructure(ar);
for (MathArray::const_iterator it = ar.begin(); it != ar.end(); ++it)
- (*it)->maplize(os);
+ (*it)->maple(os);
}
-void mathematicize(MathArray const & dat, MathematicaStream & os)
+void maxima(MathArray const & dat, MaximaStream & os)
{
MathArray ar = dat;
extractStructure(ar);
for (MathArray::const_iterator it = ar.begin(); it != ar.end(); ++it)
- (*it)->mathematicize(os);
+ (*it)->maxima(os);
+}
+
+
+void mathematica(MathArray const & dat, MathematicaStream & os)
+{
+ MathArray ar = dat;
+ extractStructure(ar);
+ for (MathArray::const_iterator it = ar.begin(); it != ar.end(); ++it)
+ (*it)->mathematica(os);
}
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)
string captureOutput(string const & cmd, string const & data)
{
- string outfile = lyx::tempName(string(), "mathextern");
- string full = "echo '" + data + "' | (" + cmd + ") > " + outfile;
- lyxerr << "calling: " << full << endl;
- Systemcall dummy;
- dummy.startscript(Systemcall::Wait, full);
- string out = GetFileContents(outfile);
- lyx::unlink(outfile);
- lyxerr << "result: '" << out << "'" << endl;
- return out;
+ string command = "echo '" + data + "' | " + cmd;
+ lyxerr << "calling: " << command << endl;
+ cmd_ret const ret = RunCommand(command);
+ return ret.second;
+ }
+
+ string::size_type get_matching_brace(string const & str, string::size_type i)
+ {
+ int count = 1;
+ string::size_type n = str.size();
+ while (i < n) {
+ i = str.find_first_of("{}", i+1);
+ if (i == string::npos) return i;
+ if (str[i] == '{')
+ ++count;
+ else
+ --count;
+ if (count == 0)
+ return i;
+ }
+ return string::npos;
+ }
+
+ string::size_type get_matching_brace_back(string const & str, string::size_type i)
+ {
+ int count = 1;
+ while (i > 0) {
+ i = str.find_last_of("{}", i-1);
+ if (i == string::npos) return i;
+ if (str[i] == '}')
+ ++count;
+ else
+ --count;
+ if (count == 0)
+ return i;
+ }
+ return string::npos;
+ }
+
+ MathArray pipeThroughMaxima(string const &, MathArray const & ar)
+ {
+ ostringstream os;
+ MaximaStream ms(os);
+ ms << ar;
+ string expr = os.str();
+ string const header = "SIMPSUM:true;";
+
+ string out;
+ for (int i = 0; i < 100; ++i) { // at most 100 attempts
+ // try to fix missing '*' the hard way
+ //
+ // > echo "2x;" | maxima
+ // ...
+ // (C1) Incorrect syntax: x is not an infix operator
+ // 2x;
+ // ^
+ //
+ lyxerr << "checking expr: '" << expr << "'" << endl;
+ string full = header + "tex(" + expr + ");";
+ out = captureOutput("maxima", full);
+
+ // leave loop if expression syntax is probably ok
+ if (out.find("Incorrect syntax") == string::npos)
+ break;
+
+ // search line with "Incorrect syntax"
+ istringstream is(out.c_str());
+ string line;
+ while (is) {
+ getline(is, line);
+ if (line.find("Incorrect syntax") != string::npos)
+ break;
+ }
+
+ // 2nd next line is the one with caret
+ getline(is, line);
+ getline(is, line);
+ string::size_type pos = line.find('^');
+ lyxerr << "found caret at pos: '" << pos << "'" << endl;
+ if (pos == string::npos || pos < 4)
+ break; // caret position not found
+ pos -= 4; // skip the "tex(" part
+ if (expr[pos] == '*')
+ break; // two '*' in a row are definitely bad
+ expr.insert(pos, "*");
+ }
+
+ std::vector<string> tmp = getVectorFromString(out, "$$");
+ if (tmp.size() < 2)
+ return MathArray();
+
+ out = subst(tmp[1],"\\>", "");
+ lyxerr << "out: '" << out << "'" << endl;
+
+ // Ugly code that tries to make the result prettier
+
+ string::size_type i = out.find("\\mathchoice");
+ while (i != string::npos) {
+ string::size_type j = get_matching_brace(out, i + 12);
+ string::size_type k = get_matching_brace(out, j + 1);
+ k = get_matching_brace(out, k + 1);
+ k = get_matching_brace(out, k + 1);
+ string mid = out.substr(i + 13,j - i - 13);
+ if (mid.find("\\over") != string::npos)
+ mid = '{' + mid + '}';
+ out = out.substr(0,i)
+ + mid
+ + out.substr(k + 1);
+ //lyxerr << "out: " << out << endl;
+ i = out.find("\\mathchoice", i);
+ break;
+ }
+
+ i = out.find("\\over");
+ while (i != string::npos) {
+ string::size_type j = get_matching_brace_back(out, i - 1);
+ if (j == string::npos || j == 0) break;
+ string::size_type k = get_matching_brace(out, i + 5);
+ if (k == string::npos || k + 1 == out.size()) break;
+ out = out.substr(0,j - 1)
+ + "\\frac"
+ + out.substr(j,i - j)
+ + out.substr(i + 5,k - i - 4)
+ + out.substr(k + 2);
+ //lyxerr << "out: " << out << endl;
+ i = out.find("\\over", i + 4);
+ }
+ MathArray res;
+ mathed_parse_cell(res, out);
+ return res;
}
ostringstream os;
MapleStream ms(os);
ms << ar;
- string expr = os.str().c_str();
- lyxerr << "ar: '" << ar << "'\n";
- lyxerr << "ms: '" << os.str() << "'\n";
+ string expr = os.str();
+ lyxerr << "ar: '" << ar << "'\n"
+ << "ms: '" << os.str() << "'" << endl;
for (int i = 0; i < 100; ++i) { // at most 100 attempts
// try to fix missing '*' the hard way by using mint
// ^ syntax error -
// Probably missing an operator such as * p
//
- lyxerr << "checking expr: '" << expr << "'\n";
- string out = captureOutput("mint -i 1 -S -s -q -q", expr + ";");
+ lyxerr << "checking expr: '" << expr << "'" << endl;
+ string out = captureOutput("mint -i 1 -S -s -q -q", expr + ';');
if (out.empty())
break; // expression syntax is ok
istringstream is(out.c_str());
pos -= 15; // skip the "on line ..." part
if (expr[pos] == '*' || (pos > 0 && expr[pos - 1] == '*'))
break; // two '*' in a row are definitely bad
- expr.insert(pos, "*");
+ expr.insert(pos, 1, '*');
}
string full = "latex(" + extra + '(' + expr + "));";
ostringstream os;
OctaveStream vs(os);
vs << ar;
- string expr = os.str().c_str();
+ string expr = os.str();
string out;
- lyxerr << "pipe: ar: '" << ar << "'\n";
- lyxerr << "pipe: expr: '" << expr << "'\n";
+ lyxerr << "pipe: ar: '" << ar << "'\n"
+ << "pipe: expr: '" << expr << "'" << endl;
for (int i = 0; i < 100; ++i) { // at most 100 attempts
//
// >>> ([[1 2 3 ];[2 3 1 ];[3 1 2 ]])([[1 2 3 ];[2 3 1 ];[3 1 2 ]])
// ^
//
- lyxerr << "checking expr: '" << expr << "'\n";
+ lyxerr << "checking expr: '" << expr << "'" << endl;
out = captureOutput("octave -q 2>&1", expr);
- lyxerr << "checking out: '" << out << "'\n";
+ lyxerr << "checking out: '" << out << "'" << endl;
// leave loop if expression syntax is probably ok
if (out.find("parse error:") == string::npos)
string line;
while (is) {
getline(is, line);
- lyxerr << "skipping line: '" << line << "'\n";
+ lyxerr << "skipping line: '" << line << "'" << endl;
if (line.find(">>> ") != string::npos)
break;
}
// found line with error, next line is the one with caret
getline(is, line);
string::size_type pos = line.find('^');
- lyxerr << "caret line: '" << line << "'\n";
- lyxerr << "found caret at pos: '" << pos << "'\n";
+ lyxerr << "caret line: '" << line << "'" << endl;
+ lyxerr << "found caret at pos: '" << pos << "'" << endl;
if (pos == string::npos || pos < 4)
break; // caret position not found
pos -= 4; // skip the ">>> " part
if (expr[pos] == '*')
break; // two '*' in a row are definitely bad
- expr.insert(pos, "*");
+ expr.insert(pos, 1, '*');
}
if (out.size() < 6)
// parse output as matrix or single number
MathAtom at(new MathArrayInset("array", out));
- MathArrayInset const * mat = at.nucleus()->asArrayInset();
+ MathArrayInset const * mat = at->asArrayInset();
MathArray res;
if (mat->ncols() == 1 && mat->nrows() == 1)
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;
}
if (lang == "octave")
return pipeThroughOctave(extra, ar);
+ if (lang == "maxima")
+ return pipeThroughMaxima(extra, ar);
+
if (lang == "maple")
return pipeThroughMaple(extra, ar);
// create normalized expression
ostringstream os;
NormalStream ns(os);
- os << "[" << extra << ' ';
+ os << '[' << extra << ' ';
ns << ar;
- os << "]";
- string data = os.str().c_str();
+ os << ']';
+ string data = os.str();
// search external script
string file = LibFileSearch("mathed", "extern_" + lang);
if (file.empty()) {
- lyxerr << "converter to '" << lang << "' not found\n";
+ lyxerr << "converter to '" << lang << "' not found" << endl;
return MathArray();
}
projects / lyx.git / blobdiff