return OutputParams::XETEX;
if (conv.latex_flavor == "lualatex")
return OutputParams::LUATEX;
+ if (conv.latex_flavor == "dvilualatex")
+ return OutputParams::DVILUATEX;
if (conv.latex_flavor == "pdflatex")
return OutputParams::PDFLATEX;
if (conv.xml)
LYXERR(Debug::FILES, "No converter defined! "
"I use convertDefault.py:\n\t" << command);
Systemcall one;
- one.startscript(Systemcall::Wait, command);
+ one.startscript(Systemcall::Wait, command, buffer ?
+ buffer->filePath() : string());
if (to_file.isReadableFile()) {
if (conversionflags & try_cache)
ConverterCache::get().add(orig_from,
runparams.flavor = getFlavor(edgepath);
if (buffer) {
- runparams.use_japanese = buffer->bufferFormat() == "platex";
+ runparams.use_japanese = buffer->params().bufferFormat() == "platex";
runparams.use_indices = buffer->params().use_indices;
runparams.bibtex_command = (buffer->params().bibtex_command == "default") ?
string() : buffer->params().bibtex_command;
int res;
if (dummy) {
res = one.startscript(Systemcall::DontWait,
- to_filesystem8bit(from_utf8(command)));
+ to_filesystem8bit(from_utf8(command)),
+ buffer ? buffer->filePath() : string());
// We're not waiting for the result, so we can't do anything
// else here.
} else {
res = one.startscript(Systemcall::Wait,
- to_filesystem8bit(from_utf8(command)));
+ to_filesystem8bit(from_utf8(command)),
+ buffer ? buffer->filePath()
+ : string());
if (!real_outfile.empty()) {
Mover const & mover = getMover(conv.to);
if (!mover.rename(outfile, real_outfile))
" < " + quoteName(infile2 + ".out") +
" > " + quoteName(logfile);
one.startscript(Systemcall::Wait,
- to_filesystem8bit(from_utf8(command2)));
+ to_filesystem8bit(from_utf8(command2)),
+ buffer->filePath());
if (!scanLog(*buffer, command, makeAbsPath(logfile, path), errorList))
return false;
}
// do the LaTeX run(s)
string const name = buffer.latexName();
- LaTeX latex(command, runparams, FileName(makeAbsPath(name)));
+ LaTeX latex(command, runparams, FileName(makeAbsPath(name)),
+ buffer.filePath());
TeXErrors terr;
ShowMessage show(buffer);
latex.message.connect(show);
vector<Format const *> const
Converters::getReachable(string const & from, bool const only_viewable,
- bool const clear_visited, vector<string> const & excludes)
+ bool const clear_visited, set<string> const & excludes)
{
- vector<int> excluded_numbers(excludes.size());
+ set<int> excluded_numbers;;
- vector<string>::const_iterator sit = excludes.begin();
- vector<string>::const_iterator const end = excludes.end();
- vector<int>::iterator it = excluded_numbers.begin();
- for ( ; sit != end; ++sit, ++it) {
- *it = formats.getNumber(*sit);
- }
+ set<string>::const_iterator sit = excludes.begin();
+ set<string>::const_iterator const end = excludes.end();
+ for (; sit != end; ++sit)
+ excluded_numbers.insert(formats.getNumber(*sit));
vector<int> const & reachables =
G_.getReachable(formats.getNumber(from),
v.push_back("latex");
v.push_back("literate");
v.push_back("luatex");
+ v.push_back("dviluatex");
v.push_back("lyx");
v.push_back("xhtml");
v.push_back("pdflatex");