some visual support for \lefteqn

[features.git] / src / mathed / formula.C

diff --git a/src/mathed/formula.C b/src/mathed/formula.C
index 2c1723812a80d2d41b3876bcc3628aa215410da8..6a427b9c4131288b7c6635f37287981e9ee4aa6c 100644 (file)
--- a/src/mathed/formula.C
+++ b/src/mathed/formula.C
@@ -24,6 +24,7 @@
 #include "commandtags.h"
 #include "math_cursor.h"
 #include "math_parser.h"
+#include "math_charinset.h"
 #include "lyx_main.h"
 #include "BufferView.h"
 #include "gettext.h"
@@ -48,6 +49,7 @@ using std::endl;
 using std::vector;
 
 
+
 InsetFormula::InsetFormula()
        : par_(MathAtom(new MathMatrixInset))
 {}
@@ -302,17 +304,39 @@ InsetFormula::localDispatch(BufferView * bv, kb_action action,
 
 void InsetFormula::handleExtern(const string & arg, BufferView *)
 {
+       // where are we?
+       MathArray & ar = mathcursor->cursor().cell();
+
+       // find position of last '=' in the array for handleExtern
+       MathArray::size_type pos = ar.size();
+       for (MathArray::const_iterator it = ar.begin(); it != ar.end(); ++it)
+               if ((*it)->getChar() == '=')
+                       pos = it - ar.begin();
+
+       // delete everything behind this position
+       ar.erase(pos, ar.size());
+
+       // create normalized expression
        //string outfile = lyx::tempName("maple.out");
        string outfile = "/tmp/lyx2" + arg + ".out";
        ostringstream os;
-       mat()->writeNormal(os); 
+       ar.writeNormal(os); 
        string code = os.str().c_str();
+
+       // run external sript
        string script = "lyx2" + arg + " '" + code + "' " + outfile;
        lyxerr << "calling: " << script << endl;
        Systemcalls cmd(Systemcalls::System, script, 0);
 
+       // append a '='
+       ar.push_back(MathAtom(new MathCharInset('=')));
+       
+       // append result
        ifstream is(outfile.c_str());
-       mathed_parse_normal(par_, is);
+       mathed_parse_cell(ar, is);
+       mathcursor->end();
+
+       // re-compute inset dimension
        metrics();
 }