#include <fstream>
+using boost::regex;
+using boost::smatch;
+
+#ifndef CXX_GLOBAL_CSTD
+using std::sscanf;
+#endif
+
+using std::endl;
+using std::getline;
+using std::string;
+using std::ifstream;
+using std::set;
+using std::vector;
+
namespace lyx {
namespace os = support::os;
namespace fs = boost::filesystem;
-using boost::regex;
-using boost::smatch;
-
-
-#ifndef CXX_GLOBAL_CSTD
-using std::sscanf;
-#endif
-
-using std::endl;
-using std::getline;
-using std::string;
-using std::ifstream;
-using std::set;
-using std::vector;
-
// TODO: in no particular order
// - get rid of the call to
// BufferList::updateIncludedTeXfiles, this should either
// remake the dependency file.
//
- bool had_depfile = fs::exists(depfile.toFilesystemEncoding());
+ bool had_depfile = depfile.exists();
bool run_bibtex = false;
FileName const aux_file(changeExtension(file.absFilename(), "aux"));
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
+ // to re-run latex and collect the error messages
// (even if they are the same).
- if (!fs::exists(output_file.toFilesystemEncoding())) {
+ if (!output_file.exists()) {
LYXERR(Debug::DEPEND)
<< "re-running LaTeX because output file doesn't exist."
<< endl;
// memoir (at least) writes an empty *idx file in the first place.
// A second latex run is needed.
FileName const idxfile(changeExtension(file.absFilename(), ".idx"));
- rerun = fs::exists(idxfile.toFilesystemEncoding()) &&
- fs::is_empty(idxfile.toFilesystemEncoding());
+ rerun = idxfile.exists() && fs::is_empty(idxfile.toFilesystemEncoding());
// run makeindex
if (head.haschanged(idxfile)) {
bool LaTeX::runMakeIndex(string const & f, OutputParams const & runparams,
- string const & params)
+ string const & params)
{
LYXERR(Debug::LATEX)
<< "idx file has been made, running makeindex on file "
<< f << endl;
string tmp = lyxrc.index_command + ' ';
-
+
tmp = subst(tmp, "$$lang", runparams.document_language);
tmp += quoteName(f);
tmp += params;
FileName const file2(basename
+ '.' + convert<string>(i)
+ ".aux");
- if (!fs::exists(file2.toFilesystemEncoding()))
+ if (!file2.exists())
break;
result.push_back(scanAuxFile(file2));
}
LYXERR(Debug::LATEX) << "Log file: " << tmp << endl;
FileName const fn = FileName(makeAbsPath(tmp));
ifstream ifs(fn.toFilesystemEncoding().c_str());
+ bool fle_style = false;
+ static regex file_line_error(".+\\.\\D+:[0-9]+: (.+)");
string token;
while (getline(ifs, token)) {
// \r's afterwards, since we need to remove them anyway.
token = subst(token, '\0', '\r');
token = subst(token, "\r", "");
+ smatch sub;
LYXERR(Debug::LATEX) << "Log line: " << token << endl;
if (token.empty())
continue;
+ if (contains(token, "file:line:error style messages enabled"))
+ fle_style = true;
+
if (prefixIs(token, "LaTeX Warning:") ||
prefixIs(token, "! pdfTeX warning")) {
// Here shall we handle different
<< "We should rerun." << endl;
retval |= RERUN;
}
- } else if (prefixIs(token, "! ")) {
- // Ok, we have something that looks like a TeX Error
- // but what do we really have.
+ } else if (prefixIs(token, "! ") ||
+ fle_style && regex_match(token, sub, file_line_error)) {
+ // Ok, we have something that looks like a TeX Error
+ // but what do we really have.
// Just get the error description:
- string desc(token, 2);
+ string desc;
+ if (prefixIs(token, "! "))
+ desc = string(token, 2);
+ else if (fle_style)
+ desc = sub.str();
if (contains(token, "LaTeX Error:"))
retval |= LATEX_ERROR;
// get the next line
// we have a latex error
retval |= TEX_ERROR;
if (contains(desc,
- "Package babel Error: You haven't defined the language"))
+ "Package babel Error: You haven't defined the language") ||
+ contains(desc,
+ "Package babel Error: You haven't loaded the option"))
retval |= ERROR_RERUN;
// get the line number:
int line = 0;
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())) {
+ if (absname.exists() && !absname.isDirectory()) {
head.insert(absname, true);
return true;
}
// check for spaces
while (contains(foundfile, ' ')) {
- if (exists(absname))
+ if (absname.exists())
// everything o.k.
break;
else {
// marks; those have to be removed
string unquoted = subst(foundfile, "\"", "");
absname = makeAbsPath(unquoted);
- if (exists(absname))
+ if (absname.exists())
break;
// strip off part after last space and try again
string strippedfile;
// (2) foundfile is in the tmpdir
// insert it into head
- if (exists(absname) &&
- !fs::is_directory(absname.toFilesystemEncoding())) {
+ if (absname.exists() && !absname.isDirectory()) {
// FIXME: This regex contained glo, but glo is used by the old
// version of nomencl.sty. Do we need to put it back?
- static regex unwanted("^.*\\.(aux|log|dvi|bbl|ind)$");
+ static regex const unwanted("^.*\\.(aux|log|dvi|bbl|ind)$");
if (regex_match(onlyfile, unwanted)) {
- LYXERR(Debug::DEPEND)
- << "We don't want "
- << onlyfile
- << " in the dep file"
- << endl;
+ LYXERR(Debug::DEPEND) << "We don't want " << onlyfile
+ << " in the dep file" << endl;
} else if (suffixIs(onlyfile, ".tex")) {
// This is a tex file generated by LyX
// and latex is not likely to change this
// during its runs.
- LYXERR(Debug::DEPEND)
- << "Tmpdir TeX file: "
- << onlyfile
- << endl;
+ LYXERR(Debug::DEPEND) << "Tmpdir TeX file: " << onlyfile << endl;
head.insert(absname, true);
} else {
- LYXERR(Debug::DEPEND)
- << "In tmpdir file:"
- << onlyfile
- << endl;
+ LYXERR(Debug::DEPEND) << "In tmpdir file:" << onlyfile << endl;
head.insert(absname);
}
return true;
} else {
LYXERR(Debug::DEPEND)
- << "Not a file or we are unable to find it."
- << endl;
+ << "Not a file or we are unable to find it." << endl;
return false;
}
}
string const logfile =
onlyFilename(changeExtension(file.absFilename(), ".log"));
- static regex reg1("File: (.+).*");
- static regex reg2("No file (.+)(.).*");
- static regex reg3("\\\\openout[0-9]+.*=.*`(.+)(..).*");
+ static regex const reg1("File: (.+).*");
+ static regex const reg2("No file (.+)(.).*");
+ static regex const reg3("\\\\openout[0-9]+.*=.*`(.+)(..).*");
// If an index should be created, MikTex does not write a line like
// \openout# = 'sample.idx'.
// but instead only a line like this into the log:
// Writing index file sample.idx
- static regex reg4("Writing index file (.+).*");
+ static regex const reg4("Writing index file (.+).*");
// files also can be enclosed in <...>
- static regex reg5("<([^>]+)(.).*");
- static regex regoldnomencl("Writing glossary file (.+).*");
- static regex regnomencl("Writing nomenclature file (.+).*");
+ static regex const reg5("<([^>]+)(.).*");
+ static regex const regoldnomencl("Writing glossary file (.+).*");
+ static regex const regnomencl("Writing nomenclature file (.+).*");
// If a toc should be created, MikTex does not write a line like
// \openout# = `sample.toc'.
// but only a line like this into the log:
// \tf@toc=\write#
// This line is also written by tetex.
// This line is not present if no toc should be created.
- static regex miktexTocReg("\\\\tf@toc=\\\\write.*");
- static regex reg6(".*\\([^)]+.*");
+ static regex const miktexTocReg("\\\\tf@toc=\\\\write.*");
+ static regex const reg6(".*\\([^)]+.*");
- FileName const fn(makeAbsPath(logfile));
+ FileName const fn = makeAbsPath(logfile);
ifstream ifs(fn.toFilesystemEncoding().c_str());
string lastline;
while (ifs) {
// Sometimes, filenames are broken across lines.
// We care for that and save suspicious lines.
- // Here we exclude some cases where we are sure
+ // Here we exclude some cases where we are sure
// that there is no continued filename
if (!lastline.empty()) {
- static regex package_info("Package \\w+ Info: .*");
- static regex package_warning("Package \\w+ Warning: .*");
+ static regex const package_info("Package \\w+ Info: .*");
+ static regex const package_warning("Package \\w+ Warning: .*");
if (prefixIs(token, "File:") || prefixIs(token, "(Font)")
|| prefixIs(token, "Package:")
|| prefixIs(token, "Language:")
found_file = false;
// (6) "Writing nomenclature file file.ext"
} else if (regex_match(token, sub, regnomencl) ||
- regex_match(token, sub, regoldnomencl))
+ regex_match(token, sub, regoldnomencl))
// check for dot
found_file = checkLineBreak(sub.str(1), head);
// (7) "\tf@toc=\write<nr>" (for MikTeX)
projects / lyx.git / blobdiff