X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeX.cpp;h=ce3d73eef2171ade4a6208e7ec64f3f7c2d00526;hb=110445e3e2fe9beab1c38d2806cfd126dae967a9;hp=e88184bc907e0819d306ad9427b0ec30bc6be4c4;hpb=715b8cda54a2aded29260b57ff201b16fd906f21;p=lyx.git

diff --git a/src/LaTeX.cpp b/src/LaTeX.cpp
index e88184bc90..ce3d73eef2 100644
--- a/src/LaTeX.cpp
+++ b/src/LaTeX.cpp
@@ -15,10 +15,11 @@
 
 #include <config.h>
 
+#include "LaTeX.h"
+
 #include "Buffer.h"
 #include "BufferList.h"
 #include "BufferParams.h"
-#include "LaTeX.h"
 #include "LyXRC.h"
 #include "LyX.h"
 #include "DepTable.h"
@@ -26,6 +27,7 @@
 #include "Language.h"
 
 #include "support/debug.h"
+#include "support/docstring.h"
 #include "support/convert.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
@@ -34,9 +36,8 @@
 #include "support/Systemcall.h"
 #include "support/os.h"
 
-#include "support/regex.h"
-
 #include <fstream>
+#include <regex>
 #include <stack>
 
 
@@ -134,6 +135,7 @@ LaTeX::LaTeX(string const & latex, OutputParams const & rp,
 
 void LaTeX::removeAuxiliaryFiles() const
 {
+	LYXERR(Debug::LATEX, "Removing auxiliary files");
 	// 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
 	// still would like to output (export/view) the file.
@@ -766,7 +768,7 @@ bool LaTeX::runBibTeX(vector<AuxInfo> const & bibtex_info,
 				it->aux_file.absFileName())));
 		Systemcall one;
 		Systemcall::Starttype const starttype = 
-	        allow_cancel ? Systemcall::WaitLoop : Systemcall::Wait;
+			allow_cancel ? Systemcall::WaitLoop : Systemcall::Wait;
 		exit_code = one.startscript(starttype, tmp, path, lpath, true);
 		if (exit_code) {
 			return result;
@@ -793,7 +795,7 @@ int LaTeX::scanLogFile(TeXErrors & terr)
 	string tmp =
 		onlyFileName(changeExtension(file.absFileName(), ".log"));
 	LYXERR(Debug::LATEX, "Log file: " << tmp);
-	FileName const fn = FileName(makeAbsPath(tmp));
+	FileName const fn = makeAbsPath(tmp);
 	// FIXME we should use an ifdocstream here and a docstring for token
 	// below. The encoding of the log file depends on the _output_ (font)
 	// encoding of the TeX file (T1, TU etc.). See #10728.
@@ -1625,10 +1627,9 @@ int LaTeX::scanBlgFile(DepTable & dep, TeXErrors & terr)
 		} else if (regex_match(token, sub, biberError)) {
 			retval |= BIBTEX_ERROR;
 			string errstr = N_("Biber error: ") + sub.str(2);
-			string msg = token;
 			terr.insertError(0,
 					 from_local8bit(errstr),
-					 from_local8bit(msg));
+					 from_local8bit(token));
 		}
 		prevtoken = token;
 	}
@@ -1662,10 +1663,9 @@ int LaTeX::scanIlgFile(TeXErrors & terr)
 		} else if (prefixIs(token, "ERROR: ")) {
 			retval |= BIBTEX_ERROR;
 			string errstr = N_("Xindy error: ") + token.substr(6);
-			string msg = token;
 			terr.insertError(0,
 					 from_local8bit(errstr),
-					 from_local8bit(msg));
+					 from_local8bit(token));
 		}
 	}
 	return retval;