string const token_to("$$o");
string const token_path("$$p");
string const token_orig_path("$$r");
+string const token_orig_from("$$f");
string const token_encoding("$$e");
+string const token_latex_encoding("$$E");
string const add_options(string const & command, string const & options)
}
-bool operator<(Converter const & a, Converter const & b)
-{
- // use the compare_ascii_no_case instead of compare_no_case,
- // because in turkish, 'i' is not the lowercase version of 'I',
- // and thus turkish locale breaks parsing of tags.
- int const i = compare_ascii_no_case(a.From->prettyname(),
- b.From->prettyname());
- if (i == 0)
- return compare_ascii_no_case(a.To->prettyname(),
- b.To->prettyname()) < 0;
- else
- return i < 0;
-}
-
-
Converter const * Converters::getConverter(string const & from,
string const & to) const
{
}
-void Converters::sort()
-{
- std::sort(converterlist_.begin(), converterlist_.end());
-}
-
-
OutputParams::FLAVOR Converters::getFlavor(Graph::EdgePath const & path)
{
for (Graph::EdgePath::const_iterator cit = path.begin();
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)
// This has the added benefit that all other files that may be
// generated by the converter are deleted when LyX closes and do not
// clutter the real working directory.
+ // FIXME: This does not work if path is an UNC path on windows
+ // (bug 6127).
string const path(onlyPath(from_file.absFileName()));
// Prevent the compiler from optimizing away p
FileName pp(path);
<< conv.from << " to " << conv.to);
}
infile = outfile;
- outfile = FileName(conv.result_dir.empty()
+ outfile = FileName(conv.result_file.empty()
? changeExtension(from_file.absFileName(), conv.To->extension())
: addName(subst(conv.result_dir,
token_base, from_base),
// if input and output files are equal, we use a
// temporary file as intermediary (JMarc)
FileName real_outfile;
+ if (!conv.result_file.empty())
+ real_outfile = FileName(changeExtension(from_file.absFileName(),
+ conv.To->extension()));
if (outfile == infile) {
real_outfile = infile;
// when importing, a buffer does not necessarily exist
if (conv.latex) {
run_latex = true;
- string const command = subst(conv.command, token_from, "");
+ string command = conv.command;
+ command = subst(command, token_from, "");
+ command = subst(command, token_latex_encoding, buffer ?
+ buffer->params().encoding().latexName() : string());
LYXERR(Debug::FILES, "Running " << command);
if (!runLaTeX(*buffer, command, runparams, errorList))
return false;
command = subst(command, token_to, quoteName(outfile2));
command = subst(command, token_path, quoteName(onlyPath(infile.absFileName())));
command = subst(command, token_orig_path, quoteName(onlyPath(orig_from.absFileName())));
+ command = subst(command, token_orig_from, quoteName(onlyFileName(orig_from.absFileName())));
command = subst(command, token_encoding, buffer ? buffer->params().encoding().iconvName() : string());
command = libScriptSearch(command);
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");