Cmake export tests: Added sublabel handling also to revertedTests

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

diff --git a/src/mathed/MathExtern.cpp b/src/mathed/MathExtern.cpp
index 6edc97b1074289a1d3eb03d197527da0ad310a4b..7fbb4af732fb10fa941cb57d9d01c50d3a0d758b 100644 (file)
--- a/src/mathed/MathExtern.cpp
+++ b/src/mathed/MathExtern.cpp
@@ -35,11 +35,16 @@
 #include "MathParser.h"
 #include "MathStream.h"
 
+#include "Encoding.h"
+
 #include "support/debug.h"
 #include "support/docstream.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
+#include "support/TempFile.h"
+#include "support/textutils.h"
 
 #include <algorithm>
 #include <sstream>
@@ -995,7 +1000,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;
@@ -1009,7 +1015,6 @@ namespace {
                lyxerr << "calling: " << cmd
                       << "\ninput: '" << data << "'" << endl;
                cmd_ret const ret = runCommand(command);
-               cas_tmpfile.removeFile();
                return ret.second;
        }
 
@@ -1118,7 +1123,6 @@ namespace {
                                + out.substr(k + 1);
                        //lyxerr << "output: " << out << endl;
                        i = out.find("\\mathchoice", i);
-                       break;
                }
 
                i = out.find("\\over");
@@ -1196,7 +1200,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('^');
@@ -1382,16 +1386,122 @@ namespace {
 
 void write(MathData const & dat, WriteStream & wi)
 {
-       MathData ar = dat;
-       extractStrings(ar);
        wi.firstitem() = true;
-       for (MathData::const_iterator it = ar.begin(); it != ar.end(); ++it) {
-               (*it)->write(wi);
+       docstring s;
+       for (MathData::const_iterator it = dat.begin(); it != dat.end(); ++it) {
+               InsetMathChar const * const c = (*it)->asCharInset();
+               if (c)
+                       s += c->getChar();
+               else {
+                       if (!s.empty()) {
+                               writeString(s, wi);
+                               s.clear();
+                       }
+                       (*it)->write(wi);
+                       wi.firstitem() = false;
+               }
+       }
+       if (!s.empty()) {
+               writeString(s, wi);
                wi.firstitem() = false;
        }
 }
 
 
+void writeString(docstring const & s, WriteStream & os)
+{
+       if (!os.latex() || os.lockedMode()) {
+               os << (os.asciiOnly() ? escape(s) : s);
+               return;
+       }
+
+       docstring::const_iterator cit = s.begin();
+       docstring::const_iterator end = s.end();
+
+       // We may already be inside an \ensuremath command.
+       bool in_forced_mode = os.pendingBrace();
+
+       // We will take care of matching braces.
+       os.pendingBrace(false);
+
+       while (cit != end) {
+               bool mathmode = in_forced_mode ? os.textMode() : !os.textMode();
+               char_type const c = *cit;
+               docstring command(1, c);
+               try {
+                       bool termination = false;
+                       if (isASCII(c) ||
+                           Encodings::latexMathChar(c, mathmode, os.encoding(), command, termination)) {
+                               if (os.textMode()) {
+                                       if (in_forced_mode) {
+                                               // we were inside \lyxmathsym
+                                               os << '}';
+                                               os.textMode(false);
+                                               in_forced_mode = false;
+                                       }
+                                       if (!isASCII(c) && os.textMode()) {
+                                               os << "\\ensuremath{";
+                                               os.textMode(false);
+                                               in_forced_mode = true;
+                                       }
+                               } else if (isASCII(c) && in_forced_mode) {
+                                       // we were inside \ensuremath
+                                       os << '}';
+                                       os.textMode(true);
+                                       in_forced_mode = false;
+                               }
+                       } else if (!os.textMode()) {
+                                       if (in_forced_mode) {
+                                               // we were inside \ensuremath
+                                               os << '}';
+                                               in_forced_mode = false;
+                                       } else {
+                                               os << "\\lyxmathsym{";
+                                               in_forced_mode = true;
+                                       }
+                                       os.textMode(true);
+                       }
+                       os << command;
+                       // We may need a space if the command contains a macro
+                       // and the last char is ASCII.
+                       if (termination)
+                               os.pendingSpace(true);
+               } 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);
+                       }
+               }
+               ++cit;
+       }
+
+       if (in_forced_mode && os.textMode()) {
+               // We have to care for closing \lyxmathsym
+               os << '}';
+               os.textMode(false);
+       } else {
+               os.pendingBrace(in_forced_mode);
+       }
+}
+
+
 void normalize(MathData const & ar, NormalStream & os)
 {
        for (MathData::const_iterator it = ar.begin(); it != ar.end(); ++it)
@@ -1472,7 +1582,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();
 }
 
 
@@ -1480,7 +1591,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();
 }