X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeX.C;h=8c8091fe4fc13e68c3f258821e07f82d49cc5472;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=90092a7cf9b782b795053e8542fa4da1094685eb;hpb=13cd255a3053dcb62e0392b2d127aab70ab46e4c;p=lyx.git diff --git a/src/LaTeX.C b/src/LaTeX.C index 90092a7cf9..8c8091fe4f 100644 --- a/src/LaTeX.C +++ b/src/LaTeX.C @@ -14,12 +14,13 @@ #include -#include "LaTeX.h" #include "bufferlist.h" +#include "LaTeX.h" #include "gettext.h" #include "lyxrc.h" #include "debug.h" #include "DepTable.h" + #include "support/filetools.h" #include "support/convert.h" #include "support/lstrings.h" @@ -32,24 +33,27 @@ #include -using lyx::support::absolutePath; -using lyx::support::bformat; -using lyx::support::changeExtension; -using lyx::support::contains; -using lyx::support::findtexfile; -using lyx::support::getcwd; -using lyx::support::onlyFilename; -using lyx::support::prefixIs; -using lyx::support::quoteName; -using lyx::support::rtrim; -using lyx::support::split; -using lyx::support::subst; -using lyx::support::suffixIs; -using lyx::support::Systemcall; -using lyx::support::unlink; -using lyx::support::trim; - -namespace os = lyx::support::os; + +namespace lyx { + +using support::absolutePath; +using support::bformat; +using support::changeExtension; +using support::contains; +using support::findtexfile; +using support::getcwd; +using support::onlyFilename; +using support::prefixIs; +using support::quoteName; +using support::rtrim; +using support::split; +using support::subst; +using support::suffixIs; +using support::Systemcall; +using support::unlink; +using support::trim; + +namespace os = support::os; namespace fs = boost::filesystem; using boost::regex; @@ -68,7 +72,7 @@ using std::set; using std::vector; // TODO: in no particular order -// - get rid of the extern BufferList and the call to +// - get rid of the call to // BufferList::updateIncludedTeXfiles, this should either // be done before calling LaTeX::funcs or in a completely // different way. @@ -78,11 +82,9 @@ using std::vector; // - somewhere support viewing of bibtex and makeindex log files. // - we should perhaps also scan the bibtex log file -extern BufferList bufferlist; - namespace { -string runMessage(unsigned int count) +docstring runMessage(unsigned int count) { return bformat(_("Waiting for LaTeX run number %1$d"), count); } @@ -93,8 +95,8 @@ string runMessage(unsigned int count) * CLASS TEXERRORS */ -void TeXErrors::insertError(int line, string const & error_desc, - string const & error_text) +void TeXErrors::insertError(int line, docstring const & error_desc, + docstring const & error_text) { Error newerr(line, error_desc, error_text); errors.push_back(newerr); @@ -156,6 +158,10 @@ void LaTeX::deleteFilesOnError() const string const ind = changeExtension(ofname, ".ind"); unlink(ind); + // nomencl file + string const nls = changeExtension(ofname, ".nls"); + unlink(nls); + // Also remove the aux file string const aux = changeExtension(ofname, ".aux"); unlink(aux); @@ -177,7 +183,7 @@ int LaTeX::run(TeXErrors & terr) bool rerun = false; // rerun requested // The class LaTeX does not know the temp path. - bufferlist.updateIncludedTeXfiles(getcwd(), runparams); + theBufferList().updateIncludedTeXfiles(getcwd(), runparams); // Never write the depfile if an error was encountered. @@ -269,12 +275,23 @@ int LaTeX::run(TeXErrors & terr) // the .aux file is checked for signs of bibtex. Bibtex is then run // if needed. + // memoir (at least) writes an empty *idx file in the first place. + // A second latex run is needed. + rerun = fs::exists(changeExtension(file, ".idx")) + && fs::is_empty(changeExtension(file, ".idx")); + // run makeindex if (head.haschanged(onlyFilename(changeExtension(file, ".idx")))) { // no checks for now lyxerr[Debug::LATEX] << "Running MakeIndex." << endl; message(_("Running MakeIndex.")); - rerun = runMakeIndex(onlyFilename(changeExtension(file, ".idx")), runparams); + rerun |= runMakeIndex(onlyFilename(changeExtension(file, ".idx")), runparams); + } + if (head.haschanged(onlyFilename(changeExtension(file, ".nlo")))) { + lyxerr[Debug::LATEX] << "Running MakeIndex for nomencl." << endl; + message(_("Running MakeIndex for nomencl.")); + string const nomenclstr = " -s nomencl.ist -o " + changeExtension(file, ".nls"); + rerun |= runMakeIndex(onlyFilename(changeExtension(file, ".nlo")), runparams, nomenclstr); } // run bibtex @@ -331,7 +348,7 @@ int LaTeX::run(TeXErrors & terr) // 1.5 // The inclusion of files generated by external programs like - // makeindex or bibtex might have done changes to pagenumbereing, + // makeindex or bibtex might have done changes to pagenumbering, // etc. And because of this we must run the external programs // again to make sure everything is redone correctly. // Also there should be no need to run the external programs any @@ -345,6 +362,14 @@ int LaTeX::run(TeXErrors & terr) rerun = runMakeIndex(onlyFilename(changeExtension(file, ".idx")), runparams); } + // I am not pretty sure if need this twice. + if (head.haschanged(onlyFilename(changeExtension(file, ".nlo")))) { + lyxerr[Debug::LATEX] << "Running MakeIndex for nomencl." << endl; + message(_("Running MakeIndex for nomencl.")); + string nomenclstr = " -s nomencl.ist -o " + changeExtension(file, ".nls"); + rerun |= runMakeIndex(onlyFilename(changeExtension(file, ".nlo")), runparams, nomenclstr); + } + // 2 // we will only run latex more if the log file asks for it. // or if the sumchange() is true. @@ -389,14 +414,17 @@ int LaTeX::startscript() } -bool LaTeX::runMakeIndex(string const & f, OutputParams const & runparams) +bool LaTeX::runMakeIndex(string const & f, OutputParams const & runparams, + string const & params) { - lyxerr[Debug::LATEX] << "idx file has been made," - " running makeindex on file " - << f << endl; - string tmp = lyxrc.index_command + " "; + lyxerr[Debug::LATEX] + << "idx file has been made, running makeindex on file " + << f << endl; + string tmp = lyxrc.index_command + ' '; + tmp = subst(tmp, "$$lang", runparams.document_language); tmp += quoteName(f); + tmp += params; Systemcall one; one.startscript(Systemcall::Wait, tmp); return true; @@ -643,7 +671,11 @@ int LaTeX::scanLogFile(TeXErrors & terr) last_line = line; } if (line_count <= 5) { - terr.insertError(line, desc, errstr); + // FIXME UNICODE + // We have no idea what the encoding of the log file is + // (probably pure ascii, but maybe some localized + // latex compilers or packages exist) + terr.insertError(line, from_utf8(desc), from_utf8(errstr)); ++num_errors; } } @@ -751,10 +783,18 @@ void LaTeX::deplog(DepTable & head) static regex reg3("No file ([^ ]+)\\..*"); static 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: + // \openout# = 'sample.idx'. + // but instead only a line like this into the log: // Writing index file sample.idx static regex reg5("Writing index file ([^ ]+).*"); + static regex regnomencl("Writing nomenclature file ([^ ]+).*"); + // If a toc should be created, MikTex does not write a line like + // \openout# = `sample.toc'. + // but only a line like this into the log: + // \tf@toc=\write# + // This line is also written by tetex. + // This line is not present if no toc should be created. + static regex miktexTocReg("\\\\tf@toc=\\\\write.*"); ifstream ifs(logfile.c_str()); while (ifs) { @@ -788,17 +828,23 @@ void LaTeX::deplog(DepTable & head) first = what[0].second; handleFoundFile(what.str(1), head); } - } else if (regex_match(token, sub, reg2)) { + } else if (regex_match(token, sub, reg2)) handleFoundFile(sub.str(1), head); - } else if (regex_match(token, sub, reg3)) { + else if (regex_match(token, sub, reg3)) handleFoundFile(sub.str(1), head); - } else if (regex_match(token, sub, reg4)) { + else if (regex_match(token, sub, reg4)) handleFoundFile(sub.str(1), head); - } else if (regex_match(token, sub, reg5)) { + else if (regex_match(token, sub, reg5)) handleFoundFile(sub.str(1), head); - } + else if (regex_match(token, sub, regnomencl)) + handleFoundFile(sub.str(1), head); + else if (regex_match(token, sub, miktexTocReg)) + handleFoundFile(changeExtension(file, ".toc"), head); } // Make sure that the main .tex file is in the dependancy file. head.insert(onlyFilename(file), true); } + + +} // namespace lyx