Russian layouttranslations reviewed by Yuriy, Dec 13 2017.

[lyx.git] / src / DocIterator.cpp

diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp
index 3d9bd6892b79fc112f3913f4c837745ef7b8c890..58b91dff3620f43a258b2a84daa056413c1da3d9 100644 (file)
--- a/src/DocIterator.cpp
+++ b/src/DocIterator.cpp
@@ -15,9 +15,12 @@
 #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"
 
 #include "mathed/MathData.h"
@@ -60,7 +63,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 +73,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 +99,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;
@@ -156,6 +159,18 @@ Inset * DocIterator::realInset() const
 }
 
 
+InsetMath & DocIterator::nextMath()
+{
+       return *nextAtom().nucleus();
+}
+
+
+InsetMath & DocIterator::prevMath()
+{
+       return *prevAtom().nucleus();
+}
+
+
 MathAtom & DocIterator::prevAtom() const
 {
        LASSERT(!empty(), /**/);
@@ -554,7 +569,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();
@@ -562,7 +577,7 @@ bool DocIterator::fixIfBroken()
        size_t n = slices_.size();
        for (; i != n; ++i) {
                CursorSlice & cs = slices_[i];
-               if (&cs.inset() != inset || !cs.inset().editable()) {
+               if (&cs.inset() != inset || ! cs.inset().isActive()) {
                        // the whole slice is wrong, chop off this as well
                        --i;
                        LYXERR(Debug::DEBUG, "fixIfBroken(): inset changed");
@@ -651,7 +666,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)
@@ -674,13 +689,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;
@@ -688,6 +703,28 @@ void DocIterator::append(DocIterator::idx_type idx, pos_type pos)
 }
 
 
+docstring DocIterator::getPossibleLabel() const
+{
+       return inMathed() ? from_ascii("eq:") : text()->getPossibleLabel(*this);
+}
+
+
+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();
+       Font font = text.getPar(sl.pit()).getFont(bp, sl.pos(),
+                                                 text.outerFont(sl.pit()));
+       return font.language()->encoding();
+}
+
+
 ostream & operator<<(ostream & os, DocIterator const & dit)
 {
        for (size_t i = 0, n = dit.depth(); i != n; ++i)