X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeX.C;h=5995025dee4872a8781e4d96595bc33a798c0433;hb=cd3d0bc0b26f4d92fdfbfaac4adefebcf51f11ff;hp=57256ab10df181f797010dc3c5fe85fbcbc46d18;hpb=8283e978f8d621041c432b9b88a476bfd567385c;p=lyx.git diff --git a/src/LaTeX.C b/src/LaTeX.C index 57256ab10d..5995025dee 100644 --- a/src/LaTeX.C +++ b/src/LaTeX.C @@ -13,32 +13,43 @@ #include -#ifdef __GNUG__ -#pragma implementation -#endif -#include - #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/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 +#include "BoostFormat.h" + +#include #include // sscanf +#ifndef CXX_GLOBAL_CSTD +using std::sscanf; +#endif + using std::ifstream; using std::getline; using std::endl; 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 @@ -55,6 +66,21 @@ using std::set; extern BufferList bufferlist; +namespace { + +void showRunMessage(LyXFunc * lf, unsigned int count) +{ + ostringstream str; +#if USE_BOOST_FORMAT + str << boost::format(_("Waiting for LaTeX run number %1$d")) % count; +#else + str << _("Waiting for LaTeX run number ") << count; +#endif + lf->dispatch(FuncRequest(LFUN_MESSAGE, STRCONV(str.str()))); +} + + +}; /* * CLASS TEXERRORS */ @@ -95,18 +121,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); } @@ -121,12 +147,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()); // Never write the depfile if an error was encountered. @@ -187,9 +213,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun) ++count; lyxerr[Debug::LATEX] << "Run #" << count << endl; if (lfun) { - ostringstream str; - str << _("LaTeX run number") << ' ' << count; - lfun->dispatch(LFUN_MESSAGE, str.str().c_str()); + showRunMessage(lfun, count); } this->operator()(); @@ -225,7 +249,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun) // no checks for now lyxerr[Debug::LATEX] << "Running MakeIndex." << endl; if (lfun) { - lfun->dispatch(LFUN_MESSAGE, _("Running MakeIndex.")); + lfun->dispatch(FuncRequest(LFUN_MESSAGE, _("Running MakeIndex."))); } rerun = runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx"))); @@ -240,7 +264,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun) // no checks for now lyxerr[Debug::LATEX] << "Running BibTeX." << endl; if (lfun) { - lfun->dispatch(LFUN_MESSAGE, _("Running BibTeX.")); + lfun->dispatch(FuncRequest(LFUN_MESSAGE, _("Running BibTeX."))); } updateBibtexDependencies(head, bibtex_info); @@ -272,9 +296,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun) lyxerr[Debug::LATEX] << "Run #" << count << endl; if (lfun) { - ostringstream str; - str << _("LaTeX run number") << ' ' << count; - lfun->dispatch(LFUN_MESSAGE, str.str().c_str()); + showRunMessage(lfun, count); } this->operator()(); @@ -304,7 +326,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun) // no checks for now lyxerr[Debug::LATEX] << "Running MakeIndex." << endl; if (lfun) { - lfun->dispatch(LFUN_MESSAGE, _("Running MakeIndex.")); + lfun->dispatch(FuncRequest(LFUN_MESSAGE, _("Running MakeIndex."))); } rerun = runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx"))); @@ -328,9 +350,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun) ++count; lyxerr[Debug::LATEX] << "Run #" << count << endl; if (lfun) { - ostringstream str; - str << _("LaTeX run number") << ' ' << count; - lfun->dispatch(LFUN_MESSAGE, str.str().c_str()); + showRunMessage(lfun, count); } this->operator()(); @@ -372,7 +392,7 @@ bool LaTeX::runMakeIndex(string const & f) // 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?) + // to come for a later time. string tmp = "makeindex -c -q "; tmp += f; Systemcall one; @@ -389,7 +409,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()) @@ -415,17 +435,20 @@ void LaTeX::scanAuxFile(string const & file, Aux_Info & aux_info) ifstream ifs(file.c_str()); string token; - LRegex reg1("\\\\citation\\{([^}]+)\\}"); - LRegex reg2("\\\\bibdata\\{([^}]+)\\}"); - LRegex reg3("\\\\bibstyle\\{([^}]+)\\}"); - LRegex reg4("\\\\@input\\{([^}]+)\\}"); + regex reg1("\\\\citation\\{([^}]+)\\}"); + regex reg2("\\\\bibdata\\{([^}]+)\\}"); + regex reg3("\\\\bibstyle\\{([^}]+)\\}"); + regex 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, - sub[1].second); + token = rtrim(token, "\r"); +#ifndef USE_INCLUDED_STRING + smatch sub; +#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, ','); @@ -433,34 +456,28 @@ void LaTeX::scanAuxFile(string const & file, Aux_Info & aux_info) << citation << endl; aux_info.citations.insert(citation); } - } else if (reg2.exact_match(token)) { - LRegex::SubMatches const & sub = reg2.exec(token); - string data = LSubstring(token, sub[1].first, - sub[1].second); + } 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 (reg3.exact_match(token)) { - LRegex::SubMatches const & sub = reg3.exec(token); - string style = LSubstring(token, sub[1].first, - sub[1].second); + } 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 (reg4.exact_match(token)) { - LRegex::SubMatches const & sub = reg4.exec(token); - string file2 = LSubstring(token, sub[1].first, - sub[1].second); + } else if (regex_match(STRCONV(token), sub, reg4)) { + string const file2 = STRCONV(sub.str(1)); scanAuxFile(file2, aux_info); } } @@ -564,7 +581,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 @@ -656,16 +673,16 @@ void LaTeX::deplog(DepTable & head) string const logfile = OnlyFilename(ChangeExtension(file, ".log")); - LRegex reg1("\\)* *\\(([^ )]+).*"); - LRegex reg2("File: ([^ ]+).*"); - LRegex reg3("No file ([^ ]+)\\..*"); - LRegex reg4("\\\\openout[0-9]+.*=.*`([^ ]+)'\\..*"); + regex reg1("\\)* *\\(([^ )]+).*"); + regex reg2("File: ([^ ]+).*"); + regex reg3("No file ([^ ]+)\\..*"); + regex 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)$"); + regex reg5("Writing index file ([^ ]+).*"); + regex unwanted("^.*\\.(aux|log|dvi|bbl|ind|glo)$"); ifstream ifs(logfile.c_str()); while (ifs) { @@ -677,29 +694,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; - 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 if (reg5.exact_match(token)) { - LRegex::SubMatches const & sub = reg5.exec(token); - foundfile = LSubstring(token, sub[1].first, - sub[1].second); +#ifndef USE_INCLUDED_STRING + smatch sub; +#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; } @@ -732,7 +744,7 @@ void LaTeX::deplog(DepTable & head) // (2) foundfile is in the tmpdir // insert it into head else if (FileInfo(OnlyFilename(foundfile)).exist()) { - if (unwanted.exact_match(foundfile)) { + if (regex_match(STRCONV(foundfile), unwanted)) { lyxerr[Debug::DEPEND] << "We don't want " << OnlyFilename(foundfile)