* frontends/qt4/GuiWorkArea.C: make "unknown version" translateable

[lyx.git] / src / bufferview_funcs.C

diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index fedeccdd6b858ffd9c50f7c6fde0162605f081f9..bd47dcefa772b240c6c7cb34ab2f44c302a6a175 100644 (file)
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -32,7 +32,6 @@
 #include "pariterator.h"
 
 #include "frontends/Alert.h"
-#include "frontends/LyXView.h"
 
 #include "insets/insetcommand.h"
 #include "insets/insettext.h"
@@ -41,12 +40,16 @@
 
 #include <sstream>
 
-using lyx::support::bformat;
+
+namespace lyx {
+
+using support::bformat;
 
 using std::istringstream;
 using std::ostringstream;
 using std::string;
 using std::vector;
+using std::find;
 
 
 namespace bv_funcs {
@@ -153,7 +156,8 @@ bool string2font(string const & data, LyXFont & font, bool & toggle)
 // the next two should probably go elsewhere
 // this give the position relative to (0, baseline) of outermost
 // paragraph
-Point coordOffset(DocIterator const & dit, bool boundary)
+Point coordOffset(BufferView const & bv, DocIterator const & dit,
+               bool boundary)
 {
        int x = 0;
        int y = 0;
@@ -163,7 +167,7 @@ Point coordOffset(DocIterator const & dit, bool boundary)
                CursorSlice const & sl = dit[i];
                int xx = 0;
                int yy = 0;
-               sl.inset().cursorPos(sl, boundary && ((i+1) == dit.depth()), xx, yy);
+               sl.inset().cursorPos(bv, sl, boundary && ((i+1) == dit.depth()), xx, yy);
                x += xx;
                y += yy;
                //lyxerr << "LCursor::getPos, i: "
@@ -173,6 +177,10 @@ Point coordOffset(DocIterator const & dit, bool boundary)
        // Add contribution of initial rows of outermost paragraph
        CursorSlice const & sl = dit[0];
        Paragraph const & par = sl.text()->getPar(sl.pit());
+       if (par.rows().empty())
+               // FIXME: The special case below happens for empty paragraph creation
+               const_cast<LyXText *>(sl.text())->redoParagraph(const_cast<BufferView &>(bv), sl.pit());
+       BOOST_ASSERT(!par.rows().empty());
        y -= par.rows()[0].ascent();
 #if 1
        size_t rend;
@@ -190,25 +198,27 @@ Point coordOffset(DocIterator const & dit, bool boundary)
        for (size_t rit = 0; rit != rend; ++rit)
                y += par.rows()[rit].height();
        y += par.rows()[rend].ascent();
-       x += dit.bottom().text()->cursorX(dit.bottom(), boundary && dit.depth() == 1);
-       // The following correction should not be there at all.
-       // The cursor looks much better with the -1, though.
-       --x;
+       x += dit.bottom().text()->cursorX(*bv.buffer(), dit.bottom(), boundary && dit.depth() == 1);
+
        return Point(x, y);
 }
 
 
-Point getPos(DocIterator const & dit, bool boundary)
+Point getPos(BufferView const & bv, DocIterator const & dit, bool boundary)
 {
        CursorSlice const & bot = dit.bottom();
-       CoordCache::InnerParPosCache const & cache =
-               theCoords.getParPos().find(bot.text())->second;
+       CoordCache::ParPosCache::const_iterator cache_it = 
+               bv.coordCache().getParPos().find(bot.text());
+       if (cache_it == bv.coordCache().getParPos().end())
+               return Point(-1, -1);
+
+       CoordCache::InnerParPosCache const & cache = cache_it->second;
        CoordCache::InnerParPosCache::const_iterator it = cache.find(bot.pit());
        if (it == cache.end()) {
                //lyxerr << "cursor out of view" << std::endl;
                return Point(-1, -1);
        }
-       Point p = coordOffset(dit, boundary); // offset from outer paragraph
+       Point p = coordOffset(bv, dit, boundary); // offset from outer paragraph
        p.y_ += it->second.y_;
        return p;
 }
@@ -217,7 +227,8 @@ Point getPos(DocIterator const & dit, bool boundary)
 // this could be used elsewhere as well?
 CurStatus status(BufferView const * bv, DocIterator const & dit)
 {
-       CoordCache::InnerParPosCache const & cache = theCoords.getParPos().find(dit.bottom().text())->second;
+       CoordCache::InnerParPosCache const & cache =
+               bv->coordCache().getParPos().find(dit.bottom().text())->second;
 
        if (cache.find(dit.bottom().pit()) != cache.end())
                return CUR_INSIDE;
@@ -259,6 +270,8 @@ bool findInset(DocIterator & dit, vector<InsetBase_code> const & codes,
        string contents;
        DocIterator tmpdit = dit;
        tmpdit.forwardInset();
+       if (!tmpdit)
+               return false;
 
        if (same_content) {
                InsetBase const * inset = tmpdit.nextInset();
@@ -277,7 +290,7 @@ bool findInset(DocIterator & dit, vector<InsetBase_code> const & codes,
                } else
                        return false;
        }
-       
+
        dit = tmpdit;
        return true;
 }
@@ -310,3 +323,6 @@ void gotoInset(BufferView * bv, InsetBase_code code, bool same_content)
 
 
 } // namespace bv_funcs
+
+
+} // namespace lyx