Add \makeat switches to babel settings if necessary.

[lyx.git] / src / mathed / MathExtern.cpp

diff --git a/src/mathed/MathExtern.cpp b/src/mathed/MathExtern.cpp
index a8fd9a173d80f75963e5694ccb78bae2e51f97cf..8d1df06f777ee1e78b3bfa8df57c035d5c939e6f 100644 (file)
--- a/src/mathed/MathExtern.cpp
+++ b/src/mathed/MathExtern.cpp
@@ -957,8 +957,8 @@ void extractStructure(MathData & ar, ExternalMath kind)
                extractSums(ar);
        extractNumbers(ar);
        extractMatrices(ar);
+       extractFunctions(ar, kind);
        if (kind != MATHML && kind != HTML) {
-               extractFunctions(ar, kind);
                extractDets(ar);
                extractDiff(ar);
                extractExps(ar);
@@ -1419,18 +1419,15 @@ void mathmlize(MathData const & dat, MathStream & os)
 {
        MathData ar = dat;
        extractStructure(ar, MATHML);
-       if (ar.size() == 0) {
-               if (!os.inText())
-                       os << "<mrow/>";
-       } else if (ar.size() == 1)
+       if (ar.size() == 0)
+               os << "<mrow/>";
+       else if (ar.size() == 1)
                os << ar.front();
        else {
-               if (!os.inText())
-                       os << MTag("mrow");
+               os << MTag("mrow");
                for (MathData::const_iterator it = ar.begin(); it != ar.end(); ++it)
                        (*it)->mathmlize(os);
-               if (!os.inText())
-                       os << ETag("mrow");
+               os << ETag("mrow");
        }
 }
 
@@ -1499,7 +1496,7 @@ MathData pipeThroughExtern(string const & lang, docstring const & extra,
        }
 
        // run external sript
-       string out = captureOutput(file.absFilename(), data);
+       string out = captureOutput(file.absFileName(), data);
        MathData res;
        mathed_parse_cell(res, from_utf8(out));
        return res;