#endif
#include <fstream>
-#include "support/filetools.h"
#include "LaTeX.h"
-#include "support/FileInfo.h"
-#include "debug.h"
-#include "support/lyxlib.h"
-#include "support/syscall.h"
-#include "support/syscontr.h"
-#include "support/path.h"
-#include "support/LRegex.h"
-#include "support/LSubstring.h"
#include "bufferlist.h"
#include "gettext.h"
-#include "lyx_gui_misc.h"
#include "lyxfunc.h"
+#include "debug.h"
+#include "support/filetools.h"
+#include "support/FileInfo.h"
+#include "support/LRegex.h"
+#include "support/LSubstring.h"
+#include "support/lstrings.h"
+#include "support/lyxlib.h"
+#include "support/systemcall.h"
+#include "support/os.h"
+#include "support/path.h"
+#include <cstdio> // sscanf
using std::ifstream;
using std::getline;
{
num_errors = 0;
depfile = file + ".dep";
- if (prefixIs(cmd, "pdf")) // Do we use pdflatex ?
+ if (prefixIs(cmd, "pdf")) { // Do we use pdflatex ?
depfile += "-pdf";
+ output_file = ChangeExtension(file,".pdf");
+ } else {
+ output_file = ChangeExtension(file,".dvi");
+ }
}
head.read(depfile);
// Update the checksums
head.update();
- if (!head.sumchange()) {
+ // 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 (!FileInfo(output_file).exist()) {
+ lyxerr[Debug::DEPEND]
+ << "re-running LaTeX because output file doesn't exist." << endl;
+ } else if (!head.sumchange()) {
lyxerr[Debug::DEPEND] << "return no_change" << endl;
return NO_CHANGE;
+ } else {
+ lyxerr[Debug::DEPEND]
+ << "Dependency file has changed" << endl;
}
- lyxerr[Debug::DEPEND]
- << "Dependency file has changed" << endl;
if (head.extchanged(".bib") || head.extchanged(".bst"))
run_bibtex = true;
if (lfun) {
ostringstream str;
str << _("LaTeX run number") << ' ' << count;
- lfun->Dispatch(LFUN_MESSAGE, str.str().c_str());
+ lfun->dispatch(LFUN_MESSAGE, str.str().c_str());
}
-
- //WriteStatus(lfun, string(_("LaTeX run number ")) + tostr(count));
this->operator()();
scanres = scanLogFile(terr);
if (scanres & ERROR_RERUN) {
if (head.haschanged(OnlyFilename(ChangeExtension(file, ".idx")))) {
// no checks for now
lyxerr[Debug::LATEX] << "Running MakeIndex." << endl;
- if (lfun) lfun->Dispatch(LFUN_MESSAGE, _("Running MakeIndex."));
-// WriteStatus(minib, _("Running MakeIndex."));
+ if (lfun) {
+ lfun->dispatch(LFUN_MESSAGE, _("Running MakeIndex."));
+ }
+
rerun = runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx")));
}
// tags is found -> run bibtex and set rerun = true;
// no checks for now
lyxerr[Debug::LATEX] << "Running BibTeX." << endl;
- if (lfun) lfun->Dispatch(LFUN_MESSAGE, _("Running BibTeX."));
- //WriteStatus(minib, _("Running BibTeX."));
+ if (lfun) {
+ lfun->dispatch(LFUN_MESSAGE, _("Running BibTeX."));
+ }
+
updateBibtexDependencies(head, bibtex_info);
rerun |= runBibTeX(bibtex_info);
- } else if (!had_depfile)
+ } 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
/// insert the .bib and .bst files into the .dep-pdf file.
updateBibtexDependencies(head, bibtex_info);
+ }
// 1
// we know on this point that latex has been run once (or we just
if (lfun) {
ostringstream str;
str << _("LaTeX run number") << ' ' << count;
- lfun->Dispatch(LFUN_MESSAGE, str.str().c_str());
+ lfun->dispatch(LFUN_MESSAGE, str.str().c_str());
}
-// WriteStatus(minib,
-// string(_("LaTeX run number ")) + tostr(count));
this->operator()();
scanres = scanLogFile(terr);
if (scanres & ERRORS) {
if (head.haschanged(OnlyFilename(ChangeExtension(file, ".idx")))) {
// no checks for now
lyxerr[Debug::LATEX] << "Running MakeIndex." << endl;
- if (lfun) lfun->Dispatch(LFUN_MESSAGE, _("Running MakeIndex."));
- //WriteStatus(minib, _("Running MakeIndex."));
+ if (lfun) {
+ lfun->dispatch(LFUN_MESSAGE, _("Running MakeIndex."));
+ }
+
rerun = runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx")));
}
if (lfun) {
ostringstream str;
str << _("LaTeX run number") << ' ' << count;
- lfun->Dispatch(LFUN_MESSAGE, str.str().c_str());
+ lfun->dispatch(LFUN_MESSAGE, str.str().c_str());
}
-// WriteStatus(minib, string(_("LaTeX run number ")) + tostr(count));
this->operator()();
scanres = scanLogFile(terr);
if (scanres & ERRORS) {
#else // cmd.exe (OS/2) causes SYS0003 error at "/dev/null"
string tmp = cmd + ' ' + file + " > nul";
#endif
- Systemcalls one;
- return one.startscript(Systemcalls::System, tmp);
+ Systemcall one;
+ return one.startscript(Systemcall::Wait, tmp);
}
// to come for a later time. (0.13 perhaps?)
string tmp = "makeindex -c -q ";
tmp += f;
- Systemcalls one;
- one.startscript(Systemcalls::System, tmp);
+ Systemcall one;
+ one.startscript(Systemcall::Wait, tmp);
return true;
}
// remove all ".bib" and ".bst" files.
dep.remove_files_with_extension(".bib");
dep.remove_files_with_extension(".bst");
- string aux = OnlyFilename(ChangeExtension(file, ".aux"));
+ //string aux = OnlyFilename(ChangeExtension(file, ".aux"));
for (vector<Aux_Info>::const_iterator it = bibtex_info.begin();
it != bibtex_info.end(); ++it) {
string tmp = "bibtex ";
tmp += OnlyFilename(ChangeExtension(it->aux_file, string()));
- Systemcalls one;
- one.startscript(Systemcalls::System, tmp);
+ Systemcall one;
+ one.startscript(Systemcall::Wait, tmp);
}
// Return whether bibtex was run
return result;
}
} else if (contains(token, "run BibTeX")) {
retval |= UNDEF_CIT;
- } else if (contains(token, "Rerun LaTeX.")) {
- // at least longtable.sty might use this.
+ } else if (contains(token, "Rerun LaTeX") ||
+ contains(token, "Rerun to get")) {
+ // at least longtable.sty and bibtopic.sty
+ // might use this.
+ lyxerr[Debug::LATEX]
+ << "We should rerun." << endl;
+ retval |= RERUN;
+ }
+ } else if (prefixIs(token, "(")) {
+ if (contains(token, "Rerun LaTeX") ||
+ contains(token, "Rerun to get")) {
+ // Used by natbib
+ lyxerr[Debug::LATEX]
+ << "We should rerun." << endl;
retval |= RERUN;
}
} else if (prefixIs(token, "! ")) {
LRegex reg2("File: ([^ ]+).*");
LRegex reg3("No file ([^ ]+)\\..*");
LRegex reg4("\\\\openout[0-9]+.*=.*`([^ ]+)'\\..*");
+ // If an index should be created, MikTex does not write a line like
+ // \openout# = 'sample,idx'.
+ // but intstead only a line like this into the log:
+ // Writing index file sample.idx
+ LRegex reg5("Writing index file ([^ ]+).*");
LRegex unwanted("^.*\\.(aux|log|dvi|bbl|ind|glo)$");
ifstream ifs(logfile.c_str());
LRegex::SubMatches const & sub = reg4.exec(token);
foundfile = LSubstring(token, sub[1].first,
sub[1].second);
+ } else if (reg5.exact_match(token)) {
+ LRegex::SubMatches const & sub = reg5.exec(token);
+ foundfile = LSubstring(token, sub[1].first,
+ sub[1].second);
} else {
continue;
}
+ // convert from native os path to unix path
+ foundfile = os::internal_path(foundfile);
+
lyxerr[Debug::DEPEND] << "Found file: "
<< foundfile << endl;
projects / lyx.git / blobdiff