#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 <boost/filesystem/operations.hpp>
#include <boost/regex.hpp>
#include <fstream>
using lyx::support::bformat;
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::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;
// 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;
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
* 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)
{
// 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"));
// 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()) {
// 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
// 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
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;
result.push_back(scanAuxFile(file));
for (int i = 1; i < 1000; ++i) {
- string file2 = ChangeExtension(file, "") + '.' + tostr(i)
+ string const file2 = ChangeExtension(file, "")
+ + '.' + convert<string>(i)
+ ".aux";
- FileInfo fi(file2);
- if (!fi.exist())
+ if (!fs::exists(file2))
break;
result.push_back(scanAuxFile(file2));
}
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");
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);
}
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;
void handleFoundFile(string const & ff, DepTable & head)
{
- static regex unwanted("^.*\\.(aux|log|dvi|bbl|ind|glo)$");
-
// convert from native os path to unix path
string const foundfile = os::internal_path(trim(ff));
- string const onlyfile = OnlyFilename(foundfile);
lyxerr[Debug::DEPEND] << "Found 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))
head.insert(foundfile, true);
+
+ return;
}
+ string const onlyfile = OnlyFilename(foundfile);
+
// (2) foundfile is in the tmpdir
// insert it into head
- else if (FileInfo(onlyfile).exist()) {
- if (regex_match(foundfile, unwanted)) {
+ if (fs::exists(onlyfile)) {
+ static regex unwanted("^.*\\.(aux|log|dvi|bbl|ind|glo)$");
+ if (regex_match(onlyfile, unwanted)) {
lyxerr[Debug::DEPEND]
<< "We don't want "
<< onlyfile
<< " in the dep file"
<< endl;
- } else if (suffixIs(foundfile, ".tex")) {
+ } else if (suffixIs(onlyfile, ".tex")) {
// This is a tex file generated by LyX
// and latex is not likely to change this
// during its runs.
<< "Tmpdir TeX file: "
<< onlyfile
<< endl;
- head.insert(foundfile, true);
+ head.insert(onlyfile, true);
} else {
lyxerr[Debug::DEPEND]
<< "In tmpdir file:"
string token;
getline(ifs, token);
token = rtrim(token, "\r");
- if (token.empty()) continue;
+ if (token.empty())
+ continue;
smatch sub;