anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 15:01:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Hack to enable auto-insertion of '*' for Octave input

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2976 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2001-11-07 14:14:04 +00:00
parent 83e7c2cff7
commit f07a117fc3
1 changed files with 52 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/mathed/formula.C
View File

@ -56,11 +56,11 @@ namespace {
string captureOutput(string const & cmd, string const & data)
{
string outfile = lyx::tempName(string(), "mathextern");
string full = "echo '" + data + "' | " + cmd + " > " + outfile;
string full = "echo '" + data + "' | (" + cmd + ") > " + outfile;
lyxerr << "calling: " << full << "\n";
Systemcalls dummy(Systemcalls::System, full, 0);
string out = GetFileContents(outfile);
lyxerr << "result: " << out << "\n";
lyxerr << "result: '" << out << "'\n";
return out;
}
@ -99,7 +99,10 @@ namespace {
string::size_type pos = line.find('^');
if (pos == string::npos || pos < 15)
break; // caret position not found
expr.insert(pos - 15, "*");
pos -= 15; // skip the "on line ..." part
if (expr[pos] == '*')
break; // two '*' in a row are definitely bad
expr.insert(pos, "*");
}
string full = "latex(" + extra + '(' + expr + "));";
@ -116,9 +119,52 @@ namespace {
MathArray pipeThroughOctave(string const &, MathArray const & ar)
{
string out = captureOutput("octave -q", ar.octavize());
if (out.size() > 6) // remove 'ans = '
out = out.substr(6);
string expr = ar.octavize();
string out;
for (int i = 0; i < 100; ++i) { // at most 100 attempts
//
// try to fix missing '*' the hard way
// parse error:
// >>> ([[1 2 3 ];[2 3 1 ];[3 1 2 ]])([[1 2 3 ];[2 3 1 ];[3 1 2 ]])
// ^
//
lyxerr << "checking expr: '" << expr << "'\n";
out = captureOutput("octave -q 2>&1", expr);
lyxerr << "checking out: '" << out << "'\n";
// leave loop if expression syntax is probably ok
if (out.find("parse error:") == string::npos)
break;
// search line with single caret
istringstream is(out);
string line;
while (is) {
getline(is, line);
lyxerr << "skipping line: '" << line << "'\n";
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";
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, "*");
}
if (out.size() < 6)
return MathArray();
// remove 'ans = '
out = out.substr(6);
// parse output as matrix or single number
MathAtom at(new MathArrayInset(out));