X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeX.cpp;h=db2037f8d2f4edeca588dfc09aa257998ad40f2d;hb=2098f1d8c20d51e63e670bcdc9da8996068975bf;hp=658c5f5519ae3e249ae636b8c1415a26af0db544;hpb=7ba2bfb81d5318a010d2f3d34e084d8c68efd42d;p=lyx.git

diff --git a/src/LaTeX.cpp b/src/LaTeX.cpp
index 658c5f5519..db2037f8d2 100644
--- a/src/LaTeX.cpp
+++ b/src/LaTeX.cpp
@@ -50,7 +50,6 @@ namespace os = support::os;
 //   different way.
 // - the makeindex style files should be taken care of with
 //   the dependency mechanism.
-// - somewhere support viewing of bibtex and makeindex log files.
 // - we should perhaps also scan the bibtex log file
 
 namespace {
@@ -147,7 +146,7 @@ int LaTeX::run(TeXErrors & terr)
 	// We know that this function will only be run if the lyx buffer
 	// has been changed. We also know that a newly written .tex file
 	// is always different from the previous one because of the date
-	// in it. However it seems safe to run latex (at least) on time
+	// in it. However it seems safe to run latex (at least) one time
 	// each time the .tex file changes.
 {
 	int scanres = NO_ERRORS;
@@ -671,7 +670,9 @@ int LaTeX::scanLogFile(TeXErrors & terr)
 				retval |= RERUN;
 			}
 		} else if (prefixIs(token, "! ")
-			    || (fle_style && regex_match(token, sub, file_line_error))) {
+			    || (fle_style
+				&& regex_match(token, sub, file_line_error)
+				&& !contains(token, "pdfTeX warning"))) {
 			   // Ok, we have something that looks like a TeX Error
 			   // but what do we really have.
 
@@ -1025,7 +1026,7 @@ void LaTeX::deplog(DepTable & head)
 		// where "File: file.ext" would be skipped
 		if (regex_match(token, sub, reg6)) {
 			// search for strings in (...)
-			static regex reg6_1("\\(([^()]+)(.).*");
+			static regex reg6_1("\\(([^()]+)(.)");
 			smatch what;
 			string::const_iterator first = token.begin();
 			string::const_iterator end = token.end();