Re-order and re-shortcut the edit menu.

[lyx.git] / src / DocIterator.cpp

diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp
index beb4b2ad50332f2bcc1c7fefc0e74dc80bcde72b..d14e0b32ab27090c96ce2a57f1955e9731f1837e 100644 (file)
--- a/src/DocIterator.cpp
+++ b/src/DocIterator.cpp
@@ -656,6 +656,26 @@ void DocIterator::sanitize()
 }
 
 
+bool DocIterator::isInside(Inset const * p) const
+{
+       for (CursorSlice const & sl : slices_)
+               if (&sl.inset() == p)
+                       return true;
+       return false;
+}
+
+
+void DocIterator::leaveInset(Inset const & inset)
+{
+       for (size_t i = 0; i != slices_.size(); ++i) {
+               if (&slices_[i].inset() == &inset) {
+                       resize(i);
+                       return;
+               }
+       }
+}
+
+
 int DocIterator::find(MathData const & cell) const
 {
        for (size_t l = 0; l != slices_.size(); ++l) {
@@ -718,18 +738,37 @@ 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).
+       if (inset().forcedEncoding(enc, encodings.fromLyXName("iso8859-1"))) {
+               // Get the language outside the inset
+               size_t const n = depth();
+               for (size_t i = 0; i < n; ++i) {
+                       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();
+                       Encoding const * oenc = olang->encoding();
+                       if (oenc->name() != "inherit")
+                               return inset().forcedEncoding(enc, oenc);
+               }
+               // Fall back to buffer encoding if no outer lang was found.
+               return inset().forcedEncoding(enc, &bp.encoding());
+       }
 
        // Inherited encoding (latex_language) is determined by the context
        // Look for the first outer encoding that is not itself "inherit"
@@ -742,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;
                }