Fix overflow of inset over text (see #9224)

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

diff --git a/src/mathed/MathExtern.cpp b/src/mathed/MathExtern.cpp
index d3bf7387532a37ad70507cfca827e139475b301f..a943dac8028b8140c34e51d325fd2eec2c1472b8 100644 (file)
--- a/src/mathed/MathExtern.cpp
+++ b/src/mathed/MathExtern.cpp
@@ -40,6 +40,7 @@
 #include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
+#include "support/TempFile.h"
 
 #include <algorithm>
 #include <sstream>
@@ -537,6 +538,9 @@ void extractDelims(MathData & ar)
 // assume 'extractDelims' ran before
 void extractFunctions(MathData & ar, ExternalMath kind)
 {
+       // FIXME From what I can see, this is quite broken right now, for reasons
+       // I will note below. (RGH)
+
        // we need at least two items...
        if (ar.size() < 2)
                return;
@@ -551,9 +555,26 @@ void extractFunctions(MathData & ar, ExternalMath kind)
                docstring name;
                // is it a function?
                // it certainly is if it is well known...
+
+               // FIXME This will never give us anything. When we get here, *it will
+               // never point at a string, but only at a character. I.e., if we are
+               // working on "sin(x)", then we are seeing:
+               // [char s mathalpha][char i mathalpha][char n mathalpha][delim ( ) [char x mathalpha]]
+               // and of course we will not find the function name "sin" in there, but
+               // rather "n(x)".
+               //
+               // It appears that we original ran extractStrings() before we ran
+               // extractFunctions(), but Andre changed this at f200be55, I think
+               // because this messed up what he was trying to do with "dx" in the
+               // context of integrals.
+               //
+               // This could be fixed by looking at a charSequence instead of just at
+               // the various characters, one by one. But I am not sure I understand
+               // exactly what we are trying to do here. And it involves a lot of
+               // guessing.
                if (!extractFunctionName(*it, name)) {
                        // is this a user defined function?
-                       // it it probably not, if it doesn't have a name.
+                       // probably not, if it doesn't have a name.
                        if (!extractString(*it, name))
                                continue;
                        // it is not if it has no argument
@@ -564,7 +585,7 @@ void extractFunctions(MathData & ar, ExternalMath kind)
                        InsetMathDelim const * del = (*jt)->asDelimInset();
                        if (!del || del->cell(0).size() != 1)
                                continue;
-                       // fall trough into main branch
+                       // fall through into main branch
                }
 
                // do we have an exponent like in
@@ -957,8 +978,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);
@@ -975,7 +996,8 @@ namespace {
        {
                // In order to avoid parsing problems with command interpreters
                // we pass input data through a file
-               FileName const cas_tmpfile = FileName::tempName("casinput");
+               TempFile tempfile("casinput");
+               FileName const cas_tmpfile = tempfile.name();
                if (cas_tmpfile.empty()) {
                        lyxerr << "Warning: cannot create temporary file."
                               << endl;
@@ -989,7 +1011,6 @@ namespace {
                lyxerr << "calling: " << cmd
                       << "\ninput: '" << data << "'" << endl;
                cmd_ret const ret = runCommand(command);
-               cas_tmpfile.removeFile();
                return ret.second;
        }
 
@@ -1176,7 +1197,7 @@ namespace {
                        istringstream is(out);
                        string line;
                        getline(is, line);
-                       if (line.find("on line") != 0)
+                       if (!prefixIs(line, "on line"))
                                break; // error message not identified
                        getline(is, line);
                        size_t pos = line.find('^');
@@ -1452,7 +1473,8 @@ bool extractNumber(MathData const & ar, int & i)
 {
        idocstringstream is(charSequence(ar.begin(), ar.end()));
        is >> i;
-       return is;
+       // Do not convert is implicitly to bool, since that is forbidden in C++11.
+       return !is.fail();
 }
 
 
@@ -1460,7 +1482,8 @@ bool extractNumber(MathData const & ar, double & d)
 {
        idocstringstream is(charSequence(ar.begin(), ar.end()));
        is >> d;
-       return is;
+       // Do not convert is implicitly to bool, since that is forbidden in C++11.
+       return !is.fail();
 }