HTML for stackrel.

[lyx.git] / src / LaTeX.cpp

diff --git a/src/LaTeX.cpp b/src/LaTeX.cpp
index db2037f8d2f4edeca588dfc09aa257998ad40f2d..7abe021106b96067ebd450886216217655a7ac3a 100644 (file)
--- a/src/LaTeX.cpp
+++ b/src/LaTeX.cpp
@@ -598,6 +598,9 @@ int LaTeX::scanLogFile(TeXErrors & terr)
        ifstream ifs(fn.toFilesystemEncoding().c_str());
        bool fle_style = false;
        static regex file_line_error(".+\\.\\D+:[0-9]+: (.+)");
+       // Flag for 'File ended while scanning' message.
+       // We need to wait for subsequent processing.
+       string wait_for_error;
 
        string token;
        while (getline(ifs, token)) {
@@ -684,6 +687,30 @@ int LaTeX::scanLogFile(TeXErrors & terr)
                                desc = sub.str();
                        if (contains(token, "LaTeX Error:"))
                                retval |= LATEX_ERROR;
+
+                       // bug 6445. At this point its not clear we finish with error.
+                       if (prefixIs(token, "! File ended while scanning")){
+                               wait_for_error = desc;
+                               continue;
+                       }
+                       if (!wait_for_error.empty() && prefixIs(token, "! Emergency stop.")){
+                               retval |= LATEX_ERROR;
+                               string errstr;
+                               int count = 0;
+                               errstr = wait_for_error;
+                               do {
+                                       if (!getline(ifs, tmp))
+                                               break;
+                                       errstr += "\n" + tmp;
+                                       if (++count > 5)
+                                               break;
+                               } while (!contains(tmp, "(job aborted"));
+
+                               terr.insertError(0,
+                                                from_local8bit("Emergency stop"),
+                                                from_local8bit(errstr));
+                       }
+
                        // get the next line
                        string tmp;
                        int count = 0;
@@ -755,6 +782,13 @@ int LaTeX::scanLogFile(TeXErrors & terr)
                        } else if (contains(token, "That makes 100 errors")) {
                                // More than 100 errors were reprted
                                retval |= TOO_MANY_ERRORS;
+                       } else if (prefixIs(token, "!pdfTeX error:")){
+                               // otherwise we dont catch e.g.:
+                               // !pdfTeX error: pdflatex (file feyn10): Font feyn10 at 600 not found
+                               retval |= ERRORS;
+                                       terr.insertError(0,
+                                                        from_local8bit("pdfTeX Error"),
+                                                        from_local8bit(token));
                        }
                }
        }