X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeX.C;h=90092a7cf9b782b795053e8542fa4da1094685eb;hb=5e3b997b852fc96eef2387934b600262d3037745;hp=7623aa3acfff738ffd18a6c30dd51219d432ed63;hpb=22c78350229142cb504881e8ecc6dbf71d5bf57e;p=lyx.git diff --git a/src/LaTeX.C b/src/LaTeX.C index 7623aa3acf..90092a7cf9 100644 --- a/src/LaTeX.C +++ b/src/LaTeX.C @@ -17,38 +17,40 @@ #include "LaTeX.h" #include "bufferlist.h" #include "gettext.h" +#include "lyxrc.h" #include "debug.h" #include "DepTable.h" #include "support/filetools.h" -#include "support/FileInfo.h" -#include "support/tostr.h" +#include "support/convert.h" #include "support/lstrings.h" #include "support/lyxlib.h" #include "support/systemcall.h" #include "support/os.h" +#include #include #include -using lyx::support::AbsolutePath; +using lyx::support::absolutePath; using lyx::support::bformat; -using lyx::support::ChangeExtension; +using lyx::support::changeExtension; using lyx::support::contains; -using lyx::support::FileInfo; using lyx::support::findtexfile; using lyx::support::getcwd; -using lyx::support::OnlyFilename; +using lyx::support::onlyFilename; using lyx::support::prefixIs; -using lyx::support::QuoteName; +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 fs = boost::filesystem; using boost::regex; using boost::smatch; @@ -70,13 +72,11 @@ using std::vector; // 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; @@ -84,7 +84,7 @@ namespace { string runMessage(unsigned int count) { - return bformat(_("Waiting for LaTeX run number %1$s"), tostr(count)); + return bformat(_("Waiting for LaTeX run number %1$d"), count); } } // anon namespace @@ -120,7 +120,7 @@ bool operator!=(Aux_Info const & a, Aux_Info const & o) * CLASS LaTeX */ -LaTeX::LaTeX(string const & latex, LatexRunParams const & rp, +LaTeX::LaTeX(string const & latex, OutputParams const & rp, string const & f, string const & p) : cmd(latex), file(f), path(p), runparams(rp) { @@ -128,9 +128,9 @@ LaTeX::LaTeX(string const & latex, LatexRunParams const & rp, depfile = file + ".dep"; if (prefixIs(cmd, "pdf")) { // Do we use pdflatex ? depfile += "-pdf"; - output_file = ChangeExtension(file,".pdf"); + output_file = changeExtension(file,".pdf"); } else { - output_file = ChangeExtension(file,".dvi"); + output_file = changeExtension(file,".dvi"); } } @@ -146,18 +146,18 @@ void LaTeX::deleteFilesOnError() const // but the reason for the error might be in a generated file... - string const ofname = OnlyFilename(file); + string const ofname = onlyFilename(file); // bibtex file - string const bbl = ChangeExtension(ofname, ".bbl"); + string const bbl = changeExtension(ofname, ".bbl"); unlink(bbl); // makeindex file - string const ind = ChangeExtension(ofname, ".ind"); + string const ind = changeExtension(ofname, ".ind"); unlink(ind); // Also remove the aux file - string const aux = ChangeExtension(ofname, ".aux"); + string const aux = changeExtension(ofname, ".aux"); unlink(aux); } @@ -197,10 +197,9 @@ int LaTeX::run(TeXErrors & terr) // remake the dependency file. // - FileInfo fi(depfile); - bool had_depfile = fi.exist(); + bool had_depfile = fs::exists(depfile); bool run_bibtex = false; - string aux_file = OnlyFilename(ChangeExtension(file, "aux")); + string aux_file = onlyFilename(changeExtension(file, "aux")); if (had_depfile) { lyxerr[Debug::DEPEND] << "Dependency file exists" << endl; @@ -214,7 +213,7 @@ int LaTeX::run(TeXErrors & terr) // Can't just check if anything has changed because it might have aborted // on error last time... in which cas we need to re-run latex // and collect the error messages (even if they are the same). - if (!FileInfo(output_file).exist()) { + if (!fs::exists(output_file)) { lyxerr[Debug::DEPEND] << "re-running LaTeX because output file doesn't exist." << endl; } else if (!head.sumchange()) { @@ -271,11 +270,11 @@ int LaTeX::run(TeXErrors & terr) // if needed. // run makeindex - if (head.haschanged(OnlyFilename(ChangeExtension(file, ".idx")))) { + 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"))); + rerun = runMakeIndex(onlyFilename(changeExtension(file, ".idx")), runparams); } // run bibtex @@ -339,11 +338,11 @@ int LaTeX::run(TeXErrors & terr) // more after this. // run makeindex if the .idx has changed or was generated. - if (head.haschanged(OnlyFilename(ChangeExtension(file, ".idx")))) { + 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"))); + rerun = runMakeIndex(onlyFilename(changeExtension(file, ".idx")), runparams); } // 2 @@ -384,28 +383,20 @@ int LaTeX::run(TeXErrors & terr) int LaTeX::startscript() { -#ifndef __EMX__ - string tmp = cmd + ' ' + QuoteName(file) + " > /dev/null"; -#else // cmd.exe (OS/2) causes SYS0003 error at "/dev/null" - string tmp = cmd + ' ' + file + " > nul"; -#endif + string tmp = cmd + ' ' + quoteName(file) + " > " + os::nulldev(); Systemcall one; return one.startscript(Systemcall::Wait, tmp); } -bool LaTeX::runMakeIndex(string const & f) +bool LaTeX::runMakeIndex(string const & f, OutputParams const & runparams) { lyxerr[Debug::LATEX] << "idx file has been made," " running makeindex on file " << 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. - string tmp = "makeindex -c -q "; - tmp += f; + string tmp = lyxrc.index_command + " "; + tmp = subst(tmp, "$$lang", runparams.document_language); + tmp += quoteName(f); Systemcall one; one.startscript(Systemcall::Wait, tmp); return true; @@ -420,10 +411,10 @@ LaTeX::scanAuxFiles(string const & file) result.push_back(scanAuxFile(file)); for (int i = 1; i < 1000; ++i) { - string file2 = ChangeExtension(file, "") + '.' + tostr(i) + string const file2 = changeExtension(file, "") + + '.' + convert(i) + ".aux"; - FileInfo fi(file2); - if (!fi.exist()) + if (!fs::exists(file2)) break; result.push_back(scanAuxFile(file2)); } @@ -446,10 +437,10 @@ void LaTeX::scanAuxFile(string const & file, Aux_Info & aux_info) ifstream ifs(file.c_str()); string token; - regex reg1("\\\\citation\\{([^}]+)\\}"); - regex reg2("\\\\bibdata\\{([^}]+)\\}"); - regex reg3("\\\\bibstyle\\{([^}]+)\\}"); - regex reg4("\\\\@input\\{([^}]+)\\}"); + static regex const reg1("\\\\citation\\{([^}]+)\\}"); + static regex const reg2("\\\\bibdata\\{([^}]+)\\}"); + static regex const reg3("\\\\bibstyle\\{([^}]+)\\}"); + static regex const reg4("\\\\@input\\{([^}]+)\\}"); while (getline(ifs, token)) { token = rtrim(token, "\r"); @@ -470,7 +461,7 @@ void LaTeX::scanAuxFile(string const & file, Aux_Info & aux_info) while (!data.empty()) { string database; data = split(data, database, ','); - database = ChangeExtension(database, "bib"); + database = changeExtension(database, "bib"); lyxerr[Debug::LATEX] << "BibTeX database: `" << database << '\'' << endl; aux_info.databases.insert(database); @@ -479,7 +470,7 @@ void LaTeX::scanAuxFile(string const & file, Aux_Info & aux_info) string style = sub.str(1); // token is now the style file // pass it to the helper - style = ChangeExtension(style, "bst"); + style = changeExtension(style, "bst"); lyxerr[Debug::LATEX] << "BibTeX style: `" << style << '\'' << endl; aux_info.styles.insert(style); @@ -528,8 +519,8 @@ bool LaTeX::runBibTeX(vector const & bibtex_info) continue; result = true; - string tmp = "bibtex "; - tmp += OnlyFilename(ChangeExtension(it->aux_file, string())); + string tmp = lyxrc.bibtex_command + " "; + tmp += quoteName(onlyFilename(changeExtension(it->aux_file, string()))); Systemcall one; one.startscript(Systemcall::Wait, tmp); } @@ -543,18 +534,26 @@ int LaTeX::scanLogFile(TeXErrors & terr) int last_line = -1; int line_count = 1; int retval = NO_ERRORS; - string tmp = OnlyFilename(ChangeExtension(file, ".log")); + string tmp = onlyFilename(changeExtension(file, ".log")); lyxerr[Debug::LATEX] << "Log file: " << tmp << endl; ifstream ifs(tmp.c_str()); string token; while (getline(ifs, token)) { + // MikTeX sometimes inserts \0 in the log file. They can't be + // removed directly with the existing string utility + // functions, so convert them first to \r, and remove all + // \r's afterwards, since we need to remove them anyway. + token = subst(token, '\0', '\r'); + token = subst(token, "\r", ""); + lyxerr[Debug::LATEX] << "Log line: " << token << endl; if (token.empty()) continue; - if (prefixIs(token, "LaTeX Warning:")) { + if (prefixIs(token, "LaTeX Warning:") || + prefixIs(token, "! pdfTeX warning")) { // Here shall we handle different // types of warnings retval |= LATEX_WARNING; @@ -690,23 +689,23 @@ void handleFoundFile(string const & ff, DepTable & head) // (1) foundfile is an // absolute path and should // be inserted. - if (AbsolutePath(foundfile)) { + if (absolutePath(foundfile)) { lyxerr[Debug::DEPEND] << "AbsolutePath file: " << foundfile << endl; // On initial insert we want to do the update at once // since this file can not be a file generated by // the latex run. - if (FileInfo(foundfile).exist()) + if (fs::exists(foundfile) && !fs::is_directory(foundfile)) head.insert(foundfile, true); return; } - string const onlyfile = OnlyFilename(foundfile); + string const onlyfile = onlyFilename(foundfile); // (2) foundfile is in the tmpdir // insert it into head - if (FileInfo(onlyfile).exist()) { + if (fs::exists(onlyfile)) { static regex unwanted("^.*\\.(aux|log|dvi|bbl|ind|glo)$"); if (regex_match(onlyfile, unwanted)) { lyxerr[Debug::DEPEND] @@ -745,7 +744,7 @@ void LaTeX::deplog(DepTable & head) // files used by the LaTeX run. The files are then entered into the // dependency file. - string const logfile = OnlyFilename(ChangeExtension(file, ".log")); + string const logfile = onlyFilename(changeExtension(file, ".log")); static regex reg1(".*\\([^)]+.*"); static regex reg2("File: ([^ ]+).*"); @@ -768,7 +767,12 @@ void LaTeX::deplog(DepTable & head) string token; getline(ifs, token); - token = rtrim(token, "\r"); + // MikTeX sometimes inserts \0 in the log file. They can't be + // removed directly with the existing string utility + // functions, so convert them first to \r, and remove all + // \r's afterwards, since we need to remove them anyway. + token = subst(token, '\0', '\r'); + token = subst(token, "\r", ""); if (token.empty()) continue; @@ -796,5 +800,5 @@ void LaTeX::deplog(DepTable & head) } // Make sure that the main .tex file is in the dependancy file. - head.insert(OnlyFilename(file), true); + head.insert(onlyFilename(file), true); }