X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FDocIterator.cpp;h=d14e0b32ab27090c96ce2a57f1955e9731f1837e;hb=29d80772fc832a914c73b4de3010b7f4c108a5e3;hp=b4883aa2d7f048dcfafd18949321245d3d8960cf;hpb=27ba6f282dc36b5cb500bbd51c2f87fd697d0626;p=lyx.git

diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp
index b4883aa2d7..d14e0b32ab 100644
--- a/src/DocIterator.cpp
+++ b/src/DocIterator.cpp
@@ -738,6 +738,10 @@ 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 =
@@ -777,7 +781,7 @@ 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 
+			Encoding const * oenc = customenc
 									? &bp.encoding() : olang->encoding();
 			if (olang->encoding()->name() != "inherit")
 				return oenc;