*
* LyX, The Document Processor
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-2000 The LyX Team.
+ * Copyright 1995-2001 The LyX Team.
*
- * This file is Copyright 1996-2000
+ * This file is Copyright 1996-2001
* Lars Gullik Bjønnes
*
* ======================================================
#include "support/path.h"
#include "support/LRegex.h"
#include "support/LSubstring.h"
+#include "support/lstrings.h"
#include "bufferlist.h"
-#include "minibuffer.h"
#include "gettext.h"
#include "lyx_gui_misc.h"
+#include "lyxfunc.h"
using std::ifstream;
using std::getline;
}
-int LaTeX::run(TeXErrors & terr, MiniBuffer * minib)
+int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
// 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
bibtex_info_old = scanAuxFiles(aux_file);
++count;
- lyxerr[Debug::LATEX] << "Run #" << count << endl;
- WriteStatus(minib, string(_("LaTeX run number ")) + tostr(count));
+ lyxerr[Debug::LATEX] << "Run #" << count << endl;
+ if (lfun) {
+ ostringstream str;
+ str << _("LaTeX run number") << ' ' << count;
+ lfun->dispatch(LFUN_MESSAGE, str.str().c_str());
+ }
+
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;
- 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;
- 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
<< "Dep. file has changed or rerun requested" << endl;
lyxerr[Debug::LATEX]
<< "Run #" << count << endl;
- WriteStatus(minib,
- string(_("LaTeX run number ")) + tostr(count));
+ if (lfun) {
+ ostringstream str;
+ str << _("LaTeX run number") << ' ' << count;
+ lfun->dispatch(LFUN_MESSAGE, str.str().c_str());
+ }
+
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;
- WriteStatus(minib, _("Running MakeIndex."));
+ if (lfun) {
+ lfun->dispatch(LFUN_MESSAGE, _("Running MakeIndex."));
+ }
+
rerun = runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx")));
}
rerun = false;
++count;
lyxerr[Debug::LATEX] << "Run #" << count << endl;
- WriteStatus(minib, string(_("LaTeX run number ")) + tostr(count));
+ if (lfun) {
+ ostringstream str;
+ str << _("LaTeX run number") << ' ' << count;
+ lfun->dispatch(LFUN_MESSAGE, str.str().c_str());
+ }
+
this->operator()();
scanres = scanLogFile(terr);
if (scanres & ERRORS) {
LRegex reg4("\\\\@input\\{([^}]+)\\}");
while (getline(ifs, token)) {
+ token = strip(token, '\r');
if (reg1.exact_match(token)) {
LRegex::SubMatches const & sub = reg1.exec(token);
string data = LSubstring(token, sub[1].first,
}
} 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, "! ")) {
// files used by the LaTeX run. The files are then entered into the
// dependency file.
- string logfile = OnlyFilename(ChangeExtension(file, ".log"));
+ string const logfile = OnlyFilename(ChangeExtension(file, ".log"));
- LRegex reg1(")* *\\(([^ \\)]+).*");
+ LRegex reg1("\\)* *\\(([^ )]+).*");
LRegex reg2("File: ([^ ]+).*");
LRegex reg3("No file ([^ ]+)\\..*");
LRegex reg4("\\\\openout[0-9]+.*=.*`([^ ]+)'\\..*");
string foundfile;
string token;
getline(ifs, token);
+ token = strip(token, '\r');
if (token.empty()) continue;
if (reg1.exact_match(token)) {
// On initial insert we want to do the update at once
// since this file can not be a file generated by
// the latex run.
- head.insert(foundfile, true);
+ if (FileInfo(foundfile).exist())
+ head.insert(foundfile, true);
}
// (2) foundfile is in the tmpdir
<< "Not a file or we are unable to find it."
<< endl;
}
+
+ // Make sure that the main .tex file is in the dependancy file.
+ head.insert(OnlyFilename(file), true);
}
projects / lyx.git / blobdiff