X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeX.C;h=53cf4e9241b19993ac8c5b8257ca291aaf4f16fa;hb=a9713c5563c924f4ab98bde3d9f24a5c1e4dd50e;hp=664486e801187ce649ce55d8b12fc7cc34244a19;hpb=1d0eda5d0258fdc0658529c72cd84b482948bae8;p=lyx.git diff --git a/src/LaTeX.C b/src/LaTeX.C index 664486e801..53cf4e9241 100644 --- a/src/LaTeX.C +++ b/src/LaTeX.C @@ -13,17 +13,15 @@ #include -#ifdef __GNUG__ -#pragma implementation -#endif - #include "LaTeX.h" #include "bufferlist.h" #include "gettext.h" #include "lyxfunc.h" #include "debug.h" +#include "funcrequest.h" #include "support/filetools.h" #include "support/FileInfo.h" +#include "support/tostr.h" #include "support/lstrings.h" #include "support/lyxlib.h" #include "support/systemcall.h" @@ -46,7 +44,12 @@ using std::vector; using std::set; using boost::regex; using boost::regex_match; + +#ifndef USE_INCLUDED_STRING using boost::smatch; +#else +using boost::cmatch; +#endif // TODO: in no particular order // - get rid of the extern BufferList and the call to @@ -63,6 +66,16 @@ using boost::smatch; extern BufferList bufferlist; +namespace { + +void showRunMessage(LyXFunc * lf, unsigned int count) +{ + string str = bformat(_("Waiting for LaTeX run number %1$s"), tostr(count)); + lf->dispatch(FuncRequest(LFUN_MESSAGE, str)); +} + + +}; /* * CLASS TEXERRORS */ @@ -74,12 +87,29 @@ void TeXErrors::insertError(int line, string const & error_desc, errors.push_back(newerr); } + +bool operator==(Aux_Info const & a, Aux_Info const & o) +{ + return a.aux_file == o.aux_file && + a.citations == o.citations && + a.databases == o.databases && + a.styles == o.styles; +} + + +bool operator!=(Aux_Info const & a, Aux_Info const & o) +{ + return !(a == o); +} + + /* * CLASS LaTeX */ -LaTeX::LaTeX(string const & latex, string const & f, string const & p) - : cmd(latex), file(f), path(p) +LaTeX::LaTeX(string const & latex, LatexRunParams const & rp, + string const & f, string const & p) + : cmd(latex), file(f), path(p), runparams(rp) { num_errors = 0; depfile = file + ".dep"; @@ -103,18 +133,18 @@ void LaTeX::deleteFilesOnError() const // but the reason for the error might be in a generated file... - string ofname = OnlyFilename(file); + string const ofname = OnlyFilename(file); // bibtex file - string bbl = ChangeExtension(ofname, ".bbl"); + string const bbl = ChangeExtension(ofname, ".bbl"); lyx::unlink(bbl); // makeindex file - string ind = ChangeExtension(ofname, ".ind"); + string const ind = ChangeExtension(ofname, ".ind"); lyx::unlink(ind); // Also remove the aux file - string aux = ChangeExtension(ofname, ".aux"); + string const aux = ChangeExtension(ofname, ".aux"); lyx::unlink(aux); } @@ -129,12 +159,12 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun) int scanres = NO_ERRORS; unsigned int count = 0; // number of times run num_errors = 0; // just to make sure. - const unsigned int MAX_RUN = 6; + unsigned int const MAX_RUN = 6; DepTable head; // empty head bool rerun = false; // rerun requested // The class LaTeX does not know the temp path. - bufferlist.updateIncludedTeXfiles(lyx::getcwd()); //GetCWD()); + bufferlist.updateIncludedTeXfiles(lyx::getcwd(), runparams); // Never write the depfile if an error was encountered. @@ -162,7 +192,10 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun) if (had_depfile) { lyxerr[Debug::DEPEND] << "Dependency file exists" << endl; // Read the dep file: - head.read(depfile); + had_depfile = head.read(depfile); + } + + if (had_depfile) { // Update the checksums head.update(); // Can't just check if anything has changed because it might have aborted @@ -183,7 +216,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun) run_bibtex = true; } else lyxerr[Debug::DEPEND] - << "Dependency file does not exist" << endl; + << "Dependency file does not exist, or has wrong format" << endl; /// We scan the aux file even when had_depfile = false, /// because we can run pdflatex on the file after running latex on it, @@ -195,17 +228,14 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun) ++count; lyxerr[Debug::LATEX] << "Run #" << count << endl; if (lfun) { - ostringstream str; - str << _("LaTeX run number") << ' ' << count; - // check lyxstring string stream and gcc 3.1 before fixing - lfun->dispatch(LFUN_MESSAGE, string(str.str().c_str())); + showRunMessage(lfun, count); } - this->operator()(); + startscript(); scanres = scanLogFile(terr); if (scanres & ERROR_RERUN) { lyxerr[Debug::LATEX] << "Rerunning LaTeX" << endl; - this->operator()(); + startscript(); scanres = scanLogFile(terr); } @@ -234,7 +264,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun) // no checks for now lyxerr[Debug::LATEX] << "Running MakeIndex." << endl; if (lfun) { - lfun->dispatch(LFUN_MESSAGE, string(_("Running MakeIndex."))); + lfun->dispatch(FuncRequest(LFUN_MESSAGE, _("Running MakeIndex."))); } rerun = runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx"))); @@ -249,7 +279,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun) // no checks for now lyxerr[Debug::LATEX] << "Running BibTeX." << endl; if (lfun) { - lfun->dispatch(LFUN_MESSAGE, string(_("Running BibTeX."))); + lfun->dispatch(FuncRequest(LFUN_MESSAGE, _("Running BibTeX."))); } updateBibtexDependencies(head, bibtex_info); @@ -281,13 +311,10 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun) lyxerr[Debug::LATEX] << "Run #" << count << endl; if (lfun) { - ostringstream str; - str << _("LaTeX run number") << ' ' << count; - // check lyxstring string stream and gcc 3.1 before fixing - lfun->dispatch(LFUN_MESSAGE, string(str.str().c_str())); + showRunMessage(lfun, count); } - this->operator()(); + startscript(); scanres = scanLogFile(terr); if (scanres & ERRORS) { deleteFilesOnError(); @@ -314,7 +341,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun) // no checks for now lyxerr[Debug::LATEX] << "Running MakeIndex." << endl; if (lfun) { - lfun->dispatch(LFUN_MESSAGE, string(_("Running MakeIndex."))); + lfun->dispatch(FuncRequest(LFUN_MESSAGE, _("Running MakeIndex."))); } rerun = runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx"))); @@ -338,13 +365,10 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun) ++count; lyxerr[Debug::LATEX] << "Run #" << count << endl; if (lfun) { - ostringstream str; - str << _("LaTeX run number") << ' ' << count; - // check lyxstring string stream and gcc 3.1 before fixing - lfun->dispatch(LFUN_MESSAGE, string(str.str().c_str())); + showRunMessage(lfun, count); } - this->operator()(); + startscript(); scanres = scanLogFile(terr); if (scanres & ERRORS) { deleteFilesOnError(); @@ -362,7 +386,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun) } -int LaTeX::operator()() +int LaTeX::startscript() { #ifndef __EMX__ string tmp = cmd + ' ' + QuoteName(file) + " > /dev/null"; @@ -400,7 +424,7 @@ LaTeX::scanAuxFiles(string const & file) result.push_back(scanAuxFile(file)); for (int i = 1; i < 1000; ++i) { - string file2 = ChangeExtension(file, "") + "." + tostr(i) + string file2 = ChangeExtension(file, "") + '.' + tostr(i) + ".aux"; FileInfo fi(file2); if (!fi.exist()) @@ -432,10 +456,14 @@ void LaTeX::scanAuxFile(string const & file, Aux_Info & aux_info) regex reg4("\\\\@input\\{([^}]+)\\}"); while (getline(ifs, token)) { - token = strip(token, '\r'); + token = rtrim(token, "\r"); +#ifndef USE_INCLUDED_STRING smatch sub; - if (regex_match(token, sub, reg1)) { - string data = sub[1]; +#else + cmatch sub; +#endif + if (regex_match(STRCONV(token), sub, reg1)) { + string data = STRCONV(sub.str(1)); while (!data.empty()) { string citation; data = split(data, citation, ','); @@ -443,28 +471,28 @@ void LaTeX::scanAuxFile(string const & file, Aux_Info & aux_info) << citation << endl; aux_info.citations.insert(citation); } - } else if (regex_match(token, sub, reg2)) { - string data = sub[1]; + } else if (regex_match(STRCONV(token), sub, reg2)) { + string data = sub.STRCONV(str(1)); // data is now all the bib files separated by ',' // get them one by one and pass them to the helper while (!data.empty()) { string database; data = split(data, database, ','); database = ChangeExtension(database, "bib"); - lyxerr[Debug::LATEX] << "Bibtex database: `" - << database << "'" << endl; + lyxerr[Debug::LATEX] << "BibTeX database: `" + << database << '\'' << endl; aux_info.databases.insert(database); } - } else if (regex_match(token, sub, reg3)) { - string style = sub[1]; + } else if (regex_match(STRCONV(token), sub, reg3)) { + string style = STRCONV(sub.str(1)); // 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 << '\'' << endl; aux_info.styles.insert(style); - } else if (regex_match(token, sub, reg4)) { - string file2 = sub[1]; + } else if (regex_match(STRCONV(token), sub, reg4)) { + string const file2 = STRCONV(sub.str(1)); scanAuxFile(file2, aux_info); } } @@ -568,7 +596,7 @@ int LaTeX::scanLogFile(TeXErrors & terr) << "We should rerun." << endl; retval |= RERUN; } - } else if (prefixIs(token, "(")) { + } else if (token[0] == '(') { if (contains(token, "Rerun LaTeX") || contains(token, "Rerun to get")) { // Used by natbib @@ -681,20 +709,24 @@ void LaTeX::deplog(DepTable & head) string foundfile; string token; getline(ifs, token); - token = strip(token, '\r'); + token = rtrim(token, "\r"); if (token.empty()) continue; +#ifndef USE_INCLUDED_STRING smatch sub; - if (regex_match(token, sub, reg1)) { - foundfile = sub[1]; - } else if (regex_match(token, sub, reg2)) { - foundfile = sub[1]; - } else if (regex_match(token, sub, reg3)) { - foundfile = sub[1]; - } else if (regex_match(token, sub, reg4)) { - foundfile = sub[1]; - } else if (regex_match(token, sub, reg5)) { - foundfile = sub[1]; +#else + cmatch sub; +#endif + if (regex_match(STRCONV(token), sub, reg1)) { + foundfile = STRCONV(sub.str(1)); + } else if (regex_match(STRCONV(token), sub, reg2)) { + foundfile = STRCONV(sub.str(1)); + } else if (regex_match(STRCONV(token), sub, reg3)) { + foundfile = STRCONV(sub.str(1)); + } else if (regex_match(STRCONV(token), sub, reg4)) { + foundfile = STRCONV(sub.str(1)); + } else if (regex_match(STRCONV(token), sub, reg5)) { + foundfile = STRCONV(sub.str(1)); } else { continue; } @@ -727,7 +759,7 @@ void LaTeX::deplog(DepTable & head) // (2) foundfile is in the tmpdir // insert it into head else if (FileInfo(OnlyFilename(foundfile)).exist()) { - if (regex_match(foundfile, unwanted)) { + if (regex_match(STRCONV(foundfile), unwanted)) { lyxerr[Debug::DEPEND] << "We don't want " << OnlyFilename(foundfile)