#include <config.h>
-#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"
#include <fstream>
-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;
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.
// - 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);
}
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.
bool LaTeX::runMakeIndex(string const & f, OutputParams const & runparams)
{
lyxerr[Debug::LATEX] << "idx file has been made,"
- " running makeindex on file "
- << f << endl;
+ " running makeindex on file " << f << endl;
string tmp = lyxrc.index_command + " ";
tmp = subst(tmp, "$$lang", runparams.document_language);
tmp += quoteName(f);
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 ([^ ]+).*");
+ // 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) {
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, 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