using support::bformat;
using support::changeExtension;
using support::contains;
+using support::FileName;
using support::findtexfile;
using support::getcwd;
+using support::makeAbsPath;
using support::onlyFilename;
using support::prefixIs;
using support::quoteName;
* 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);
: cmd(latex), file(f), path(p), runparams(rp)
{
num_errors = 0;
- depfile = file + ".dep";
if (prefixIs(cmd, "pdf")) { // Do we use pdflatex ?
- depfile += "-pdf";
+ depfile = FileName(makeAbsPath(file + ".dep-pdf"));
output_file = changeExtension(file,".pdf");
} else {
+ depfile = FileName(makeAbsPath(file + ".dep"));
output_file = changeExtension(file,".dvi");
}
}
// but the reason for the error might be in a generated file...
- string const ofname = onlyFilename(file);
-
// bibtex file
- string const bbl = changeExtension(ofname, ".bbl");
+ FileName const bbl(makeAbsPath(changeExtension(file, ".bbl")));
unlink(bbl);
// makeindex file
- string const ind = changeExtension(ofname, ".ind");
+ FileName const ind(makeAbsPath(changeExtension(file, ".ind")));
unlink(ind);
+ // nomencl file
+ FileName const nls(makeAbsPath(changeExtension(file, ".nls")));
+ unlink(nls);
+
// Also remove the aux file
- string const aux = changeExtension(ofname, ".aux");
+ FileName const aux(makeAbsPath(changeExtension(file, ".aux")));
unlink(aux);
}
// remake the dependency file.
//
- bool had_depfile = fs::exists(depfile);
+ bool had_depfile = fs::exists(depfile.toFilesystemEncoding());
bool run_bibtex = false;
string aux_file = onlyFilename(changeExtension(file, "aux"));
&& fs::is_empty(changeExtension(file, ".idx"));
// run makeindex
- if (head.haschanged(onlyFilename(changeExtension(file, ".idx")))) {
+ if (head.haschanged(FileName(makeAbsPath(onlyFilename(changeExtension(file, ".idx")))))) {
// no checks for now
lyxerr[Debug::LATEX] << "Running MakeIndex." << endl;
message(_("Running MakeIndex."));
rerun |= runMakeIndex(onlyFilename(changeExtension(file, ".idx")), runparams);
}
+ if (head.haschanged(FileName(makeAbsPath(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
// if (scanres & UNDEF_CIT || scanres & RERUN || run_bibtex)
// more after this.
// run makeindex if the <file>.idx has changed or was generated.
- if (head.haschanged(onlyFilename(changeExtension(file, ".idx")))) {
+ if (head.haschanged(FileName(makeAbsPath(onlyFilename(changeExtension(file, ".idx")))))) {
// no checks for now
lyxerr[Debug::LATEX] << "Running MakeIndex." << endl;
message(_("Running MakeIndex."));
rerun = runMakeIndex(onlyFilename(changeExtension(file, ".idx")), runparams);
}
+ // I am not pretty sure if need this twice.
+ if (head.haschanged(FileName(makeAbsPath(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.
}
-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;
it2 != it->databases.end(); ++it2) {
string file = findtexfile(*it2, "bib");
if (!file.empty())
- dep.insert(file, true);
+ dep.insert(FileName(makeAbsPath(file)), true);
}
for (set<string>::const_iterator it2 = it->styles.begin();
it2 != it->styles.end(); ++it2) {
string file = findtexfile(*it2, "bst");
if (!file.empty())
- dep.insert(file, true);
+ dep.insert(FileName(makeAbsPath(file)), true);
}
}
}
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;
}
}
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
+ // since this file cannot be a file generated by
// the latex run.
if (fs::exists(foundfile) && !fs::is_directory(foundfile))
- head.insert(foundfile, true);
+ head.insert(FileName(makeAbsPath(foundfile)), true);
return;
}
<< "Tmpdir TeX file: "
<< onlyfile
<< endl;
- head.insert(onlyfile, true);
+ head.insert(FileName(makeAbsPath(onlyfile)), true);
} else {
lyxerr[Debug::DEPEND]
<< "In tmpdir file:"
<< onlyfile
<< endl;
- head.insert(onlyfile);
+ head.insert(FileName(makeAbsPath(onlyfile)));
}
} else
lyxerr[Debug::DEPEND]
// 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:
handleFoundFile(sub.str(1), head);
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);
+ head.insert(FileName(makeAbsPath(onlyFilename(file))), true);
}
projects / lyx.git / blobdiff