Fix bug #3294

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

diff --git a/src/mathed/MathExtern.cpp b/src/mathed/MathExtern.cpp
index b3443fa919a5d096bff0b44636b54e9f921903c2..e911f0babf24bc71897915e824440da90a4de811 100644 (file)
--- a/src/mathed/MathExtern.cpp
+++ b/src/mathed/MathExtern.cpp
@@ -115,7 +115,7 @@ bool extractScript(MathData & ar,
 // try to extract an "argument" to some function.
 // returns position behind the argument
 MathData::iterator extractArgument(MathData & ar,
-       MathData::iterator pos, MathData::iterator last, 
+       MathData::iterator pos, MathData::iterator last,
        ExternalMath kind, bool function = false)
 {
        // nothing to get here
@@ -211,7 +211,7 @@ void extractMatrices(MathData & ar)
                        continue;
                if (!arr.front()->asGridInset())
                        continue;
-               ar[i] = MathAtom(new InsetMathMatrix(*(arr.front()->asGridInset()), 
+               ar[i] = MathAtom(new InsetMathMatrix(*(arr.front()->asGridInset()),
                                 inset->left_, inset->right_));
        }
 
@@ -602,7 +602,7 @@ void extractFunctions(MathData & ar, ExternalMath kind)
                auto p = make_unique<InsetMathExFunc>(buf, name);
 
                // jt points to the "argument". Get hold of this.
-               MathData::iterator st = 
+               MathData::iterator st =
                                extractArgument(p->cell(0), jt, ar.end(), kind, true);
 
                // replace the function name by a real function inset
@@ -896,6 +896,10 @@ void extractDiff(MathData & ar)
                                int mult = 1;
                                if (extractNumber(script->up(), mult)) {
                                        //lyxerr << "mult: " << mult << endl;
+                                       if (mult < 0 || mult > 1000) {
+                                               lyxerr << "Cannot differentiate less than 0 or more than 1000 times !" << endl;
+                                               continue;
+                                       }
                                        for (int i = 0; i < mult; ++i)
                                                diff->addDer(MathData(buf, dt + 1, st));
                                }
@@ -1001,8 +1005,13 @@ namespace {
        {
                // In order to avoid parsing problems with command interpreters
                // we pass input data through a file
-               TempFile tempfile("casinput");
-               FileName const cas_tmpfile = tempfile.name();
+               // Since the CAS is supposed to read the temp file we need
+               // to unlock it on windows (bug 10262).
+               unique_ptr<TempFile> tempfile(new TempFile("casinput"));
+               tempfile->setAutoRemove(false);
+               FileName const cas_tmpfile = tempfile->name();
+               tempfile.reset();
+
                if (cas_tmpfile.empty()) {
                        lyxerr << "Warning: cannot create temporary file."
                               << endl;
@@ -1016,6 +1025,7 @@ namespace {
                lyxerr << "calling: " << cmd
                       << "\ninput: '" << data << "'" << endl;
                cmd_ret const ret = runCommand(command);
+               cas_tmpfile.removeFile();
                return ret.second;
        }
 
@@ -1381,9 +1391,9 @@ namespace {
                return res;
        }
 
-}
+} // namespace
 
-} // anon namespace
+} // namespace
 
 void write(MathData const & dat, WriteStream & wi)
 {
@@ -1411,11 +1421,46 @@ void write(MathData const & dat, WriteStream & wi)
 
 void writeString(docstring const & s, WriteStream & os)
 {
-       if (!os.latex() || os.lockedMode()) {
+       if (!os.latex()) {
                os << (os.asciiOnly() ? escape(s) : s);
                return;
        }
 
+       if (os.lockedMode()) {
+               bool space;
+               docstring cmd;
+               for (char_type c : s) {
+                       try {
+                               Encodings::latexMathChar(c, true, os.encoding(), cmd, space);
+                               os << cmd;
+                               os.pendingSpace(space);
+                       } catch (EncodingException const & e) {
+                               switch (os.output()) {
+                               case WriteStream::wsDryrun: {
+                                       os << "<" << _("LyX Warning: ")
+                                          << _("uncodable character") << " '";
+                                       os << docstring(1, e.failed_char);
+                                       os << "'>";
+                                       break;
+                               }
+                               case WriteStream::wsPreview: {
+                                       // indicate the encoding error by a boxed '?'
+                                       os << "{\\fboxsep=1pt\\fbox{?}}";
+                                       LYXERR0("Uncodable character" << " '"
+                                               << docstring(1, e.failed_char)
+                                               << "'");
+                                       break;
+                               }
+                               case WriteStream::wsDefault:
+                               default:
+                                       // throw again
+                                       throw(e);
+                               }
+                       }
+               }
+               return;
+       }
+
        docstring::const_iterator cit = s.begin();
        docstring::const_iterator end = s.end();