/* This file is part of
- * ======================================================
+ * ======================================================
*
* LyX, The Document Processor
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-1999 The LyX Team.
+ * Copyright 1995-2000 The LyX Team.
*
- * This file is Copyright 1996-1999
+ * This file is Copyright 1996-2000
* Lars Gullik Bjønnes
*
- * ======================================================
+ * ======================================================
*/
#include <config.h>
-#include <cstdio>
-#include <cstdlib>
-
#ifdef __GNUG__
#pragma implementation
#endif
+#include <fstream>
#include "support/filetools.h"
#include "LaTeX.h"
-#include "lyxlex.h"
#include "support/FileInfo.h"
#include "debug.h"
#include "support/lyxlib.h"
#include "support/syscall.h"
#include "support/syscontr.h"
-#include "pathstack.h"
+#include "support/path.h"
+#include "support/LRegex.h"
+#include "support/LSubstring.h"
#include "bufferlist.h"
#include "minibuffer.h"
#include "gettext.h"
+#include "lyx_gui_misc.h"
+
+using std::ifstream;
+using std::getline;
+using std::endl;
+
+// TODO: in no particular order
+// - get rid of the extern BufferList and the call to
+// BufferList::updateIncludedTeXfiles, this should either
+// be done before calling LaTeX::funcs or in a completely
+// different way.
+// - the bibtex command options should be supported.
+// - the makeindex style files should be taken care of with
+// the dependency mechanism.
+// - makeindex commandline options should be supported
+// - somewhere support viewing of bibtex and makeindex log files.
+// - we should perhaps also scan the bibtex log file
+// - we should perhaps also scan the bibtex log file
extern BufferList bufferlist;
-struct texfile_struct {
- LaTeX::TEX_FILES file;
- char const *extension;
-};
-
-static
-const texfile_struct all_files[] = {
- { LaTeX::AUX, ".aux"},
- { LaTeX::BBL, ".bbl"},
- { LaTeX::DVI, ".dvi"},
- { LaTeX::GLO, ".glo"},
- { LaTeX::IDX, ".idx"},
- { LaTeX::IND, ".ind"},
- { LaTeX::LOF, ".lof"},
- { LaTeX::LOA, ".loa"},
- { LaTeX::LOG, ".log"},
- { LaTeX::LOT, ".lot"},
- { LaTeX::TOC, ".toc"},
- { LaTeX::LTX, ".ltx"},
- { LaTeX::TEX, ".tex"}
-};
-
-// This should perhaps be placed in LyXLex
-static
-string readLine(FILE *file)
-{
- if (feof(file))
- return string();
-
- int i = 0;
- char s[512];
-
- do {
- s[i] = fgetc(file);
- i++;
- } while (!feof(file) && s[i-1] != '\n' && i<510);
- s[i] = '\0';
- string tmp;
- if (i == 1 && feof(file))
- ;
- else
- tmp = s;
-
- return tmp;
-}
-
-
-
/*
* CLASS TEXERRORS
*/
-// I did not leave this inlined because DEC cxx does not like
-// variables declarations in inlined code (JMarc)
-TeXErrors::~TeXErrors()
-{
- Error *tmp;
- while (errors) {
- tmp = errors->next_error;
- delete errors;
- errors = tmp;
- }
-}
-
-
-void TeXErrors::scanError(LyXLex &lex)
-{
- string token = lex.GetString();
- // Sometimes the error string goes over more than one
- // line, and we need to get them all.
- string errstr;
- string tmp = frontStrip(readLine(lex.getFile()));
- if (tmp == "\n" || tmp.empty()) {
- tmp = frontStrip(readLine(lex.getFile()));
- if (contains(tmp, "See the LaTeX manual")) {
- do {
- tmp = readLine(lex.getFile());
- } while (!tmp.empty() && !contains(tmp, "..."));
- }
- tmp = frontStrip(readLine(lex.getFile()));
- }
-
- while ((tmp != "\n" || !contains(errstr, "l."))
- && !prefixIs(tmp, "! ")
- && !contains(tmp, "(job aborted")
- && !tmp.empty()) {
- errstr += tmp;
- tmp = frontStrip(readLine(lex.getFile()));
- }
- lyxerr.debug() << "tmp: " << errstr << endl;
- int line = 0;
- // unfortunately the error line is not always given
- // by "l.###" in the beginning of the error string
- // therefore we must search for "l.###" in the error
- // msg.
- if (contains(errstr, "l.")) {
- // We make a const copy to make [] fast. (Asger)
- string const es = errstr;
- for (string::size_type i = 2; i < es.length(); ++i) {
- if (es[i-2] == 'l' && es[i-1] == '.' &&
- (es[i] >= '0' && es[i]<= '9')) {
- line = atoi(es.c_str() + i);
- break;
- }
- }
- }
- insertError(line, token, errstr);
-
- if (prefixIs(tmp, "! ")) {
- scanError(lex);
- }
-}
-
-
-bool TeXErrors::getFirstError(int *line, string *text)
-{
- next_error = errors;
- if (next_error) {
- *line = next_error->error_in_line;
- *text = next_error->error_desc + "\n" + next_error->error_text;
- next_error = next_error->next_error;
- return true;
- }
- return false;
-}
-
-
-bool TeXErrors::getNextError(int *line, string *text)
+void TeXErrors::insertError(int line, string const & error_desc,
+ string const & error_text)
{
- if (next_error) {
- *line = next_error->error_in_line;
- *text = next_error->error_desc + "\n" + next_error->error_text;
- next_error = next_error->next_error;
- return true;
- }
- return false;
+ Error newerr(line, error_desc, error_text);
+ errors.push_back(newerr);
}
+/*
+ * CLASS LaTeX
+ */
-void TeXErrors::insertError(int line, string const &error_desc,
- string const &error_text)
+LaTeX::LaTeX(string const & latex, string const & f, string const & p)
+ : cmd(latex), file(f), path(p)
{
- Error *newerr = new Error(line, error_desc, error_text);
- if (errors) {
- Error *tmperr = errors;
- while (tmperr->next_error) tmperr = tmperr->next_error;
- tmperr->next_error = newerr;
- } else {
- errors = newerr;
- }
+ num_errors = 0;
+ depfile = file + ".dep";
+ if (prefixIs(cmd, "pdf")) // Do we use pdflatex ?
+ depfile += "-pdf";
}
-void TeXErrors::printErrors()
+void LaTeX::deleteFilesOnError() const
{
- lyxerr << "Printing errors." << endl;
- if (errors) {
- Error *tmperr = errors;
- do {
- lyxerr << "Error in line "
- << tmperr->error_in_line
- << ": " << tmperr->error_desc
- << '\n' << tmperr->error_text << endl;
- //%d: %s\n%s\n", tmperr->error_in_line,
- // tmperr->error_desc.c_str(),
- // tmperr->error_text.c_str());
- tmperr = tmperr->next_error;
- } while (tmperr);
- }
-}
+ // currently just a dummy function.
+ // What files do we have to delete?
-void TeXErrors::printWarnings()
-{
-}
+ // This will at least make latex do all the runs
+ lyx::unlink(depfile);
+ // but the reason for the error might be in a generated file...
-void TeXErrors::printStatus()
-{
- lyxerr << "Error struct:"
- << "\n status: " << status
- << "\n no err: " << number_of_errors << endl;
- if (status == LaTeX::NO_ERRORS) lyxerr << "NO_ERRORS" << endl;
- if (status & LaTeX::NO_LOGFILE) lyxerr << "NO_LOGFILE" << endl;
- if (status & LaTeX::NO_OUTPUT) lyxerr << "NO_OUTPUT" << endl;
- if (status & LaTeX::UNDEF_REF) lyxerr << "UNDEF_REF" << endl;
- if (status & LaTeX::RERUN) lyxerr << "RERUN" << endl;
- if (status & LaTeX::TEX_ERROR) lyxerr << "TEX_ERROR" << endl;
- if (status & LaTeX::TEX_WARNING) lyxerr << "TEX_WARNING" << endl;
- if (status & LaTeX::NO_FILE) lyxerr << "NO_FILE" << endl;
-}
-
+ string ofname = OnlyFilename(file);
-/*
- * CLASS LaTeX
- */
+ // bibtex file
+ string bbl = ChangeExtension(ofname, ".bbl");
+ lyx::unlink(bbl);
-LaTeX::LaTeX(string const & latex, string const & f, string const & p)
- : cmd(latex), file(f), path(p)
-{
- tex_files = NO_FILES;
- file_count = sizeof(all_files) / sizeof(texfile_struct);
- num_errors = 0;
- depfile = file + ".dep";
+ // makeindex file
+ string ind = ChangeExtension(ofname, ".ind");
+ lyx::unlink(ind);
+
+ // Also remove the aux file
+ string aux = ChangeExtension(ofname, ".aux");
+ lyx::unlink(aux);
}
-int LaTeX::run(TeXErrors &terr, MiniBuffer *minib)
+int LaTeX::run(TeXErrors & terr, MiniBuffer * minib)
// 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
bool rerun = false; // rerun requested
// The class LaTeX does not know the temp path.
- bufferlist.updateIncludedTeXfiles(GetCWD());
+ bufferlist.updateIncludedTeXfiles(lyx::getcwd()); //GetCWD());
// Never write the depfile if an error was encountered.
// remake the dependency file.
//
FileInfo fi(depfile);
+ bool run_bibtex = false;
if (fi.exist()) {
// Read the dep file:
head.read(depfile);
// Update the checksums
head.update();
- lyxerr[Debug::LATEX] << "Dependency file exists" << endl;
+ lyxerr[Debug::DEPEND] << "Dependency file exists" << endl;
if (head.sumchange()) {
++count;
+ lyxerr[Debug::DEPEND]
+ << "Dependency file has changed" << endl;
lyxerr[Debug::LATEX]
- << "Dependency file has changed\n"
<< "Run #" << count << endl;
- minib->Set(string(_("LaTeX run number ")) + tostr(count));
- minib->Store();
+ WriteStatus(minib,
+ string(_("LaTeX run number ")) + tostr(count));
this->operator()();
scanres = scanLogFile(terr);
- if (scanres & LaTeX::ERRORS) return scanres; // return on error
+ if (scanres & LaTeX::ERRORS) {
+ deleteFilesOnError();
+ return scanres; // return on error
+ }
+
+ run_bibtex = scanAux(head);
+ if (run_bibtex)
+ lyxerr[Debug::DEPEND]
+ << "Bibtex demands rerun" << endl;
} else {
- lyxerr[Debug::LATEX] << "return no_change" << endl;
+ lyxerr[Debug::DEPEND] << "return no_change" << endl;
return LaTeX::NO_CHANGE;
}
} else {
++count;
- lyxerr[Debug::LATEX] << "Dependency file does not exist\n"
- << "Run #" << count << endl;
+ lyxerr[Debug::DEPEND]
+ << "Dependency file does not exist" << endl;
+
+ lyxerr[Debug::LATEX]
+ << "Run #" << count << endl;
head.insert(file, true);
- minib->Set(string(_("LaTeX run number ")) + tostr(count));
- minib->Store();
+ WriteStatus(minib,
+ string(_("LaTeX run number ")) + tostr(count));
this->operator()();
scanres = scanLogFile(terr);
- if (scanres & LaTeX::ERRORS) return scanres; // return on error
+ if (scanres & LaTeX::ERRORS) {
+ deleteFilesOnError();
+ return scanres; // return on error
+ }
+
}
// update the dependencies.
deplog(head); // reads the latex log
- deptex(head); // checks for latex files
head.update();
// 0.5
// if needed.
// run makeindex
- if (head.haschanged(ChangeExtension(file, ".idx", true))) {
+ if (head.haschanged(OnlyFilename(ChangeExtension(file, ".idx")))) {
// no checks for now
- minib->Set(_("Running MakeIndex."));
- minib->Store();
- rerun=runMakeIndex(ChangeExtension(file,".idx",true));
+ lyxerr[Debug::LATEX] << "Running MakeIndex." << endl;
+ WriteStatus(minib, _("Running MakeIndex."));
+ rerun = runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx")));
}
// run bibtex
- if (scanres & LaTeX::UNDEF_CIT || scanres & LaTeX::RERUN) {
+ if (scanres & LaTeX::UNDEF_CIT
+ || scanres & LaTeX::RERUN
+ || run_bibtex) {
// Here we must scan the .aux file and look for
// "\bibdata" and/or "\bibstyle". If one of those
// tags is found -> run bibtex and set rerun = true;
// no checks for now
- minib->Set(_("Running BibTeX."));
- minib->Store();
- rerun = runBibTeX(ChangeExtension(file, ".aux", true));
+ lyxerr[Debug::LATEX] << "Running BibTeX." << endl;
+ WriteStatus(minib, _("Running BibTeX."));
+ rerun = runBibTeX(OnlyFilename(ChangeExtension(file, ".aux")),
+ head);
}
// 1
if (rerun || head.sumchange()) {
rerun = false;
++count;
+ lyxerr[Debug::DEPEND]
+ << "Dep. file has changed or rerun requested" << endl;
lyxerr[Debug::LATEX]
- << "Dep. file has changed or rerun requested\n"
<< "Run #" << count << endl;
- minib->Set(string(_("LaTeX run number ")) + tostr(count));
- minib->Store();
+ WriteStatus(minib,
+ string(_("LaTeX run number ")) + tostr(count));
this->operator()();
scanres = scanLogFile(terr);
- if (scanres & LaTeX::ERRORS) return scanres; // return on error
+ if (scanres & LaTeX::ERRORS) {
+ deleteFilesOnError();
+ return scanres; // return on error
+ }
+
// update the depedencies
deplog(head); // reads the latex log
head.update();
} else {
- lyxerr[Debug::LATEX] << "Dep. file has NOT changed" << endl;
+ lyxerr[Debug::DEPEND] << "Dep. file has NOT changed" << endl;
}
// 1.5
// more after this.
// run makeindex if the <file>.idx has changed or was generated.
- if (head.haschanged(ChangeExtension(file, ".idx", true))) {
+ if (head.haschanged(OnlyFilename(ChangeExtension(file, ".idx")))) {
// no checks for now
- minib->Set(_("Running MakeIndex."));
- minib->Store();
- rerun = runMakeIndex(ChangeExtension(file, ".idx", true));
+ lyxerr[Debug::LATEX] << "Running MakeIndex." << endl;
+ WriteStatus(minib, _("Running MakeIndex."));
+ rerun = runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx")));
}
// 2
rerun = false;
++count;
lyxerr[Debug::LATEX] << "Run #" << count << endl;
- minib->Set(string(_("LaTeX run number ")) + tostr(count));
- minib->Store();
+ WriteStatus(minib, string(_("LaTeX run number ")) + tostr(count));
this->operator()();
scanres = scanLogFile(terr);
- if (scanres & LaTeX::ERRORS) return scanres; // return on error
+ if (scanres & LaTeX::ERRORS) {
+ deleteFilesOnError();
+ return scanres; // return on error
+ }
+
// keep this updated
head.update();
}
int LaTeX::operator()()
{
#ifndef __EMX__
- string tmp = cmd + ' ' + file + " > /dev/null";
+ string tmp = cmd + ' ' + QuoteName(file) + " > /dev/null";
#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);
+ return one.startscript(Systemcalls::System, tmp);
}
-bool LaTeX::runMakeIndex(string const &file)
+bool LaTeX::runMakeIndex(string const & f)
{
lyxerr[Debug::LATEX] << "idx file has been made,"
" running makeindex on file "
- << file << endl;
+ << f << endl;
// It should be possible to set the switches for makeindex
// sorting style and such. It would also be very convenient
// to be able to make style files from within LyX. This has
// to come for a later time. (0.13 perhaps?)
string tmp = "makeindex -c -q ";
- tmp += file;
+ tmp += f;
Systemcalls one;
- one.Startscript(Systemcalls::System, tmp);
+ one.startscript(Systemcalls::System, tmp);
return true;
}
-bool LaTeX::runBibTeX(string const &file)
+bool LaTeX::scanAux(DepTable & dep)
{
- LyXLex lex(0, 0);
+ // if any of the bib file has changed we don't have to
+ // check the .aux file.
+ if (dep.extchanged(".bib")
+ || dep.extchanged(".bst")) return true;
+
+ string aux = OnlyFilename(ChangeExtension(file, ".aux"));
+ ifstream ifs(aux.c_str());
string token;
- if (!lex.setFile(file)) {
- // unable to open .aux file
- // return at once
- return false;
+ LRegex reg1("\\\\bibdata\\{([^}]+)\\}");
+ LRegex reg2("\\\\bibstyle\\{([^}]+)\\}");
+ while (getline(ifs, token)) {
+ if (reg1.exact_match(token)) {
+ LRegex::SubMatches sub = reg1.exec(token);
+ string data = LSubstring(token, sub[1].first,
+ sub[1].second);
+ string::size_type b;
+ do {
+ b = data.find_first_of(',', 0);
+ string l;
+ if (b == string::npos)
+ l = data;
+ else {
+ l = data.substr( 0, b - 0);
+ data.erase(0, b + 1);
+ }
+ string full_l =
+ findtexfile(
+ ChangeExtension(l, "bib"), "bib");
+ if (!full_l.empty()) {
+ if (!dep.exist(full_l))
+ return true;
+ }
+ } while (b != string::npos);
+ } else if (reg2.exact_match(token)) {
+ LRegex::SubMatches sub = reg2.exec(token);
+ string style = LSubstring(token, sub[1].first,
+ sub[1].second);
+ // token is now the style file
+ // pass it to the helper
+ string full_l =
+ findtexfile(
+ ChangeExtension(style, "bst"),
+ "bst");
+ if (!full_l.empty()) {
+ if (!dep.exist(full_l))
+ return true;
+ }
+ }
}
+ return false;
+}
- while (lex.IsOK()) {
- if (lex.EatLine())
- token=lex.GetString();
- else // blank line in the file being read
- continue;
- if (contains(token, "\\bibdata{")) {
- // run bibtex and
- string tmp="bibtex ";
- tmp += ChangeExtension(file, string(), true);
- Systemcalls one;
- one.Startscript(Systemcalls::System, tmp);
- return true;
+bool LaTeX::runBibTeX(string const & f, DepTable & dep)
+{
+ // Since a run of Bibtex mandates more latex runs it is ok to
+ // remove all ".bib" and ".bst" files, it is also required to
+ // discover style and database changes.
+ dep.remove_files_with_extension(".bib");
+ dep.remove_files_with_extension(".bst");
+ ifstream ifs(f.c_str());
+ string token;
+ bool using_bibtex = false;
+ LRegex reg1("\\\\bibdata\\{([^}]+)\\}");
+ LRegex reg2("\\\\bibstyle\\{([^}]+)\\}");
+ while (getline(ifs, token)) {
+ if (reg1.exact_match(token)) {
+ using_bibtex = true;
+ LRegex::SubMatches const & sub = reg1.exec(token);
+ string data = LSubstring(token, sub[1].first,
+ sub[1].second);
+ // data is now all the bib files separated by ','
+ // get them one by one and pass them to the helper
+ string::size_type b;
+ do {
+ b = data.find_first_of(',', 0);
+ string l;
+ if (b == string::npos)
+ l = data;
+ else {
+ l = data.substr(0, b - 0);
+ data.erase(0, b + 1);
+ }
+ string full_l =
+ findtexfile(
+ ChangeExtension(l, "bib"),
+ "bib");
+ lyxerr[Debug::LATEX] << "Bibtex database: `"
+ << full_l << "'" << endl;
+ if (!full_l.empty()) {
+ // add full_l to the dep file.
+ dep.insert(full_l, true);
+ }
+ } while (b != string::npos);
+ } else if (reg2.exact_match(token)) {
+ using_bibtex = true;
+ LRegex::SubMatches const & sub = reg2.exec(token);
+ string style = LSubstring(token, sub[1].first,
+ sub[1].second);
+ // token is now the style file
+ // pass it to the helper
+ string full_l =
+ findtexfile(
+ ChangeExtension(style, "bst"),
+ "bst");
+ lyxerr[Debug::LATEX] << "Bibtex style: `"
+ << full_l << "'" << endl;
+ if (!full_l.empty()) {
+ // add full_l to the dep file.
+ dep.insert(full_l, true);
+ }
}
-
+ }
+ if (using_bibtex) {
+ // run bibtex and
+ string tmp = "bibtex ";
+ tmp += OnlyFilename(ChangeExtension(file, string()));
+ Systemcalls one;
+ one.startscript(Systemcalls::System, tmp);
+ return true;
}
// bibtex was not run.
return false;
}
-int LaTeX::scanLogFile(TeXErrors &terr)
+int LaTeX::scanLogFile(TeXErrors & terr)
{
- string token;
+ int last_line = -1;
+ int line_count = 1;
int retval = NO_ERRORS;
-
- LyXLex lex(0, 0);
+ string tmp = OnlyFilename(ChangeExtension(file, ".log"));
+ lyxerr[Debug::LATEX] << "Log file: " << tmp << endl;
+ ifstream ifs(tmp.c_str());
- string tmp = ChangeExtension(file, ".log", true);
-
- if (!lex.setFile(tmp)) {
- // unable to open file
- // return at once
- retval |= NO_LOGFILE;
- return retval;
- }
-
- while (lex.IsOK()) {
- if (lex.EatLine())
- token = lex.GetString();
- else // blank line in the file being read
+ string token;
+ while (getline(ifs, token)) {
+ lyxerr[Debug::LATEX] << "Log line: " << token << endl;
+
+ if (token.empty())
continue;
- lyxerr[Debug::LATEX] << token << endl;
-
if (prefixIs(token, "LaTeX Warning:")) {
// Here shall we handle different
// types of warnings
// at least longtable.sty might use this.
retval |= RERUN;
}
- } else if (prefixIs(token, "! LaTeX Error:")) {
- // Here shall we handle different
- // types of errors
- retval |= LATEX_ERROR;
- lyxerr[Debug::LATEX] << "LaTeX Error." << endl;
- // this is not correct yet
- terr.scanError(lex);
- num_errors++;
} else if (prefixIs(token, "! ")) {
// Ok, we have something that looks like a TeX Error
// but what do we really have.
// Just get the error description:
- string desc(token);
- desc.erase(0, 2);
-
- if (contains(desc, "Undefined control sequence")) {
- retval |= TEX_ERROR;
- lyxerr[Debug::LATEX] << "TeX Error." << endl;
- terr.scanError(lex);
- num_errors++;
- } else {
- // get the next line
- lex.next();
- string tmp = lex.GetString();
- if (prefixIs(tmp, "l.")) {
+ string desc(token, 2);
+ if (contains(token, "LaTeX Error:"))
+ retval |= LATEX_ERROR;
+ // get the next line
+ string tmp;
+ int count = 0;
+ do {
+ if (!getline(ifs, tmp))
+ break;
+ if (++count > 10)
+ break;
+ } while (!prefixIs(tmp, "l."));
+ if (prefixIs(tmp, "l.")) {
// we have a latex error
- retval |= TEX_ERROR;
- lyxerr[Debug::LATEX]
- <<"TeX Error." << endl;
+ retval |= TEX_ERROR;
// get the line number:
- int line = 0;
- sscanf(tmp.c_str(), "l.%d", &line);
+ int line = 0;
+ sscanf(tmp.c_str(), "l.%d", &line);
// get the rest of the message:
- string errstr;
- lex.EatLine();
- tmp = lex.GetString();
- while ((tmp != "\n" || !contains(errstr, "l."))
- && !prefixIs(tmp, "! ")
- && !contains(tmp, "(job aborted")
- && !tmp.empty()) {
- errstr += tmp;
- errstr += "\n";
- lex.EatLine();
- tmp = lex.GetString();
- }
+ string errstr(tmp, tmp.find(' '));
+ errstr += '\n';
+ getline(ifs, tmp);
+ while (!contains(errstr, "l.")
+ && !tmp.empty()
+ && !prefixIs(tmp, "! ")
+ && !contains(tmp, "(job aborted")) {
+ errstr += tmp;
+ errstr += "\n";
+ getline(ifs, tmp);
+ }
+ lyxerr[Debug::LATEX]
+ << "line: " << line << '\n'
+ << "Desc: " << desc << '\n'
+ << "Text: " << errstr << endl;
+ if (line == last_line)
+ ++line_count;
+ else {
+ line_count = 1;
+ last_line = line;
+ }
+ if (line_count <= 5) {
terr.insertError(line, desc, errstr);
- num_errors++;
+ ++num_errors;
}
}
} else {
retval |= TOO_MANY_ERRORS;
}
}
- }
+ }
+ lyxerr[Debug::LATEX] << "Log line: " << token << endl;
return retval;
}
// files used by the LaTeX run. The files are then entered into the
// dependency file.
- string logfile = ChangeExtension(file, ".log", true);
- FilePtr in(logfile, FilePtr::read);
- bool not_eof = true;
- if (in()) while (not_eof) { // We were able to open the file
- // Now we read chars until we find a '('
- int c;
- do {
- c = fgetc(in());
- } while (c != EOF && c != '(');
- if (c == EOF) {
- // Nothing more we can do
- not_eof = false;
- continue;
- }
-
- // We now have c == '(', we now read the the sequence of
- // chars until reaching EOL, or ' ' and put that into a string.
+ string logfile = OnlyFilename(ChangeExtension(file, ".log"));
+ LRegex reg1(")* *\\(([^ \\)]+).*");
+ LRegex reg2("File: ([^ ]+).*");
+ LRegex reg3("No file ([^ ]+)\\..*");
+ LRegex reg4("\\\\openout[0-9]+.*=.*`([^ ]+)'\\..*");
+ LRegex unwanted("^.*\\.(aux|log|dvi|bbl|ind|glo)$");
+
+ ifstream ifs(logfile.c_str());
+ while (ifs) {
+ // Ok, the scanning of files here is not sufficient.
+ // Sometimes files are named by "File: xxx" only
+ // So I think we should use some regexps to find files instead.
+ // "(\([^ ]+\)" should match the "(file " variant
+ // "File: \([^ ]+\)" should match the "File: file" variant
string foundfile;
- c = fgetc(in());
- while (c != '\n' && c != ' ' && c != ')') {
- foundfile += char(c);
- c = fgetc(in());
+ string token;
+ getline(ifs, token);
+ if (token.empty()) continue;
+
+ if (reg1.exact_match(token)) {
+ LRegex::SubMatches const & sub = reg1.exec(token);
+ foundfile = LSubstring(token, sub[1].first,
+ sub[1].second);
+ } else if (reg2.exact_match(token)) {
+ LRegex::SubMatches const & sub = reg2.exec(token);
+ foundfile = LSubstring(token, sub[1].first,
+ sub[1].second);
+ } else if (reg3.exact_match(token)) {
+ LRegex::SubMatches const & sub = reg3.exec(token);
+ foundfile = LSubstring(token, sub[1].first,
+ sub[1].second);
+ } else if (reg4.exact_match(token)) {
+ LRegex::SubMatches const & sub = reg4.exec(token);
+ foundfile = LSubstring(token, sub[1].first,
+ sub[1].second);
+ } else {
+ continue;
}
- if (foundfile.empty()) continue;
- lyxerr[Debug::LATEX] << "Found file: "
- << foundfile << endl;
+ lyxerr[Debug::DEPEND] << "Found file: "
+ << foundfile << endl;
+
// Ok now we found a file.
- // Now we should make sure that
- // this is a file that we can
- // access through the normal
- // paths:
+ // Now we should make sure that this is a file that we can
+ // access through the normal paths.
+ // We will not try any fance search methods to
+ // find the file.
+
// (1) foundfile is an
// absolute path and should
// be inserted.
if (AbsolutePath(foundfile)) {
- lyxerr[Debug::LATEX] << "AbsolutePath file: "
- << foundfile << endl;
+ lyxerr[Debug::DEPEND] << "AbsolutePath file: "
+ << foundfile << endl;
// On inital insert we want to do the update at once
// since this file can not be a file generated by
// the latex run.
// (2) foundfile is in the tmpdir
// insert it into head
if (FileInfo(OnlyFilename(foundfile)).exist()) {
- if (suffixIs(foundfile, ".aux")) {
- lyxerr[Debug::LATEX] << "We don't want "
- << OnlyFilename(foundfile)
- << " in the dep file"
- << endl;
+ if (unwanted.exact_match(foundfile)) {
+ lyxerr[Debug::DEPEND]
+ << "We don't want "
+ << OnlyFilename(foundfile)
+ << " in the dep file"
+ << endl;
} else if (suffixIs(foundfile, ".tex")) {
// This is a tex file generated by LyX
// and latex is not likely to change this
// during its runs.
- lyxerr[Debug::LATEX] << "Tmpdir TeX file: "
- << OnlyFilename(foundfile)
- << endl;
+ lyxerr[Debug::DEPEND]
+ << "Tmpdir TeX file: "
+ << OnlyFilename(foundfile)
+ << endl;
head.insert(foundfile, true);
} else {
- lyxerr[Debug::LATEX] << "In tmpdir file:"
- << OnlyFilename(foundfile)
- << endl;
+ lyxerr[Debug::DEPEND]
+ << "In tmpdir file:"
+ << OnlyFilename(foundfile)
+ << endl;
head.insert(OnlyFilename(foundfile));
}
continue;
}
-
- // (3) the foundfile can be
- // found in the same dir
- // as the .lyx file and
- // should be inserted.
- PathPush(path);
- if (FileInfo(foundfile).exist()) {
- lyxerr << "LyX Strange: this should actually never"
- " happen anymore, this it should be"
- " handled by the Absolute check."
- << endl;
- lyxerr[Debug::LATEX] << "Same Directory file: "
- << foundfile << endl;
- head.insert(foundfile);
- PathPop();
- continue;
- }
- PathPop();
-
- lyxerr[Debug::LATEX]
+ lyxerr[Debug::DEPEND]
<< "Not a file or we are unable to find it."
<< endl;
}
}
-
-
-void LaTeX::deptex(DepTable &head)
-{
- int except = AUX|LOG|DVI|BBL|IND|GLO;
- string tmp;
- FileInfo fi;
- for (int i = 0; i < file_count; i++) {
- if (!(all_files[i].file & except)) {
- tmp = ChangeExtension(file,
- all_files[i].extension,
- true);
- lyxerr[Debug::LATEX] << "deptex: " << tmp << endl;
- if (fi.newFile(tmp).exist())
- head.insert(tmp);
- }
- }
-}
projects / lyx.git / blobdiff