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).
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;
}