More requires --> required, for C++2a.

[lyx.git] / src / DocIterator.cpp

diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp
index b4883aa2d7f048dcfafd18949321245d3d8960cf..13886c32ddbee2624a284bd511efe2422f442da6 100644 (file)
--- a/src/DocIterator.cpp
+++ b/src/DocIterator.cpp
@@ -738,11 +738,14 @@ 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();
+               text.getPar(sl.pit()).getFont(bp, sl.pos(), text.outerFont(sl.pit())).language();
        // 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";
@@ -757,7 +760,7 @@ Encoding const * DocIterator::getEncoding() const
                        Text const & otext = *slices_[i].text();
                        Language const * olang =
                                        otext.getPar(slices_[i].pit()).getFont(bp, slices_[i].pos(),
-                                                                                                                  otext.outerFont(slices_[i].pit())).language();
+                                                                              otext.outerFont(slices_[i].pit())).language();
                        Encoding const * oenc = olang->encoding();
                        if (oenc->name() != "inherit")
                                return inset().forcedEncoding(enc, oenc);
@@ -774,11 +777,10 @@ Encoding const * DocIterator::getEncoding() const
                        Text const & otext = *slices_[i].text();
                        Language const * olang =
                                        otext.getPar(slices_[i].pit()).getFont(bp, slices_[i].pos(),
-                                                                                                                  otext.outerFont(slices_[i].pit())).language();
+                                                                              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 
-                                                                       ? &bp.encoding() : olang->encoding();
+                       Encoding const * oenc = customenc ? &bp.encoding() : olang->encoding();
                        if (olang->encoding()->name() != "inherit")
                                return oenc;
                }