X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferParams.cpp;h=caa2dcb4f422b68392fa7aef46f80bd129a6eaa5;hb=32b65a8ee5ad6d5264011b66771a6ed91633ba3d;hp=9fa1f1ae4631a3d8bc8587a75336739afda63e3e;hpb=6bcbd907a46f160fb62b05f8c665367754f324fd;p=lyx.git

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 9fa1f1ae46..caa2dcb4f4 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -2350,17 +2350,7 @@ bool BufferParams::addLayoutModule(string const & modName)
 
 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();
 }
 
 
@@ -2417,17 +2407,14 @@ vector<string> BufferParams::backends() const
 
 	// FIXME: Don't hardcode format names here, but use a flag
 	if (buffmt == "latex") {
-		if (!useNonTeXFonts) {
-			v.push_back("pdflatex");
-			v.push_back("latex");
-		}
-		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()) {
+		if (encoding().package() == Encoding::japanese)
+			v.push_back("platex");
+		else {
+			if (!useNonTeXFonts) {
+				v.push_back("pdflatex");
+				v.push_back("latex");
+			}
+			v.push_back("xetex");
 			v.push_back("luatex");
 			v.push_back("dviluatex");
 		}