string BufferParams::bufferFormat() const
{
- string format = documentClass().outputFormat();
- if (format == "latex") {
- if (useNonTeXFonts)
- // FIXME: In this context, this means "xetex or luatex"
- // with fontspec. We cannot differentiate further here.
- // But maybe use a more appropriate string.
- return "xetex";
- if (encoding().package() == Encoding::japanese)
- return "platex";
- }
- return format;
+ return documentClass().outputFormat();
}
v.push_back("pdflatex");
v.push_back("latex");
}
+ v.push_back("xetex");
v.push_back("luatex");
v.push_back("dviluatex");
- v.push_back("xetex");
- } else if (buffmt == "xetex") {
- v.push_back("xetex");
- // FIXME: need to test all languages (bug 8205)
- if (!language || !language->isPolyglossiaExclusive()) {
- v.push_back("luatex");
- v.push_back("dviluatex");
- }
} else
v.push_back(buffmt);
runparams.flavor = getFlavor(edgepath, buffer);
if (buffer) {
- runparams.use_japanese = buffer->params().bufferFormat() == "platex";
+ runparams.use_japanese =
+ buffer->params().bufferFormat() == "latex"
+ && buffer->params().encoding().package() == Encoding::japanese;
runparams.use_indices = buffer->params().use_indices;
runparams.bibtex_command = (buffer->params().bibtex_command == "default") ?
string() : buffer->params().bibtex_command;
return N_("DocBook");
else if (s == "literate")
return N_("Literate");
- else if (s == "platex")
- return N_("pLaTeX");
- else if (s == "latex" || "xetex")
- // All LaTeX variants except pLaTeX
- // (LaTeX, PDFLaTeX, XeTeX, LuaTeX)
+ else if (s == "latex")
+ // This covers all LaTeX variants
+ // (LaTeX, PDFLaTeX, XeTeX, LuaTeX, pLaTeX)
return N_("LaTeX");
return s;
}
// glyphs, except if full-unicode aware backends
// such as XeTeX or LuaTeX are used, and with pLaTeX.
bool const multibyte_possible = runparams.isFullUnicode()
- || (buffer().params().bufferFormat() == "platex"
+ || (buffer().params().encoding().package() == Encoding::japanese
&& runparams.encoding->package() == Encoding::japanese);
if (!multibyte_possible && !runparams.encoding->hasFixedWidth()) {