#include "Converter.h"
-#include "ConverterCache.h"
#include "Buffer.h"
#include "buffer_funcs.h"
#include "BufferParams.h"
+#include "ConverterCache.h"
+#include "Encoding.h"
#include "ErrorList.h"
#include "Format.h"
#include "Language.h"
string const token_to("$$o");
string const token_path("$$p");
string const token_orig_path("$$r");
-
+string const token_encoding("$$e");
string const add_options(string const & command, string const & options)
if (conv.latex)
if (contains(conv.from, "xetex"))
return OutputParams::XETEX;
+ if (contains(conv.from, "luatex"))
+ return OutputParams::LUATEX;
if (contains(conv.to, "pdf"))
return OutputParams::PDFLATEX;
if (conv.xml)
// used anyway.
OutputParams runparams(buffer ? &buffer->params().encoding() : 0);
runparams.flavor = getFlavor(edgepath);
-
+
if (buffer) {
runparams.use_japanese = buffer->bufferFormat() == "platex";
runparams.use_indices = buffer->params().use_indices;
: addName(subst(conv.result_dir,
token_base, from_base),
subst(conv.result_file,
- token_base, onlyFilename(from_base))));
+ token_base, onlyFileName(from_base))));
// if input and output files are equal, we use a
// temporary file as intermediary (JMarc)
}
// FIXME UNICODE
- string const infile2 =
+ string const infile2 =
to_utf8(makeRelPath(from_utf8(infile.absFileName()), from_utf8(path)));
- string const outfile2 =
+ string const outfile2 =
to_utf8(makeRelPath(from_utf8(outfile.absFileName()), from_utf8(path)));
string command = conv.command;
command = subst(command, token_to, quoteName(outfile2));
command = subst(command, token_path, quoteName(infile.onlyPath().absFileName()));
command = subst(command, token_orig_path, quoteName(orig_from.onlyPath().absFileName()));
+ command = subst(command, token_encoding, buffer ? buffer->params().encoding().iconvName() : string());
command = libScriptSearch(command);
if (!conv.parselog.empty())
bool no_errors = true;
string const path = onlyPath(from.absFileName());
- string const base = onlyFilename(removeExtension(from.absFileName()));
+ string const base = onlyFileName(removeExtension(from.absFileName()));
string const to_base = removeExtension(to.absFileName());
string const to_extension = getExtension(to.absFileName());
for (support::FileNameList::const_iterator it = files.begin();
it != files.end(); ++it) {
string const from2 = it->absFileName();
- string const file2 = onlyFilename(from2);
+ string const file2 = onlyFileName(from2);
if (prefixIs(file2, base)) {
string const to2 = changeExtension(
to_base + file2.substr(base.length()),
v.push_back("docbook");
v.push_back("latex");
v.push_back("literate");
+ v.push_back("luatex");
v.push_back("lyx");
v.push_back("xhtml");
v.push_back("pdflatex");