* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
- * \author André Pönitz
+ * \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.
+// information" from the unstructered layout-oriented stuff in
+// MathData.
#include <config.h>
#include "MathExtern.h"
+
#include "InsetMathArray.h"
#include "InsetMathChar.h"
#include "InsetMathDelim.h"
-#include "MathArray.h"
#include "InsetMathDiff.h"
#include "InsetMathExFunc.h"
#include "InsetMathExInt.h"
#include "InsetMathFrac.h"
#include "InsetMathLim.h"
#include "InsetMathMatrix.h"
-#include "MathStream.h"
#include "InsetMathNumber.h"
#include "InsetMathScript.h"
#include "InsetMathString.h"
#include "InsetMathSymbol.h"
+#include "MathData.h"
#include "MathParser.h"
-#include "debug.h"
+#include "MathStream.h"
+
+#include "support/debug.h"
+#include "support/docstream.h"
+#include "support/FileName.h"
#include "support/filetools.h"
#include "support/lstrings.h"
-#include "support/lyxlib.h"
-#include "frontends/controllers/ControlMath.h"
#include <algorithm>
#include <sstream>
#include <fstream>
+#include <memory>
+using namespace std;
+using namespace lyx::support;
namespace lyx {
-using support::cmd_ret;
-using support::getVectorFromString;
-using support::libFileSearch;
-using support::runCommand;
-using support::FileName;
-using support::quoteName;
-using support::tempName;
-using support::unlink;
-using support::subst;
-
-using frontend::function_names;
-
-using std::endl;
-using std::find_if;
-using std::auto_ptr;
-using std::istringstream;
-using std::ostream;
-using std::swap;
-using std::string;
-using std::vector;
+static char const * function_names[] = {
+ "arccos", "arcsin", "arctan", "arg", "bmod",
+ "cos", "cosh", "cot", "coth", "csc", "deg",
+ "det", "dim", "exp", "gcd", "hom", "inf", "ker",
+ "lg", "lim", "liminf", "limsup", "ln", "log",
+ "max", "min", "sec", "sin", "sinh", "sup",
+ "tan", "tanh", "Pr", 0
+};
static size_t const npos = lyx::docstring::npos;
typedef bool TestItemFunc(MathAtom const &);
// define a function for replacing subexpressions
-typedef MathAtom ReplaceArgumentFunc(const MathArray & ar);
+typedef MathAtom ReplaceArgumentFunc(const MathData & ar);
// try to extract a super/subscript
// modify iterator position to point behind the thing
-bool extractScript(MathArray & ar,
- MathArray::iterator & pos, MathArray::iterator last, bool superscript)
+bool extractScript(MathData & ar,
+ MathData::iterator & pos, MathData::iterator last, bool superscript)
{
// nothing to get here
if (pos == last)
// try to extract an "argument" to some function.
// returns position behind the argument
-MathArray::iterator extractArgument(MathArray & ar,
- MathArray::iterator pos, MathArray::iterator last, bool function = false)
+MathData::iterator extractArgument(MathData & ar,
+ MathData::iterator pos, MathData::iterator last, bool function = false)
{
// nothing to get here
if (pos == last)
if ((*pos)->asDelimInset()) {
// leave out delimiters if this is a function argument
if (function) {
- MathArray const & arg = (*pos)->asDelimInset()->cell(0);
- MathArray::const_iterator cur = arg.begin();
- MathArray::const_iterator end = arg.end();
+ MathData const & arg = (*pos)->asDelimInset()->cell(0);
+ MathData::const_iterator cur = arg.begin();
+ MathData::const_iterator end = arg.end();
while (cur != end)
ar.push_back(*cur++);
} else
// but it might be more than that.
// FIXME: not implemented
- //for (MathArray::iterator it = pos + 1; it != last; ++it) {
+ //for (MathData::iterator it = pos + 1; it != last; ++it) {
// // always take the first thing, no matter
// if (it == pos) {
// ar.push_back(*it);
// returns sequence of char with same code starting at it up to end
// it might be less, though...
docstring charSequence
- (MathArray::const_iterator it, MathArray::const_iterator end)
+ (MathData::const_iterator it, MathData::const_iterator end)
{
docstring s;
for (; it != end && (*it)->asCharInset(); ++it)
}
-void extractStrings(MathArray & ar)
+void extractStrings(MathData & ar)
{
//lyxerr << "\nStrings from: " << ar << endl;
for (size_t i = 0; i < ar.size(); ++i) {
}
-void extractMatrices(MathArray & ar)
+void extractMatrices(MathData & ar)
{
//lyxerr << "\nMatrices from: " << ar << endl;
// first pass for explicitly delimited stuff
for (size_t i = 0; i < ar.size(); ++i) {
if (!ar[i]->asDelimInset())
continue;
- MathArray const & arr = ar[i]->asDelimInset()->cell(0);
+ MathData const & arr = ar[i]->asDelimInset()->cell(0);
if (arr.size() != 1)
continue;
if (!arr.front()->asGridInset())
// is this a known function?
bool isKnownFunction(docstring const & str)
{
- for (int i = 0; *function_names[i]; ++i) {
+ for (int i = 0; function_names[i]; ++i) {
if (str == function_names[i])
return true;
}
}
if (at->asFontInset() && at->name() == "mathrm") {
// assume it is well known...
- MathArray const & ar = at->asFontInset()->cell(0);
+ MathData const & ar = at->asFontInset()->cell(0);
str = charSequence(ar.begin(), ar.end());
return ar.size() == str.size();
}
// convert this inset somehow to a number
-bool extractNumber(MathArray const & ar, int & i)
+bool extractNumber(MathData const & ar, int & i)
{
idocstringstream is(charSequence(ar.begin(), ar.end()));
is >> i;
}
-bool extractNumber(MathArray const & ar, double & d)
+bool extractNumber(MathData const & ar, double & d)
{
idocstringstream is(charSequence(ar.begin(), ar.end()));
is >> d;
}
// search end of nested sequence
-MathArray::iterator endNestSearch(
- MathArray::iterator it,
- MathArray::iterator last,
+MathData::iterator endNestSearch(
+ MathData::iterator it,
+ MathData::iterator last,
TestItemFunc testOpen,
TestItemFunc testClose
)
// replace nested sequences by a real Insets
void replaceNested(
- MathArray & ar,
+ MathData & ar,
TestItemFunc testOpen,
TestItemFunc testClose,
ReplaceArgumentFunc replaceArg
continue;
// search end of sequence
- MathArray::iterator it = ar.begin() + i;
- MathArray::iterator jt = endNestSearch(it, ar.end(), testOpen, testClose);
+ MathData::iterator it = ar.begin() + i;
+ MathData::iterator jt = endNestSearch(it, ar.end(), testOpen, testClose);
if (jt == ar.end())
continue;
// replace the original stuff by the new inset
- ar[i] = replaceArg(MathArray(it + 1, jt));
+ ar[i] = replaceArg(MathData(it + 1, jt));
ar.erase(it + 1, jt + 1);
}
}
// front of super...
//
-void splitScripts(MathArray & ar)
+void splitScripts(MathData & ar)
{
//lyxerr << "\nScripts from: " << ar << endl;
for (size_t i = 0; i < ar.size(); ++i) {
// if we don't have a subscript, get rid of the ScriptInset
if (!script->hasDown()) {
- MathArray arg(p->nuc());
- MathArray::const_iterator it = arg.begin();
- MathArray::const_iterator et = arg.end();
+ MathData arg(p->nuc());
+ MathData::const_iterator it = arg.begin();
+ MathData::const_iterator et = arg.end();
ar.erase(i);
while (it != et)
ar.insert(i++, *it++);
// extract exp(...)
//
-void extractExps(MathArray & ar)
+void extractExps(MathData & ar)
{
//lyxerr << "\nExps from: " << ar << endl;
for (size_t i = 0; i + 1 < ar.size(); ++i) {
//
// extract det(...) from |matrix|
//
-void extractDets(MathArray & ar)
+void extractDets(MathData & ar)
{
//lyxerr << "\ndet from: " << ar << endl;
- for (MathArray::iterator it = ar.begin(); it != ar.end(); ++it) {
+ for (MathData::iterator it = ar.begin(); it != ar.end(); ++it) {
InsetMathDelim const * del = (*it)->asDelimInset();
if (!del)
continue;
// returns sequence of digits
docstring digitSequence
- (MathArray::const_iterator it, MathArray::const_iterator end)
+ (MathData::const_iterator it, MathData::const_iterator end)
{
docstring s;
for (; it != end && (*it)->asCharInset(); ++it) {
}
-void extractNumbers(MathArray & ar)
+void extractNumbers(MathData & ar)
{
//lyxerr << "\nNumbers from: " << ar << endl;
for (size_t i = 0; i < ar.size(); ++i) {
}
-MathAtom replaceParenDelims(const MathArray & ar)
+MathAtom replaceParenDelims(const MathData & ar)
{
return MathAtom(new InsetMathDelim(from_ascii("("), from_ascii(")"), ar));
}
}
-MathAtom replaceBracketDelims(const MathArray & ar)
+MathAtom replaceBracketDelims(const MathData & ar)
{
return MathAtom(new InsetMathDelim(from_ascii("["), from_ascii("]"), ar));
}
// replace '('...')' and '['...']' sequences by a real InsetMathDelim
-void extractDelims(MathArray & ar)
+void extractDelims(MathData & ar)
{
//lyxerr << "\nDelims from: " << ar << endl;
replaceNested(ar, testOpenParen, testCloseParen, replaceParenDelims);
// replace 'f' '(...)' and 'f' '^n' '(...)' sequences by a real InsetMathExFunc
// assume 'extractDelims' ran before
-void extractFunctions(MathArray & ar)
+void extractFunctions(MathData & ar)
{
// we need at least two items...
if (ar.size() < 2)
//lyxerr << "\nFunctions from: " << ar << endl;
for (size_t i = 0; i + 1 < ar.size(); ++i) {
- MathArray::iterator it = ar.begin() + i;
- MathArray::iterator jt = it + 1;
+ MathData::iterator it = ar.begin() + i;
+ MathData::iterator jt = it + 1;
docstring name;
// is it a function?
// do we have an exponent like in
// 'sin' '^2' 'x' -> 'sin(x)' '^2'
- MathArray exp;
+ MathData exp;
extractScript(exp, jt, ar.end(), true);
// create a proper inset as replacement
auto_ptr<InsetMathExFunc> p(new InsetMathExFunc(name));
// jt points to the "argument". Get hold of this.
- MathArray::iterator st = extractArgument(p->cell(0), jt, ar.end(), true);
+ MathData::iterator st = extractArgument(p->cell(0), jt, ar.end(), true);
// replace the function name by a real function inset
*it = MathAtom(p.release());
// replace '\int' ['_^'] x 'd''x'(...)' sequences by a real InsetMathExInt
// assume 'extractDelims' ran before
-void extractIntegrals(MathArray & ar)
+void extractIntegrals(MathData & ar)
{
// we need at least three items...
if (ar.size() < 3)
//lyxerr << "\nIntegrals from: " << ar << endl;
for (size_t i = 0; i + 1 < ar.size(); ++i) {
- MathArray::iterator it = ar.begin() + i;
+ MathData::iterator it = ar.begin() + i;
// search 'd'
- MathArray::iterator jt =
+ MathData::iterator jt =
endNestSearch(it, ar.end(), testIntegral, testIntDiff);
// something sensible found?
p->cell(2) = (*it)->asScriptInset()->down();
p->cell(3) = (*it)->asScriptInset()->up();
}
- p->cell(0) = MathArray(it + 1, jt);
+ p->cell(0) = MathData(it + 1, jt);
// use the "thing" behind the 'd' as differential
- MathArray::iterator tt = extractArgument(p->cell(1), jt + 1, ar.end());
+ MathData::iterator tt = extractArgument(p->cell(1), jt + 1, ar.end());
// remove used parts
ar.erase(it + 1, tt);
// try to extract a "term", i.e., something delimited by '+' or '-'.
// returns position behind the term
-MathArray::iterator extractTerm(MathArray & ar,
- MathArray::iterator pos, MathArray::iterator last)
+MathData::iterator extractTerm(MathData & ar,
+ MathData::iterator pos, MathData::iterator last)
{
while (pos != last && !testTermDelimiter(*pos)) {
ar.push_back(*pos);
// replace '\sum' ['_^'] f(x) sequences by a real InsetMathExInt
// assume 'extractDelims' ran before
-void extractSums(MathArray & ar)
+void extractSums(MathData & ar)
{
// we need at least two items...
if (ar.size() < 2)
//lyxerr << "\nSums from: " << ar << endl;
for (size_t i = 0; i + 1 < ar.size(); ++i) {
- MathArray::iterator it = ar.begin() + i;
+ MathData::iterator it = ar.begin() + i;
// is this a sum name?
if (!testSum(ar[i]))
InsetMathScript const * sub = ar[i]->asScriptInset();
if (sub && sub->hasDown()) {
// try to figure out the summation index from the subscript
- MathArray const & ar = sub->down();
- MathArray::const_iterator xt =
+ MathData const & ar = sub->down();
+ MathData::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());
+ p->cell(1) = MathData(ar.begin(), xt);
+ p->cell(2) = MathData(xt + 1, ar.end());
} else {
// use everything as summation index, don't use scripts.
p->cell(1) = ar;
p->cell(3) = sub->up();
// use something behind the script as core
- MathArray::iterator tt = extractTerm(p->cell(0), it + 1, ar.end());
+ MathData::iterator tt = extractTerm(p->cell(0), it + 1, ar.end());
// cleanup
ar.erase(it + 1, tt);
}
-bool testDiffArray(MathArray const & ar)
+bool testDiffArray(MathData const & ar)
{
return ar.size() && testDiffItem(ar.front());
}
}
-void extractDiff(MathArray & ar)
+void extractDiff(MathData & ar)
{
//lyxerr << "\nDiffs from: " << ar << endl;
for (size_t i = 0; i < ar.size(); ++i) {
- MathArray::iterator it = ar.begin() + i;
+ MathData::iterator it = ar.begin() + i;
// is this a "differential fraction"?
if (!testDiffFrac(*it))
auto_ptr<InsetMathDiff> diff(new InsetMathDiff);
// collect function, let jt point behind last used item
- MathArray::iterator jt = it + 1;
+ MathData::iterator jt = it + 1;
//int n = 1;
- MathArray numer(f->cell(0));
+ MathData numer(f->cell(0));
splitScripts(numer);
if (numer.size() > 1 && numer[1]->asScriptInset()) {
// this is something like d^n f(x) / d... or d^n / d...
// FIXME
//n = 1;
if (numer.size() > 2)
- diff->cell(0) = MathArray(numer.begin() + 2, numer.end());
+ diff->cell(0) = MathData(numer.begin() + 2, numer.end());
else
jt = extractTerm(diff->cell(0), jt, ar.end());
} else {
// simply d f(x) / d... or d/d...
if (numer.size() > 1)
- diff->cell(0) = MathArray(numer.begin() + 1, numer.end());
+ diff->cell(0) = MathData(numer.begin() + 1, numer.end());
else
jt = extractTerm(diff->cell(0), jt, ar.end());
}
// collect denominator parts
- MathArray denom(f->cell(1));
+ MathData denom(f->cell(1));
splitScripts(denom);
- for (MathArray::iterator dt = denom.begin(); dt != denom.end();) {
+ for (MathData::iterator dt = denom.begin(); dt != denom.end();) {
// find the next 'd'
- MathArray::iterator et
+ MathData::iterator et
= find_if(dt + 1, denom.end(), &testDiffItem);
// point before this
- MathArray::iterator st = et - 1;
+ MathData::iterator st = et - 1;
InsetMathScript const * script = (*st)->asScriptInset();
if (script && script->hasUp()) {
// things like d.../dx^n
if (extractNumber(script->up(), mult)) {
//lyxerr << "mult: " << mult << endl;
for (int i = 0; i < mult; ++i)
- diff->addDer(MathArray(dt + 1, st));
+ diff->addDer(MathData(dt + 1, st));
}
} else {
// just d.../dx
- diff->addDer(MathArray(dt + 1, et));
+ diff->addDer(MathData(dt + 1, et));
}
dt = et;
}
// replace '\lim_{x->x0} f(x)' sequences by a real InsetMathLim
// assume 'extractDelims' ran before
-void extractLims(MathArray & ar)
+void extractLims(MathData & ar)
{
//lyxerr << "\nLimits from: " << ar << endl;
for (size_t i = 0; i < ar.size(); ++i) {
- MathArray::iterator it = ar.begin() + i;
+ MathData::iterator it = ar.begin() + i;
// must be a script inset with a subscript (without superscript)
InsetMathScript const * sub = (*it)->asScriptInset();
continue;
// subscript must contain a -> symbol
- MathArray const & s = sub->down();
- MathArray::const_iterator st = find_if(s.begin(), s.end(), &testRightArrow);
+ MathData const & s = sub->down();
+ MathData::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());
+ MathData x = MathData(s.begin(), st);
+ MathData x0 = MathData(st + 1, s.end());
// use something behind the script as core
- MathArray f;
- MathArray::iterator tt = extractTerm(f, it + 1, ar.end());
+ MathData f;
+ MathData::iterator tt = extractTerm(f, it + 1, ar.end());
// cleanup
ar.erase(it + 1, tt);
// combine searches
//
-void extractStructure(MathArray & ar)
+void extractStructure(MathData & ar)
{
//lyxerr << "\nStructure from: " << ar << endl;
splitScripts(ar);
}
-void write(MathArray const & dat, WriteStream & wi)
+void write(MathData const & dat, WriteStream & wi)
{
- MathArray ar = dat;
+ MathData ar = dat;
extractStrings(ar);
wi.firstitem() = true;
- for (MathArray::const_iterator it = ar.begin(); it != ar.end(); ++it) {
+ for (MathData::const_iterator it = ar.begin(); it != ar.end(); ++it) {
(*it)->write(wi);
wi.firstitem() = false;
}
}
-void normalize(MathArray const & ar, NormalStream & os)
+void normalize(MathData const & ar, NormalStream & os)
{
- for (MathArray::const_iterator it = ar.begin(); it != ar.end(); ++it)
+ for (MathData::const_iterator it = ar.begin(); it != ar.end(); ++it)
(*it)->normalize(os);
}
-void octave(MathArray const & dat, OctaveStream & os)
+void octave(MathData const & dat, OctaveStream & os)
{
- MathArray ar = dat;
+ MathData ar = dat;
extractStructure(ar);
- for (MathArray::const_iterator it = ar.begin(); it != ar.end(); ++it)
+ for (MathData::const_iterator it = ar.begin(); it != ar.end(); ++it)
(*it)->octave(os);
}
-void maple(MathArray const & dat, MapleStream & os)
+void maple(MathData const & dat, MapleStream & os)
{
- MathArray ar = dat;
+ MathData ar = dat;
extractStructure(ar);
- for (MathArray::const_iterator it = ar.begin(); it != ar.end(); ++it)
+ for (MathData::const_iterator it = ar.begin(); it != ar.end(); ++it)
(*it)->maple(os);
}
-void maxima(MathArray const & dat, MaximaStream & os)
+void maxima(MathData const & dat, MaximaStream & os)
{
- MathArray ar = dat;
+ MathData ar = dat;
extractStructure(ar);
- for (MathArray::const_iterator it = ar.begin(); it != ar.end(); ++it)
+ for (MathData::const_iterator it = ar.begin(); it != ar.end(); ++it)
(*it)->maxima(os);
}
-void mathematica(MathArray const & dat, MathematicaStream & os)
+void mathematica(MathData const & dat, MathematicaStream & os)
{
- MathArray ar = dat;
+ MathData ar = dat;
extractStructure(ar);
- for (MathArray::const_iterator it = ar.begin(); it != ar.end(); ++it)
+ for (MathData::const_iterator it = ar.begin(); it != ar.end(); ++it)
(*it)->mathematica(os);
}
-void mathmlize(MathArray const & dat, MathStream & os)
+void mathmlize(MathData const & dat, MathStream & os)
{
- MathArray ar = dat;
+ MathData ar = dat;
extractStructure(ar);
if (ar.size() == 0)
os << "<mrow/>";
os << ar.front();
else {
os << MTag("mrow");
- for (MathArray::const_iterator it = ar.begin(); it != ar.end(); ++it)
+ for (MathData::const_iterator it = ar.begin(); it != ar.end(); ++it)
(*it)->mathmlize(os);
os << ETag("mrow");
}
namespace {
- std::string captureOutput(std::string const & cmd, std::string const & data)
+ string captureOutput(string const & cmd, string const & data)
{
// In order to avoid parsing problems with command interpreters
// we pass input data through a file
- FileName const cas_tmpfile(tempName(FileName(), "casinput"));
+ FileName const cas_tmpfile = FileName::tempName("casinput");
if (cas_tmpfile.empty()) {
lyxerr << "Warning: cannot create temporary file."
<< endl;
- return std::string();
+ return string();
}
- std::ofstream os(cas_tmpfile.toFilesystemEncoding().c_str());
+ ofstream os(cas_tmpfile.toFilesystemEncoding().c_str());
os << data << endl;
os.close();
- std::string command = cmd + " < "
+ string command = cmd + " < "
+ quoteName(cas_tmpfile.toFilesystemEncoding());
lyxerr << "calling: " << cmd
<< "\ninput: '" << data << "'" << endl;
cmd_ret const ret = runCommand(command);
- unlink(cas_tmpfile);
+ cas_tmpfile.removeFile();
return ret.second;
}
- size_t get_matching_brace(std::string const & str, size_t i)
+ size_t get_matching_brace(string const & str, size_t i)
{
int count = 1;
size_t n = str.size();
return npos;
}
- size_t get_matching_brace_back(std::string const & str, size_t i)
+ size_t get_matching_brace_back(string const & str, size_t i)
{
int count = 1;
while (i > 0) {
return npos;
}
- MathArray pipeThroughMaxima(docstring const &, MathArray const & ar)
+ MathData pipeThroughMaxima(docstring const &, MathData const & ar)
{
odocstringstream os;
MaximaStream ms(os);
docstring expr = os.str();
docstring const header = from_ascii("simpsum:true;");
- std::string out;
+ string out;
for (int i = 0; i < 100; ++i) { // at most 100 attempts
// try to fix missing '*' the hard way
//
// search line with "Incorrect syntax"
istringstream is(out);
- std::string line;
+ string line;
while (is) {
getline(is, line);
if (line.find("Incorrect syntax") != npos)
expr.insert(pos, from_ascii("*"));
}
- vector<std::string> tmp = getVectorFromString(out, "$$");
+ vector<string> tmp = getVectorFromString(out, "$$");
if (tmp.size() < 2)
- return MathArray();
+ return MathData();
- out = subst(tmp[1], "\\>", std::string());
+ out = subst(tmp[1], "\\>", string());
lyxerr << "output: '" << out << "'" << endl;
// Ugly code that tries to make the result prettier
size_t k = get_matching_brace(out, j + 1);
k = get_matching_brace(out, k + 1);
k = get_matching_brace(out, k + 1);
- std::string mid = out.substr(i + 13, j - i - 13);
+ string mid = out.substr(i + 13, j - i - 13);
if (mid.find("\\over") != npos)
mid = '{' + mid + '}';
- out = out.substr(0,i)
+ out = out.substr(0, i)
+ mid
+ out.substr(k + 1);
//lyxerr << "output: " << out << endl;
size_t k = get_matching_brace(out, i + 5);
if (k == npos || k + 1 == out.size())
break;
- out = out.substr(0,j - 1)
+ out = out.substr(0, j - 1)
+ "\\frac"
- + out.substr(j,i - j)
- + out.substr(i + 5,k - i - 4)
+ + out.substr(j, i - j)
+ + out.substr(i + 5, k - i - 4)
+ out.substr(k + 2);
//lyxerr << "output: " << out << endl;
i = out.find("\\over", i + 4);
}
- MathArray res;
+ MathData res;
mathed_parse_cell(res, from_utf8(out));
return res;
}
- MathArray pipeThroughMaple(docstring const & extra, MathArray const & ar)
+ MathData pipeThroughMaple(docstring const & extra, MathData const & ar)
{
- std::string header = "readlib(latex):\n";
+ string header = "readlib(latex):\n";
// remove the \\it for variable names
//"#`latex/csname_font` := `\\it `:"
//"#`latex/latex/symbol` "
// " := subs((\\'_\\' = \\'`\\_`\\',eval(`latex/latex/symbol`)): ";
- std::string trailer = "quit;";
+ string trailer = "quit;";
odocstringstream os;
MapleStream ms(os);
ms << ar;
- std::string expr = to_utf8(os.str());
+ string expr = to_utf8(os.str());
lyxerr << "ar: '" << ar << "'\n"
<< "ms: '" << expr << "'" << endl;
// change \_ into _
//
- MathArray res;
+ MathData res;
mathed_parse_cell(res, from_utf8(out));
return res;
}
- MathArray pipeThroughOctave(docstring const &, MathArray const & ar)
+ MathData pipeThroughOctave(docstring const &, MathData const & ar)
{
odocstringstream os;
OctaveStream vs(os);
// ansi control sequence before, such as '\033[?1034hans = '
size_t i = out.find("ans = ");
if (i == string::npos)
- return MathArray();
+ return MathData();
out = out.substr(i + 6);
// parse output as matrix or single number
MathAtom at(new InsetMathArray(from_ascii("array"), from_utf8(out)));
InsetMathArray const * mat = at->asArrayInset();
- MathArray res;
+ MathData res;
if (mat->ncols() == 1 && mat->nrows() == 1)
res.append(mat->cell(0));
else {
}
- MathArray pipeThroughMathematica(docstring const &, MathArray const & ar)
+ MathData pipeThroughMathematica(docstring const &, MathData const & ar)
{
odocstringstream os;
MathematicaStream ms(os);
size_t pos2 = out.find("In[2]:=");
if (pos1 == string::npos || pos2 == string::npos)
- return MathArray();
+ return MathData();
// get everything from pos1+17 to pos2
out = out.substr(pos1 + 17, pos2 - pos1 - 17);
prettifyMathematicaOutput(out, "Muserfunction", true, false);
prettifyMathematicaOutput(out, "Mvariable", false, false);
- MathArray res;
+ MathData res;
mathed_parse_cell(res, from_utf8(out));
return res;
}
}
-MathArray pipeThroughExtern(string const & lang, docstring const & extra,
- MathArray const & ar)
+MathData pipeThroughExtern(string const & lang, docstring const & extra,
+ MathData const & ar)
{
if (lang == "octave")
return pipeThroughOctave(extra, ar);
string data = to_utf8(os.str());
// search external script
- support::FileName const file = libFileSearch("mathed", "extern_" + lang);
+ FileName const file = libFileSearch("mathed", "extern_" + lang);
if (file.empty()) {
lyxerr << "converter to '" << lang << "' not found" << endl;
- return MathArray();
+ return MathData();
}
// run external sript
string out = captureOutput(file.absFilename(), data);
- MathArray res;
+ MathData res;
mathed_parse_cell(res, from_utf8(out));
return res;
}
projects / lyx.git / blobdiff