#include "BufferList.h"
#include "LaTeX.h"
-#include "gettext.h"
#include "LyXRC.h"
-#include "debug.h"
#include "DepTable.h"
-#include "support/filetools.h"
+#include "support/debug.h"
#include "support/convert.h"
+#include "support/FileName.h"
+#include "support/filetools.h"
+#include "support/gettext.h"
#include "support/lstrings.h"
-#include "support/lyxlib.h"
#include "support/Systemcall.h"
#include "support/os.h"
-#include <boost/filesystem/operations.hpp>
-#include <boost/filesystem/path.hpp>
#include <boost/regex.hpp>
#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;
-
+using namespace std;
+using namespace lyx::support;
namespace lyx {
-using support::absolutePath;
-using support::bformat;
-using support::changeExtension;
-using support::contains;
-using support::FileName;
-using support::findtexfile;
-using support::getcwd;
-using support::makeAbsPath;
-using support::onlyFilename;
-using support::prefixIs;
-using support::quoteName;
-using support::removeExtension;
-using support::rtrim;
-using support::rsplit;
-using support::split;
-using support::subst;
-using support::suffixIs;
-using support::Systemcall;
-using support::unlink;
-using support::trim;
-
namespace os = support::os;
-namespace fs = boost::filesystem;
// TODO: in no particular order
// - get rid of the call to
// What files do we have to delete?
// This will at least make latex do all the runs
- unlink(depfile);
+ depfile.removeFile();
// but the reason for the error might be in a generated file...
// bibtex file
FileName const bbl(changeExtension(file.absFilename(), ".bbl"));
- unlink(bbl);
+ bbl.removeFile();
// makeindex file
FileName const ind(changeExtension(file.absFilename(), ".ind"));
- unlink(ind);
+ ind.removeFile();
// nomencl file
FileName const nls(changeExtension(file.absFilename(), ".nls"));
- unlink(nls);
+ nls.removeFile();
// nomencl file (old version of the package)
FileName const gls(changeExtension(file.absFilename(), ".gls"));
- unlink(gls);
+ gls.removeFile();
// Also remove the aux file
FileName const aux(changeExtension(file.absFilename(), ".aux"));
- unlink(aux);
+ aux.removeFile();
}
bool rerun = false; // rerun requested
// The class LaTeX does not know the temp path.
- theBufferList().updateIncludedTeXfiles(getcwd().absFilename(),
+ theBufferList().updateIncludedTeXfiles(FileName::getcwd().absFilename(),
runparams);
// Never write the depfile if an error was encountered.
// 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"));
if (had_depfile) {
- LYXERR(Debug::DEPEND) << "Dependency file exists" << endl;
+ LYXERR(Debug::DEPEND, "Dependency file exists");
// Read the dep file:
had_depfile = head.read(depfile);
}
// 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;
+ if (!output_file.exists()) {
+ LYXERR(Debug::DEPEND,
+ "re-running LaTeX because output file doesn't exist.");
} else if (!head.sumchange()) {
- LYXERR(Debug::DEPEND) << "return no_change" << endl;
+ LYXERR(Debug::DEPEND, "return no_change");
return NO_CHANGE;
} else {
- LYXERR(Debug::DEPEND)
- << "Dependency file has changed" << endl;
+ LYXERR(Debug::DEPEND, "Dependency file has changed");
}
if (head.extchanged(".bib") || head.extchanged(".bst"))
run_bibtex = true;
} else
- LYXERR(Debug::DEPEND)
- << "Dependency file does not exist, or has wrong format"
- << endl;
+ LYXERR(Debug::DEPEND,
+ "Dependency file does not exist, or has wrong format");
/// We scan the aux file even when had_depfile = false,
/// because we can run pdflatex on the file after running latex on it,
bibtex_info_old = scanAuxFiles(aux_file);
++count;
- LYXERR(Debug::LATEX) << "Run #" << count << endl;
+ LYXERR(Debug::LATEX, "Run #" << count);
message(runMessage(count));
startscript();
scanres = scanLogFile(terr);
if (scanres & ERROR_RERUN) {
- LYXERR(Debug::LATEX) << "Rerunning LaTeX" << endl;
+ LYXERR(Debug::LATEX, "Rerunning LaTeX");
startscript();
scanres = scanLogFile(terr);
}
// 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() && idxfile.isFileEmpty();
// run makeindex
if (head.haschanged(idxfile)) {
// no checks for now
- LYXERR(Debug::LATEX) << "Running MakeIndex." << endl;
+ LYXERR(Debug::LATEX, "Running MakeIndex.");
message(_("Running MakeIndex."));
// onlyFilename() is needed for cygwin
rerun |= runMakeIndex(onlyFilename(idxfile.absFilename()),
// "\bibdata" and/or "\bibstyle". If one of those
// tags is found -> run bibtex and set rerun = true;
// no checks for now
- LYXERR(Debug::LATEX) << "Running BibTeX." << endl;
+ LYXERR(Debug::LATEX, "Running BibTeX.");
message(_("Running BibTeX."));
updateBibtexDependencies(head, bibtex_info);
rerun |= runBibTeX(bibtex_info);
if (rerun || head.sumchange()) {
rerun = false;
++count;
- LYXERR(Debug::DEPEND)
- << "Dep. file has changed or rerun requested"
- << endl;
- LYXERR(Debug::LATEX)
- << "Run #" << count << endl;
+ LYXERR(Debug::DEPEND, "Dep. file has changed or rerun requested");
+ LYXERR(Debug::LATEX, "Run #" << count);
message(runMessage(count));
startscript();
scanres = scanLogFile(terr);
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");
}
// 1.5
// run makeindex if the <file>.idx has changed or was generated.
if (head.haschanged(idxfile)) {
// no checks for now
- LYXERR(Debug::LATEX) << "Running MakeIndex." << endl;
+ LYXERR(Debug::LATEX, "Running MakeIndex.");
message(_("Running MakeIndex."));
// onlyFilename() is needed for cygwin
rerun = runMakeIndex(onlyFilename(changeExtension(
// MAX_RUNS are reached.
rerun = false;
++count;
- LYXERR(Debug::LATEX) << "Run #" << count << endl;
+ LYXERR(Debug::LATEX, "Run #" << count);
message(runMessage(count));
startscript();
scanres = scanLogFile(terr);
// Write the dependencies to file.
head.write(depfile);
- LYXERR(Debug::LATEX) << "Done." << endl;
+ LYXERR(Debug::LATEX, "Done.");
return scanres;
}
bool LaTeX::runMakeIndex(string const & f, OutputParams const & runparams,
string const & params)
{
- LYXERR(Debug::LATEX)
- << "idx file has been made, running makeindex on file "
- << f << endl;
+ LYXERR(Debug::LATEX,
+ "idx file has been made, running makeindex on file " << f);
string tmp = lyxrc.index_command + ' ';
tmp = subst(tmp, "$$lang", runparams.document_language);
OutputParams const & runparams,
string const & nlo, string const & nls)
{
- LYXERR(Debug::LATEX) << "Running MakeIndex for nomencl." << endl;
+ LYXERR(Debug::LATEX, "Running MakeIndex for nomencl.");
message(_("Running MakeIndex for nomencl."));
// onlyFilename() is needed for cygwin
string const nomenclstr = " -s nomencl.ist -o "
FileName const file2(basename
+ '.' + convert<string>(i)
+ ".aux");
- if (!fs::exists(file2.toFilesystemEncoding()))
+ if (!file2.exists())
break;
result.push_back(scanAuxFile(file2));
}
void LaTeX::scanAuxFile(FileName const & file, Aux_Info & aux_info)
{
- LYXERR(Debug::LATEX) << "Scanning aux file: " << file << endl;
+ LYXERR(Debug::LATEX, "Scanning aux file: " << file);
ifstream ifs(file.toFilesystemEncoding().c_str());
string token;
while (!data.empty()) {
string citation;
data = split(data, citation, ',');
- LYXERR(Debug::LATEX) << "Citation: "
- << citation << endl;
+ LYXERR(Debug::LATEX, "Citation: " << citation);
aux_info.citations.insert(citation);
}
} else if (regex_match(token, sub, reg2)) {
string database;
data = split(data, database, ',');
database = changeExtension(database, "bib");
- LYXERR(Debug::LATEX) << "BibTeX database: `"
- << database << '\'' << endl;
+ LYXERR(Debug::LATEX, "BibTeX database: `" << database << '\'');
aux_info.databases.insert(database);
}
} else if (regex_match(token, sub, reg3)) {
// token is now the style file
// pass it to the helper
style = changeExtension(style, "bst");
- LYXERR(Debug::LATEX) << "BibTeX style: `"
- << style << '\'' << endl;
+ LYXERR(Debug::LATEX, "BibTeX style: `" << style << '\'');
aux_info.styles.insert(style);
} else if (regex_match(token, sub, reg4)) {
string const file2 = sub.str(1);
int retval = NO_ERRORS;
string tmp =
onlyFilename(changeExtension(file.absFilename(), ".log"));
- LYXERR(Debug::LATEX) << "Log file: " << tmp << endl;
+ LYXERR(Debug::LATEX, "Log file: " << tmp);
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;
+ LYXERR(Debug::LATEX, "Log line: " << token);
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
// types of warnings
retval |= LATEX_WARNING;
- LYXERR(Debug::LATEX) << "LaTeX Warning." << endl;
+ LYXERR(Debug::LATEX, "LaTeX Warning.");
if (contains(token, "Rerun to get cross-references")) {
retval |= RERUN;
- LYXERR(Debug::LATEX)
- << "We should rerun." << endl;
+ LYXERR(Debug::LATEX, "We should rerun.");
+ // package clefval needs 2 latex runs before bibtex
+ } else if (contains(token, "Value of")
+ && contains(token, "on page")
+ && contains(token, "undefined")) {
+ retval |= ERROR_RERUN;
+ LYXERR(Debug::LATEX, "Force rerun.");
} else if (contains(token, "Citation")
&& contains(token, "on page")
&& contains(token, "undefined")) {
contains(token, "Rerun to get")) {
// at least longtable.sty and bibtopic.sty
// might use this.
- LYXERR(Debug::LATEX)
- << "We should rerun." << endl;
+ LYXERR(Debug::LATEX, "We should rerun.");
retval |= RERUN;
}
} else if (token[0] == '(') {
if (contains(token, "Rerun LaTeX") ||
contains(token, "Rerun to get")) {
// Used by natbib
- LYXERR(Debug::LATEX)
- << "We should rerun." << endl;
+ LYXERR(Debug::LATEX, "We should rerun.");
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
errstr += "\n";
getline(ifs, tmp);
}
- LYXERR(Debug::LATEX)
- << "line: " << line << '\n'
- << "Desc: " << desc << '\n'
- << "Text: " << errstr << endl;
+ LYXERR(Debug::LATEX, "line: " << line << '\n'
+ << "Desc: " << desc << '\n' << "Text: " << errstr);
if (line == last_line)
++line_count;
else {
}
}
}
- LYXERR(Debug::LATEX) << "Log line: " << token << endl;
+ LYXERR(Debug::LATEX, "Log line: " << token);
return retval;
}
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;
}
// convert from native os path to unix path
string foundfile = os::internal_path(trim(ff));
- LYXERR(Debug::DEPEND) << "Found file: " << foundfile << endl;
+ LYXERR(Debug::DEPEND, "Found file: " << foundfile);
// Ok now we found a file.
// Now we should make sure that this is a file that we can
// (1) foundfile is an
// absolute path and should
// be inserted.
- if (absolutePath(foundfile)) {
- LYXERR(Debug::DEPEND) << "AbsolutePath file: "
- << foundfile << endl;
+ FileName absname(foundfile);
+ if (absname.isAbsolute()) {
+ LYXERR(Debug::DEPEND, "AbsolutePath file: " << foundfile);
// On initial insert we want to do the update at once
// since this file cannot be a file generated by
// the latex run.
- FileName absname(foundfile);
if (!insertIfExists(absname, head)) {
// check for spaces
string strippedfile = foundfile;
}
string onlyfile = onlyFilename(foundfile);
- FileName absname(makeAbsPath(onlyfile));
+ absname = makeAbsPath(onlyfile);
// 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");
} 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);
head.insert(absname, true);
} else {
- LYXERR(Debug::DEPEND)
- << "In tmpdir file:"
- << onlyfile
- << endl;
+ LYXERR(Debug::DEPEND, "In tmpdir file:" << onlyfile);
head.insert(absname);
}
return true;
} else {
- LYXERR(Debug::DEPEND)
- << "Not a file or we are unable to find it."
- << endl;
+ LYXERR(Debug::DEPEND, "Not a file or we are unable to find it.");
return false;
}
}
bool checkLineBreak(string const & ff, DepTable & head)
{
- if (contains(ff, '.'))
- // if we have a dot, we let handleFoundFile decide
- return handleFoundFile(ff, head);
- else
- // else, we suspect a line break
+ if (!contains(ff, '.'))
return false;
+
+ // if we have a dot, we let handleFoundFile decide
+ return handleFoundFile(ff, head);
}
} // anon namespace
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) {
// 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:")
projects / lyx.git / blobdiff