]> git.lyx.org Git - lyx.git/blobdiff - src/mathed/math_extern.C
small up/down tweaking
[lyx.git] / src / mathed / math_extern.C
index 26ed7bf987db33e87f80bed661d7e75b547b38de..c16d5cbdd8a8e9ff6b3ecfa85057973bc8a4dfb5 100644 (file)
@@ -1,6 +1,5 @@
-
 #ifdef __GNUG__
-#pragma implementation 
+#pragma implementation
 #endif
 
 // This file contains most of the magic that extracts "context
@@ -31,6 +30,7 @@
 #include "support/lyxlib.h"
 #include "support/systemcall.h"
 #include "support/filetools.h"
+#include "support/lstrings.h"
 
 #include <algorithm>
 
@@ -305,7 +305,7 @@ void extractExps(MathArray & ar)
                if (!sup || sup->hasDown())
                        continue;
 
-               // create a proper exp-inset as replacement 
+               // create a proper exp-inset as replacement
                ar[i] = MathAtom(new MathExFuncInset("exp", sup->cell(1)));
                ar.erase(i + 1);
        }
@@ -489,7 +489,7 @@ bool testIntegral(MathAtom const & at)
 {
        return
         testIntSymbol(at) ||
-               ( at->asScriptInset() 
+               ( at->asScriptInset()
                  && at->asScriptInset()->nuc().size()
                        && testIntSymbol(at->asScriptInset()->nuc().back()) );
 }
@@ -568,7 +568,7 @@ bool testSum(MathAtom const & at)
 {
        return
         testSumSymbol(at) ||
-               ( at->asScriptInset() 
+               ( at->asScriptInset()
                  && at->asScriptInset()->nuc().size()
                        && testSumSymbol(at->asScriptInset()->nuc().back()) );
 }
@@ -749,7 +749,7 @@ void extractLims(MathArray & ar)
                MathArray::iterator it = ar.begin() + i;
 
                // is this a limit function?
-               if (!testSymbol(*it, "lim")) 
+               if (!testSymbol(*it, "lim"))
                        continue;
 
                // the next one must be a subscript (without superscript)
@@ -766,7 +766,7 @@ void extractLims(MathArray & ar)
                // 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());
@@ -841,6 +841,15 @@ void maplize(MathArray const & dat, MapleStream & os)
 }
 
 
+void maximize(MathArray const & dat, MaximaStream & os)
+{
+       MathArray ar = dat;
+       extractStructure(ar);
+       for (MathArray::const_iterator it = ar.begin(); it != ar.end(); ++it)
+               (*it)->maximize(os);
+}
+
+
 void mathematicize(MathArray const & dat, MathematicaStream & os)
 {
        MathArray ar = dat;
@@ -873,15 +882,136 @@ namespace {
 
        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 = STRCONV(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 << "'\n";
+                       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 << "'\n";
+                       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 << "'\n";
+
+               // 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;
        }
 
 
@@ -919,7 +1049,7 @@ namespace {
                ostringstream os;
                MapleStream ms(os);
                ms << ar;
-               string expr = os.str().c_str();
+               string expr = STRCONV(os.str());
                lyxerr << "ar: '" << ar << "'\n";
                lyxerr << "ms: '" << os.str() << "'\n";
 
@@ -932,7 +1062,7 @@ namespace {
                        //                   Probably missing an operator such as * p
                        //
                        lyxerr << "checking expr: '" << expr << "'\n";
-                       string out = captureOutput("mint -i 1 -S -s -q -q", expr + ";");
+                       string out = captureOutput("mint -i 1 -S -s -q -q", expr + ';');
                        if (out.empty())
                                break; // expression syntax is ok
                        istringstream is(out.c_str());
@@ -947,7 +1077,7 @@ namespace {
                        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 + "));";
@@ -967,7 +1097,7 @@ namespace {
                ostringstream os;
                OctaveStream vs(os);
                vs << ar;
-               string expr = os.str().c_str();
+               string expr = STRCONV(os.str());
                string out;
 
                lyxerr << "pipe: ar: '" << ar << "'\n";
@@ -1008,7 +1138,7 @@ namespace {
                        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)
@@ -1039,21 +1169,24 @@ MathArray pipeThroughExtern(string const & lang, string const & extra,
        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 = STRCONV(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();
        }