* \author Jean-Marc Lasgouttes
* \author Angus Leeming
* \author Dekel Tsur
+ * \author Jürgen Spitzmüller
*
* Full author contact details are available in file CREDITS.
*/
#include "support/os.h"
#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/path.hpp>
#include <boost/regex.hpp>
#include <fstream>
num_errors = 0;
if (prefixIs(cmd, "pdf")) { // Do we use pdflatex ?
depfile = FileName(file.absFilename() + ".dep-pdf");
- output_file = FileName(changeExtension(file.absFilename(), ".pdf"));
+ output_file =
+ FileName(changeExtension(file.absFilename(), ".pdf"));
} else {
depfile = FileName(file.absFilename() + ".dep");
- output_file = FileName(changeExtension(file.absFilename(), ".dvi"));
+ output_file =
+ FileName(changeExtension(file.absFilename(), ".dvi"));
}
}
// 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 each
- // time the .tex file changes.
+ // in it. However it seems safe to run latex (at least) on time
+ // each time the .tex file changes.
{
int scanres = NO_ERRORS;
unsigned int count = 0; // number of times run
bool rerun = false; // rerun requested
// The class LaTeX does not know the temp path.
- theBufferList().updateIncludedTeXfiles(getcwd().absFilename(), runparams);
+ theBufferList().updateIncludedTeXfiles(getcwd().absFilename(),
+ runparams);
// Never write the depfile if an error was encountered.
if (had_depfile) {
// Update the checksums
head.update();
- // Can't just check if anything has changed because it might have aborted
- // on error last time... in which cas we need to re-run latex
- // and collect the error messages (even if they are the same).
+ // Can't just check if anything has changed because it might
+ // have aborted on error last time... in which cas we need
+ // to re-run latex and collect the error messages
+ // (even if they are the same).
if (!fs::exists(output_file.toFilesystemEncoding())) {
lyxerr[Debug::DEPEND]
- << "re-running LaTeX because output file doesn't exist." << endl;
+ << "re-running LaTeX because output file doesn't exist."
+ << endl;
} else if (!head.sumchange()) {
lyxerr[Debug::DEPEND] << "return no_change" << endl;
return NO_CHANGE;
run_bibtex = true;
} else
lyxerr[Debug::DEPEND]
- << "Dependency file does not exist, or has wrong format" << endl;
+ << "Dependency file does not exist, or has wrong format"
+ << endl;
/// We scan the aux file even when had_depfile = false,
/// because we can run pdflatex on the file after running latex on it,
lyxerr[Debug::LATEX] << "Running MakeIndex." << endl;
message(_("Running MakeIndex."));
// onlyFilename() is needed for cygwin
- rerun |= runMakeIndex(onlyFilename(idxfile.absFilename()), runparams);
+ rerun |= runMakeIndex(onlyFilename(idxfile.absFilename()),
+ runparams);
}
if (head.haschanged(FileName(changeExtension(file.absFilename(), ".nlo")))) {
- lyxerr[Debug::LATEX] << "Running MakeIndex for nomencl." << endl;
+ lyxerr[Debug::LATEX]
+ << "Running MakeIndex for nomencl."
+ << endl;
message(_("Running MakeIndex for nomencl."));
// onlyFilename() is needed for cygwin
- string const nomenclstr = " -s nomencl.ist -o " + onlyFilename(changeExtension(file.toFilesystemEncoding(), ".nls"));
- rerun |= runMakeIndex(onlyFilename(changeExtension(file.absFilename(), ".nlo")), runparams, nomenclstr);
+ string const nomenclstr = " -s nomencl.ist -o "
+ + onlyFilename(changeExtension(
+ file.toFilesystemEncoding(), ".nls"));
+ rerun |= runMakeIndex(onlyFilename(changeExtension(
+ file.absFilename(), ".nlo")),
+ runparams,
+ nomenclstr);
}
// run bibtex
rerun = false;
++count;
lyxerr[Debug::DEPEND]
- << "Dep. file has changed or rerun requested" << endl;
+ << "Dep. file has changed or rerun requested"
+ << endl;
lyxerr[Debug::LATEX]
<< "Run #" << count << endl;
message(runMessage(count));
deplog(head); // reads the latex log
head.update();
} else {
- lyxerr[Debug::DEPEND] << "Dep. file has NOT changed" << endl;
+ lyxerr[Debug::DEPEND]
+ << "Dep. file has NOT changed"
+ << endl;
}
// 1.5
lyxerr[Debug::LATEX] << "Running MakeIndex." << endl;
message(_("Running MakeIndex."));
// onlyFilename() is needed for cygwin
- rerun = runMakeIndex(onlyFilename(changeExtension(file.absFilename(), ".idx")), runparams);
+ rerun = runMakeIndex(onlyFilename(changeExtension(
+ file.absFilename(), ".idx")), runparams);
}
- // I am not pretty sure if need this twice.
+ // I am not pretty sure if need this twice.
if (head.haschanged(FileName(changeExtension(file.absFilename(), ".nlo")))) {
- lyxerr[Debug::LATEX] << "Running MakeIndex for nomencl." << endl;
+ lyxerr[Debug::LATEX]
+ << "Running MakeIndex for nomencl."
+ << endl;
message(_("Running MakeIndex for nomencl."));
// onlyFilename() is needed for cygwin
- string nomenclstr = " -s nomencl.ist -o " + onlyFilename(changeExtension(file.toFilesystemEncoding(), ".nls"));
- rerun |= runMakeIndex(onlyFilename(changeExtension(file.absFilename(), ".nlo")), runparams, nomenclstr);
+ string nomenclstr = " -s nomencl.ist -o "
+ + onlyFilename(changeExtension(
+ file.toFilesystemEncoding(), ".nls"));
+ rerun |= runMakeIndex(onlyFilename(changeExtension(
+ file.absFilename(), ".nlo")),
+ runparams,
+ nomenclstr);
}
// 2
int LaTeX::startscript()
{
// onlyFilename() is needed for cygwin
- string tmp = cmd + ' ' + quoteName(onlyFilename(file.toFilesystemEncoding())) + " > " + os::nulldev();
+ string tmp = cmd + ' '
+ + quoteName(onlyFilename(file.toFilesystemEncoding()))
+ + " > " + os::nulldev();
Systemcall one;
return one.startscript(Systemcall::Wait, tmp);
}
string tmp = lyxrc.bibtex_command + " ";
// onlyFilename() is needed for cygwin
- tmp += quoteName(onlyFilename(removeExtension(it->aux_file.absFilename())));
+ tmp += quoteName(onlyFilename(removeExtension(
+ it->aux_file.absFilename())));
Systemcall one;
one.startscript(Systemcall::Wait, tmp);
}
int last_line = -1;
int line_count = 1;
int retval = NO_ERRORS;
- string tmp = onlyFilename(changeExtension(file.absFilename(), ".log"));
+ string tmp =
+ onlyFilename(changeExtension(file.absFilename(), ".log"));
lyxerr[Debug::LATEX] << "Log file: " << tmp << endl;
FileName const fn = FileName(makeAbsPath(tmp));
ifstream ifs(fn.toFilesystemEncoding().c_str());
if (prefixIs(tmp, "l.")) {
// we have a latex error
retval |= TEX_ERROR;
- if (contains(desc, "Package babel Error: You haven't defined the language"))
+ if (contains(desc,
+ "Package babel Error: You haven't defined the language"))
retval |= ERROR_RERUN;
// get the line number:
int line = 0;
// but it can include bits from the
// document, so whatever encoding we
// assume here it can be wrong.
- terr.insertError(line, from_local8bit(desc), from_local8bit(errstr));
+ terr.insertError(line,
+ from_local8bit(desc),
+ from_local8bit(errstr));
++num_errors;
}
}
namespace {
+/**
+ * Wrapper around fs::exists that can handle invalid file names.
+ * In theory we could test with fs::native whether a filename is valid
+ * before calling fs::exists, but in practice it is unusable: On windows it
+ * does not allow spaces, and on unix it does not allow absolute file names.
+ * This function has the disadvantage that it catches also other errors than
+ * invalid names, but for dependency checking we can live with that.
+ */
+bool exists(FileName const & possible_name) {
+ try {
+ return fs::exists(possible_name.toFilesystemEncoding());
+ }
+ catch (fs::filesystem_error const & fe) {
+ lyxerr[Debug::DEPEND] << "Got error `" << fe.what()
+ << "' while checking whether file `" << possible_name
+ << "' exists." << endl;
+ return false;
+ }
+}
+
+
+bool insertIfExists(FileName const & absname, DepTable & head)
+{
+ if (exists(absname) &&
+ !fs::is_directory(absname.toFilesystemEncoding())) {
+ head.insert(absname, true);
+ return true;
+ }
+ return false;
+}
+
+
bool handleFoundFile(string const & ff, DepTable & head)
{
// convert from native os path to unix path
// since this file cannot be a file generated by
// the latex run.
FileName absname(foundfile);
- if (fs::exists(absname.toFilesystemEncoding()) &&
- !fs::is_directory(absname.toFilesystemEncoding())) {
- head.insert(absname, true);
- return true;
- } else {
+ if (!insertIfExists(absname, head)) {
// check for spaces
string strippedfile = foundfile;
while (contains(strippedfile, " ")) {
+ // files with spaces are often enclosed in quotation
+ // marks; those have to be removed
+ string unquoted = subst(strippedfile, "\"", "");
+ absname.set(unquoted);
+ if (insertIfExists(absname, head))
+ return true;
// strip off part after last space and try again
string tmp = strippedfile;
string const stripoff =
rsplit(tmp, strippedfile, ' ');
absname.set(strippedfile);
- if (fs::exists(absname.toFilesystemEncoding()) &&
- !fs::is_directory(absname.toFilesystemEncoding())) {
- head.insert(absname, true);
+ if (insertIfExists(absname, head))
return true;
- }
}
}
}
FileName absname(makeAbsPath(onlyfile));
// check for spaces
- while (contains(foundfile, " ")) {
- if (fs::exists(absname.toFilesystemEncoding()))
+ while (contains(foundfile, ' ')) {
+ if (exists(absname))
// everything o.k.
break;
else {
+ // files with spaces are often enclosed in quotation
+ // marks; those have to be removed
+ string unquoted = subst(foundfile, "\"", "");
+ absname = makeAbsPath(unquoted);
+ if (exists(absname))
+ break;
// strip off part after last space and try again
string strippedfile;
- string const stripoff = rsplit(foundfile, strippedfile, ' ');
+ string const stripoff =
+ rsplit(foundfile, strippedfile, ' ');
foundfile = strippedfile;
onlyfile = onlyFilename(strippedfile);
absname = makeAbsPath(onlyfile);
// (2) foundfile is in the tmpdir
// insert it into head
- if (fs::exists(absname.toFilesystemEncoding())) {
+ if (exists(absname) &&
+ !fs::is_directory(absname.toFilesystemEncoding())) {
static regex unwanted("^.*\\.(aux|log|dvi|bbl|ind|glo)$");
if (regex_match(onlyfile, unwanted)) {
lyxerr[Debug::DEPEND]
void LaTeX::deplog(DepTable & head)
{
- // This function reads the LaTeX log file end extracts all the external
- // files used by the LaTeX run. The files are then entered into the
- // dependency file.
+ // This function reads the LaTeX log file end extracts all the
+ // external files used by the LaTeX run. The files are then
+ // entered into the dependency file.
- string const logfile = onlyFilename(changeExtension(file.absFilename(), ".log"));
+ string const logfile =
+ onlyFilename(changeExtension(file.absFilename(), ".log"));
static regex reg1("File: (.+).*");
static regex reg2("No file (.+)(.).*");
// Sometimes files are named by "File: xxx" only
// So I think we should use some regexps to find files instead.
// Note: all file names and paths might contains spaces.
-
bool found_file = false;
string token;
getline(ifs, token);
// We care for that and save suspicious lines.
// Here we exclude some cases where we are sure
// that there is no continued filename
- if (prefixIs(token, "File:") || prefixIs(token, "(Font)")
- || prefixIs(token, "Package:")
- || prefixIs(token, "Language:")
- || prefixIs(token, "LaTeX Font Info:")
- || prefixIs(token, "\\openout[")
- || prefixIs(token, "))"))
- lastline = string();
+ if (!lastline.empty()) {
+ static regex package_info("Package \\w+ Info: .*");
+ static regex package_warning("Package \\w+ Warning: .*");
+ if (prefixIs(token, "File:") || prefixIs(token, "(Font)")
+ || prefixIs(token, "Package:")
+ || prefixIs(token, "Language:")
+ || prefixIs(token, "LaTeX Info:")
+ || prefixIs(token, "LaTeX Font Info:")
+ || prefixIs(token, "\\openout[")
+ || prefixIs(token, "))")
+ || regex_match(token, package_info)
+ || regex_match(token, package_warning))
+ lastline = string();
+ }
if (!lastline.empty())
// probably a continued filename from last line
token = lastline + token;
+ if (token.length() > 255) {
+ // string too long. Cut off.
+ token.erase(0, token.length() - 251);
+ }
smatch sub;
projects / lyx.git / blobdiff