*/
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 ?
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
+ // still would like to output (export/view) the file.
+
// What files do we have to delete?
// This will at least make latex do all the runs
// 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;
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
LYXERR(Debug::LATEX, "Run #" << count);
message(runMessage(count));
- startscript();
+ int const exit_code = startscript();
+
scanres = scanLogFile(terr);
if (scanres & ERROR_RERUN) {
LYXERR(Debug::LATEX, "Rerunning LaTeX");
scanres = scanLogFile(terr);
}
- if (scanres & ERRORS) {
- deleteFilesOnError();
- return scanres; // return on error
- }
-
vector<AuxInfo> const bibtex_info = scanAuxFiles(aux_file);
if (!run_bibtex && bibtex_info_old != bibtex_info)
run_bibtex = true;
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
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
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
message(runMessage(count));
startscript();
scanres = scanLogFile(terr);
- if (scanres & ERRORS) {
- deleteFilesOnError();
- return scanres; // return on error
- }
// keep this updated
head.update();
// 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)
+ scanres |= NONZERO_ERROR;
+
LYXERR(Debug::LATEX, "Done.");
+
+ if (bscanres & ERRORS)
+ return bscanres; // return on error
+
return scanres;
}
+ quoteName(onlyFileName(file.toFilesystemEncoding()))
+ " > " + os::nulldev();
Systemcall one;
- return one.startscript(Systemcall::Wait, tmp, path);
+ return one.startscript(Systemcall::Wait, tmp, path, lpath);
}
tmp += quoteName(f);
tmp += params;
Systemcall one;
- one.startscript(Systemcall::Wait, tmp, path);
+ one.startscript(Systemcall::Wait, tmp, path, lpath);
return true;
}
tmp += " -o "
+ onlyFileName(changeExtension(file.toFilesystemEncoding(), nls));
Systemcall one;
- one.startscript(Systemcall::Wait, tmp, path);
+ one.startscript(Systemcall::Wait, tmp, path, lpath);
return true;
}
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;
if (!getline(ifs, tmp))
break;
tmp = rtrim(tmp, "\r");
- if (++count > 10)
+ // 15 is somewhat arbitrarily chosen, based on practice.
+ // We used 10 for 14 years and increased it to 15 when we
+ // saw one case.
+ if (++count > 15)
break;
} while (!prefixIs(tmp, "l."));
if (prefixIs(tmp, "l.")) {