Fix display of single-char macro names

[lyx.git] / src / DocIterator.cpp

diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp
index fdb61876d6ca3975e9b0b417f1dea9804fb86bd8..e9b958030025a9f8bca9006877691378eaf2ef73 100644 (file)
--- a/src/DocIterator.cpp
+++ b/src/DocIterator.cpp
@@ -15,7 +15,11 @@
 #include "DocIterator.h"
 
 #include "Buffer.h"
+#include "BufferParams.h"
+#include "Encoding.h"
+#include "Font.h"
 #include "InsetList.h"
+#include "Language.h"
 #include "Paragraph.h"
 #include "LyXRC.h"
 #include "Text.h"
@@ -60,7 +64,7 @@ DocIterator::DocIterator(Buffer * buf, Inset * inset)
 
 DocIterator doc_iterator_begin(const Buffer * buf0, const Inset * inset0)
 {
-       Buffer * buf = const_cast<Buffer *>(buf0);      
+       Buffer * buf = const_cast<Buffer *>(buf0);
        Inset * inset = const_cast<Inset *>(inset0);
        DocIterator dit(buf, inset ? inset : &buf->inset());
        dit.forwardPos();
@@ -70,7 +74,7 @@ DocIterator doc_iterator_begin(const Buffer * buf0, const Inset * inset0)
 
 DocIterator doc_iterator_end(const Buffer * buf0, const Inset * inset0)
 {
-       Buffer * buf = const_cast<Buffer *>(buf0);      
+       Buffer * buf = const_cast<Buffer *>(buf0);
        Inset * inset = const_cast<Inset *>(inset0);
        return DocIterator(buf, inset ? inset : &buf->inset());
 }
@@ -96,7 +100,7 @@ DocIterator DocIterator::clone(Buffer * buffer) const
 bool DocIterator::inRegexped() const
 {
        InsetMath * im = inset().asInsetMath();
-       if (!im) 
+       if (!im)
                return false;
        InsetMathHull * hull = im->asHullInset();
        return hull && hull->getType() == hullRegexp;
@@ -318,6 +322,24 @@ Inset * DocIterator::innerInsetOfType(int code) const
 }
 
 
+bool DocIterator::posBackward()
+{
+       if (pos() == 0)
+               return false;
+       --pos();
+       return true;
+}
+
+
+bool DocIterator::posForward()
+{
+       if (pos() == lastpos())
+               return false;
+       ++pos();
+       return true;
+}
+
+
 // This duplicates code above, but is in the critical path.
 // So please think twice before adding stuff
 void DocIterator::forwardPos()
@@ -536,7 +558,7 @@ bool DocIterator::fixIfBroken()
        if (empty())
                return false;
 
-       // Go through the slice stack from the bottom. 
+       // Go through the slice stack from the bottom.
        // Check that all coordinates (idx, pit, pos) are correct and
        // that the inset is the one which is claimed to be there
        Inset * inset = &slices_[0].inset();
@@ -544,7 +566,7 @@ bool DocIterator::fixIfBroken()
        size_t n = slices_.size();
        for (; i != n; ++i) {
                CursorSlice & cs = slices_[i];
-               if (&cs.inset() != inset) {
+               if (&cs.inset() != inset || ! cs.inset().isActive()) {
                        // the whole slice is wrong, chop off this as well
                        --i;
                        LYXERR(Debug::DEBUG, "fixIfBroken(): inset changed");
@@ -633,7 +655,7 @@ int DocIterator::find(MathData const & cell) const
 }
 
 
-int DocIterator::find(Inset const * inset) const 
+int DocIterator::find(Inset const * inset) const
 {
        for (size_t l = 0; l != slices_.size(); ++l) {
                if (&slices_[l].inset() == inset)
@@ -656,13 +678,13 @@ void DocIterator::cutOff(int above)
 }
 
 
-void DocIterator::append(vector<CursorSlice> const & x) 
+void DocIterator::append(vector<CursorSlice> const & x)
 {
        slices_.insert(slices_.end(), x.begin(), x.end());
 }
 
 
-void DocIterator::append(DocIterator::idx_type idx, pos_type pos) 
+void DocIterator::append(DocIterator::idx_type idx, pos_type pos)
 {
        slices_.push_back(CursorSlice());
        top().idx() = idx;
@@ -670,6 +692,69 @@ void DocIterator::append(DocIterator::idx_type idx, pos_type pos)
 }
 
 
+Encoding const * DocIterator::getEncoding() const
+{
+       if (empty())
+               return 0;
+
+       BufferParams const & bp = buffer()->params();
+       if (bp.useNonTeXFonts)
+               return encodings.fromLyXName("utf8-plain");
+
+       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();
+
+       // 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"
+       if (lang->encoding()->name() == "inherit") {
+               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();
+                       // 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();
+                       if (olang->encoding()->name() != "inherit")
+                               return oenc;
+               }
+       }
+
+       return enc;
+}
+
+
 ostream & operator<<(ostream & os, DocIterator const & dit)
 {
        for (size_t i = 0, n = dit.depth(); i != n; ++i)