Fix bug #7106: iterator out of range while copying multi-row math.

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

diff --git a/src/mathed/MathExtern.cpp b/src/mathed/MathExtern.cpp
index a8fd9a173d80f75963e5694ccb78bae2e51f97cf..ce055ea33670a96c97c5bc9b177ff1f63ffcb1fd 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);
@@ -1499,7 +1499,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;