X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeX.cpp;h=6063d807196c92f6a16dde7833e33b507c38aec3;hb=0e740018ff15aa005f024b0c4ebbf68079778b3b;hp=ed59181e4b75d9ebca5139335094e0c5cb83e163;hpb=cd8be655f1895957fb169cdf361297d9ecc40ec9;p=lyx.git

diff --git a/src/LaTeX.cpp b/src/LaTeX.cpp
index ed59181e4b..6063d80719 100644
--- a/src/LaTeX.cpp
+++ b/src/LaTeX.cpp
@@ -92,8 +92,9 @@ bool operator!=(AuxInfo const & a, AuxInfo const & o)
  */
 
 LaTeX::LaTeX(string const & latex, OutputParams const & rp,
-	     FileName const & f, string const & p)
-	: cmd(latex), file(f), path(p), runparams(rp), biber(false)
+	     FileName const & f, string const & p, string const & lp,
+	     bool const clean_start)
+	: cmd(latex), file(f), path(p), lpath(lp), runparams(rp), biber(false)
 {
 	num_errors = 0;
 	if (prefixIs(cmd, "pdf")) { // Do we use pdflatex ?
@@ -105,10 +106,12 @@ LaTeX::LaTeX(string const & latex, OutputParams const & rp,
 		output_file =
 			FileName(changeExtension(file.absFileName(), ".dvi"));
 	}
+	if (clean_start)
+		removeAuxiliaryFiles();
 }
 
 
-void LaTeX::deleteFilesOnError() const
+void LaTeX::removeAuxiliaryFiles() const
 {
 	// Note that we do not always call this function when there is an error.
 	// For example, if there is an error but an output file is produced we
@@ -145,6 +148,10 @@ void LaTeX::deleteFilesOnError() const
 	FileName const aux(changeExtension(file.absFileName(), ".aux"));
 	aux.removeFile();
 
+	// Also remove the .out file (e.g. hyperref bookmarks) (#9963)
+	FileName const out(changeExtension(file.absFileName(), ".out"));
+	out.removeFile();
+
 	// Remove the output file, which is often generated even if error
 	output_file.removeFile();
 }
@@ -158,6 +165,7 @@ int LaTeX::run(TeXErrors & terr)
 	// each time the .tex file changes.
 {
 	int scanres = NO_ERRORS;
+	int bscanres = NO_ERRORS;
 	unsigned int count = 0; // number of times run
 	num_errors = 0; // just to make sure.
 	unsigned int const MAX_RUN = 6;
@@ -168,8 +176,6 @@ int LaTeX::run(TeXErrors & terr)
 	theBufferList().updateIncludedTeXfiles(FileName::getcwd().absFileName(),
 		runparams);
 
-	// Never write the depfile if an error was encountered.
-
 	// 0
 	// first check if the file dependencies exist:
 	//     ->If it does exist
@@ -230,22 +236,16 @@ int LaTeX::run(TeXErrors & terr)
 	LYXERR(Debug::LATEX, "Run #" << count);
 	message(runMessage(count));
 
-	int const exit_code = startscript();
+	int exit_code = startscript();
 
 	scanres = scanLogFile(terr);
 	if (scanres & ERROR_RERUN) {
 		LYXERR(Debug::LATEX, "Rerunning LaTeX");
-		startscript();
+		terr.clearErrors();
+		exit_code = startscript();
 		scanres = scanLogFile(terr);
 	}
 
-	if (scanres & ERRORS) {
-		// We no longer run deleteFilesOnError() here
-		// because we now show a resulting PDF even if
-		// there was an error.
-		return scanres; // return on error
-	}
-
 	vector<AuxInfo> const bibtex_info = scanAuxFiles(aux_file);
 	if (!run_bibtex && bibtex_info_old != bibtex_info)
 		run_bibtex = true;
@@ -305,13 +305,8 @@ int LaTeX::run(TeXErrors & terr)
 		updateBibtexDependencies(head, bibtex_info);
 		rerun |= runBibTeX(bibtex_info, runparams);
 		FileName const blgfile(changeExtension(file.absFileName(), ".blg"));
-		if (blgfile.exists()) {
-			int bscanres = scanBlgFile(head, terr);
-			if (bscanres & ERRORS) {
-				deleteFilesOnError();
-				return bscanres; // return on error
-			}
-		}
+		if (blgfile.exists())
+			bscanres = scanBlgFile(head, terr);
 	} else if (!had_depfile) {
 		/// If we run pdflatex on the file after running latex on it,
 		/// then we do not need to run bibtex, but we do need to
@@ -339,10 +334,6 @@ int LaTeX::run(TeXErrors & terr)
 		message(runMessage(count));
 		startscript();
 		scanres = scanLogFile(terr);
-		if (scanres & ERRORS) {
-			deleteFilesOnError();
-			return scanres; // return on error
-		}
 
 		// update the depedencies
 		deplog(head); // reads the latex log
@@ -365,13 +356,8 @@ int LaTeX::run(TeXErrors & terr)
 		updateBibtexDependencies(head, bibtex_info);
 		rerun |= runBibTeX(bibtex_info, runparams);
 		FileName const blgfile(changeExtension(file.absFileName(), ".blg"));
-		if (blgfile.exists()) {
-			int bscanres = scanBlgFile(head, terr);
-			if (bscanres & ERRORS) {
-				deleteFilesOnError();
-				return bscanres; // return on error
-			}
-		}
+		if (blgfile.exists())
+			bscanres = scanBlgFile(head, terr);
 	}
 
 	// 4
@@ -418,10 +404,6 @@ int LaTeX::run(TeXErrors & terr)
 		message(runMessage(count));
 		startscript();
 		scanres = scanLogFile(terr);
-		if (scanres & ERRORS) {
-			deleteFilesOnError();
-			return scanres; // return on error
-		}
 
 		// keep this updated
 		head.update();
@@ -430,20 +412,18 @@ int LaTeX::run(TeXErrors & terr)
 	// Write the dependencies to file.
 	head.write(depfile);
 
-	if (scanres & NO_OUTPUT) {
-		// A previous run could have left a PDF and since
-		// no PDF is created if NO_OUTPUT, we remove any
-		// existing PDF and temporary files so that an
-		// incorrect PDF is not displayed, which could otherwise
-		// happen if View is run again because the checksum will
-		// be the same so any lingering PDF will be viewed.
-		deleteFilesOnError();
-	}
-
-	if (exit_code)
+	if (exit_code) {
+		// add flag here, just before return, instead of when exit_code
+		// is defined because scanres is sometimes overwritten above
+		// (e.g. rerun)
 		scanres |= NONZERO_ERROR;
+	}
 
 	LYXERR(Debug::LATEX, "Done.");
+
+	if (bscanres & ERRORS)
+		return bscanres; // return on error
+
 	return scanres;
 }
 
@@ -455,7 +435,7 @@ int LaTeX::startscript()
 		     + quoteName(onlyFileName(file.toFilesystemEncoding()))
 		     + " > " + os::nulldev();
 	Systemcall one;
-	return one.startscript(Systemcall::Wait, tmp, path);
+	return one.startscript(Systemcall::Wait, tmp, path, lpath);
 }
 
 
@@ -482,7 +462,7 @@ bool LaTeX::runMakeIndex(string const & f, OutputParams const & runparams,
 	tmp += quoteName(f);
 	tmp += params;
 	Systemcall one;
-	one.startscript(Systemcall::Wait, tmp, path);
+	one.startscript(Systemcall::Wait, tmp, path, lpath);
 	return true;
 }
 
@@ -498,7 +478,7 @@ bool LaTeX::runMakeIndexNomencl(FileName const & file,
 	tmp += " -o "
 		+ onlyFileName(changeExtension(file.toFilesystemEncoding(), nls));
 	Systemcall one;
-	one.startscript(Systemcall::Wait, tmp, path);
+	one.startscript(Systemcall::Wait, tmp, path, lpath);
 	return true;
 }
 
@@ -638,7 +618,7 @@ bool LaTeX::runBibTeX(vector<AuxInfo> const & bibtex_info,
 		tmp += quoteName(onlyFileName(removeExtension(
 				it->aux_file.absFileName())));
 		Systemcall one;
-		one.startscript(Systemcall::Wait, tmp, path);
+		one.startscript(Systemcall::Wait, tmp, path, lpath);
 	}
 	// Return whether bibtex was run
 	return result;
@@ -904,14 +884,22 @@ 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:")){
+			} 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),
-							 child_name);
+				terr.insertError(0,
+						 from_local8bit("pdfTeX Error"),
+						 from_local8bit(token),
+						 child_name);
+			} else if (prefixIs(token, "Missing character: There is no ")) {
+				// XeTeX/LuaTeX error about missing glyph in selected font
+				// (bug 9610)
+				retval |= LATEX_ERROR;
+				terr.insertError(0,
+						 from_local8bit("Missing glyphs!"),
+						 from_local8bit(token),
+						 child_name);
 			}
 		}
 	}