X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FDocIterator.cpp;h=d14e0b32ab27090c96ce2a57f1955e9731f1837e;hb=1e519d1115f41f71c253cb9e2fbb7803e9a583a9;hp=d370e0a1e78176150561b24f19a79b6125b17f8e;hpb=4727e2becf6b69d79ead3df1708bfad95699ef6a;p=lyx.git

diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp
index d370e0a1e7..d14e0b32ab 100644
--- a/src/DocIterator.cpp
+++ b/src/DocIterator.cpp
@@ -738,18 +738,19 @@ Encoding const * DocIterator::getEncoding() const
 	if (bp.useNonTeXFonts)
 		return encodings.fromLyXName("utf8-plain");
 
+	// With platex, we don't switch encodings (not even if forced).
+	if (bp.encoding().package() == Encoding::japanese)
+		return &bp.encoding();
+
 	CursorSlice const & sl = innerTextSlice();
 	Text const & text = *sl.text();
 	Language const * lang =
 		text.getPar(sl.pit()).getFont(bp, sl.pos(),
 										  text.outerFont(sl.pit())).language();
-	// If we have a custom encoding for the buffer, we only switch
-	// encoding for CJK (see output_latex::switchEncoding())
-	bool const customenc =
-		bp.inputenc != "auto" && bp.inputenc != "default";
-	Encoding const * enc =
-		(customenc && lang->encoding()->package() != Encoding::CJK)
-		? &bp.encoding() : lang->encoding();
+	// If we have a custom encoding for the buffer, we don't switch
+	// encodings (see output_latex::switchEncoding())
+	bool const customenc = bp.inputenc != "auto-legacy" && bp.inputenc != "auto-legacy-plain";
+	Encoding const * enc = customenc ? &bp.encoding() : lang->encoding();
 
 	// Some insets force specific encodings sometimes (e.g., listings in
 	// multibyte context forces singlebyte).
@@ -780,9 +781,8 @@ Encoding const * DocIterator::getEncoding() const
 														   otext.outerFont(slices_[i].pit())).language();
 			// Again, if we have a custom encoding, this is used
 			// instead of the language's.
-			Encoding const * oenc =
-					(customenc && olang->encoding()->package() != Encoding::CJK)
-					? &bp.encoding() : olang->encoding();
+			Encoding const * oenc = customenc
+									? &bp.encoding() : olang->encoding();
 			if (olang->encoding()->name() != "inherit")
 				return oenc;
 		}