return from switch

[lyx.git] / src / LaTeX.cpp

diff --git a/src/LaTeX.cpp b/src/LaTeX.cpp
index f0017c83ae5abcc77c9fdcb530790364467910fc..a34db97de1d759e014a229ac9ce4c6e9111f311b 100644 (file)
--- a/src/LaTeX.cpp
+++ b/src/LaTeX.cpp
@@ -238,7 +238,7 @@ int LaTeX::run(TeXErrors & terr)
                        // Also remove all children which are included
                        Buffer const * buf = theBufferList().getBufferFromTmp(file.absFileName());
                        if (buf && buf->params().maintain_unincluded_children == BufferParams::CM_Mostly) {
-                               for (auto const incfile : buf->params().getIncludedChildren()) {
+                               for (auto const & incfile : buf->params().getIncludedChildren()) {
                                        string const incm =
                                                DocFileName(changeExtension(makeAbsPath(incfile, path)
                                                                            .absFileName(), ".tex")).mangledFileName();
@@ -807,6 +807,7 @@ int LaTeX::scanLogFile(TeXErrors & terr)
        terr.clearRefs();
 
        string token;
+       string ml_token;
        while (getline(ifs, token)) {
                // MikTeX sometimes inserts \0 in the log file. They can't be
                // removed directly with the existing string utility
@@ -821,6 +822,9 @@ int LaTeX::scanLogFile(TeXErrors & terr)
                if (token.empty())
                        continue;
 
+               if (!ml_token.empty())
+                       ml_token += token;
+
                // Track child documents
                for (size_t i = 0; i < token.length(); ++i) {
                        if (token[i] == '(') {
@@ -862,8 +866,10 @@ int LaTeX::scanLogFile(TeXErrors & terr)
                    prefixIs(token, "Package biblatex Warning: The following entry could not be found")))
                        retval |= UNDEF_CIT;
 
-               if (prefixIs(token, "LaTeX Warning:") ||
-                   prefixIs(token, "! pdfTeX warning")) {
+               if (prefixIs(token, "LaTeX Warning:")
+                   || prefixIs(token, "! pdfTeX warning")
+                   || prefixIs(ml_token, "LaTeX Warning:")
+                   || prefixIs(ml_token, "! pdfTeX warning")) {
                        // Here shall we handle different
                        // types of warnings
                        retval |= LATEX_WARNING;
@@ -893,8 +899,37 @@ int LaTeX::scanLogFile(TeXErrors & terr)
                                terr.insertRef(getLineNumber(token), from_ascii("Citation undefined"),
                                        from_utf8(token), child_name);
                        //"Reference `X' on page Y undefined on input line Z."
-                       } else if (contains(token, "Reference")
-                                  //&& contains(token, "on input line")) //often split to new line
+                       // This warning might be broken accross multiple lines with long labels.
+                       // Thus we check that
+                       } else if (contains(token, "Reference `") && !contains(token, "on input line")) {
+                               // Rest of warning in next line(s)
+                               // Save to ml_token
+                               ml_token = token;
+                       } else if (!ml_token.empty() && contains(ml_token, "Reference `")
+                                  && !contains(ml_token, "on input line")) {
+                               // not finished yet. Continue with next line.
+                               continue;
+                       } else if (!ml_token.empty() && contains(ml_token, "Reference `")
+                                  && contains(ml_token, "on input line")) {
+                               // We have collected the whole warning now.
+                               if (!contains(ml_token, "undefined")) {
+                                       // Not the warning we are looking for
+                                       ml_token.clear();
+                                       continue;
+                               }
+                               if (regex_match(ml_token, sub, undef_ref)) {
+                                       string const ref = sub.str(1);
+                                       Buffer const * buf = theBufferList().getBufferFromTmp(file.absFileName());
+                                       if (!buf || !buf->masterBuffer()->activeLabel(from_utf8(ref))) {
+                                               terr.insertRef(getLineNumber(ml_token), from_ascii("Reference undefined"),
+                                                       from_utf8(ml_token), child_name);
+                                               retval |= UNDEF_UNKNOWN_REF;
+                                       }
+                               }
+                               ml_token.clear();
+                               retval |= UNDEF_REF;
+                       } else if (contains(token, "Reference `")
+                                  && contains(token, "on input line")
                                   && contains(token, "undefined")) {
                                if (regex_match(token, sub, undef_ref)) {
                                        string const ref = sub.str(1);
@@ -906,9 +941,8 @@ int LaTeX::scanLogFile(TeXErrors & terr)
                                        }
                                }
                                retval |= UNDEF_REF;
-
-                       //If label is too long pdlaftex log line splitting will make the above fail
-                       //so we catch at least this generic statement occuring for both CIT & REF.
+                       // In case the above checks fail we catch at least this generic statement
+                       // occuring for both CIT & REF.
                        } else if (!runparams.includeall && contains(token, "There were undefined references.")) {
                                if (!(retval & UNDEF_CIT)) //if not handled already
                                        retval |= UNDEF_REF;
@@ -1017,10 +1051,15 @@ int LaTeX::scanLogFile(TeXErrors & terr)
 
                        // get the next line
                        int count = 0;
+                       // We also collect intermediate lines
+                       // This is needed for errors in preamble
+                       string intermediate;
                        do {
                                if (!getline(ifs, tmp))
                                        break;
                                tmp = rtrim(tmp, "\r");
+                               if (!prefixIs(tmp, "l."))
+                                       intermediate += tmp;
                                // 15 is somewhat arbitrarily chosen, based on practice.
                                // We used 10 for 14 years and increased it to 15 when we
                                // saw one case.
@@ -1042,6 +1081,15 @@ int LaTeX::scanLogFile(TeXErrors & terr)
                                sscanf(tmp.c_str(), "l.%d", &line);
                                // get the rest of the message:
                                string errstr(tmp, tmp.find(' '));
+                               bool preamble_error = false;
+                               if (suffixIs(errstr, "\\begin{document}")) {
+                                       // this is an error in preamble
+                                       // the real error is in the
+                                       // intermediate lines
+                                       errstr = intermediate;
+                                       tmp = intermediate;
+                                       preamble_error = true;
+                               }
                                errstr += '\n';
                                getline(ifs, tmp);
                                tmp = rtrim(tmp, "\r");
@@ -1054,6 +1102,9 @@ int LaTeX::scanLogFile(TeXErrors & terr)
                                        getline(ifs, tmp);
                                        tmp = rtrim(tmp, "\r");
                                }
+                               if (preamble_error)
+                                       // Add a note that the error is to be found in preamble
+                                       errstr += "\n" + to_utf8(_("(NOTE: The erroneous command is in the preamble)"));
                                LYXERR(Debug::LATEX, "line: " << line << '\n'
                                        << "Desc: " << desc << '\n' << "Text: " << errstr);
                                if (line == last_line)