minimal effort implementation of:

[lyx.git] / src / cursor.C

diff --git a/src/cursor.C b/src/cursor.C
index 1bbae28a5c97ead5e5affff3a49cb9e518964197..a0603328452a98586598dff1ac35714762b88263 100644 (file)
--- a/src/cursor.C
+++ b/src/cursor.C
@@ -39,6 +39,7 @@
 #include "mathed/math_inset.h"
 #include "mathed/math_scriptinset.h"
 #include "mathed/math_macrotable.h"
+#include "mathed/math_parser.h"
 
 #include "support/limited_stack.h"
 
@@ -52,6 +53,7 @@
 #include <sstream>
 #include <limits>
 
+using lyx::char_type;
 using lyx::pit_type;
 
 using std::string;
@@ -61,7 +63,6 @@ using std::endl;
 using std::isalpha;
 #endif
 using std::min;
-using std::swap;
 
 namespace {
 
@@ -127,16 +128,26 @@ namespace {
                BOOST_ASSERT(!cursor.empty());
                InsetBase & inset = cursor[0].inset();
 
-               DocIterator it = doc_iterator_begin(inset);
-               DocIterator const et = doc_iterator_end(inset);
+               CoordCache::InnerParPosCache const & cache = theCoords.getParPos().find(cursor.bottom().text())->second;
+               // Get an iterator on the first paragraph in the cache
+               DocIterator it(inset);
+               it.push_back(CursorSlice(inset));
+               it.pit() = cache.begin()->first;
+               // Get an iterator after the last paragraph in the cache
+               DocIterator et(inset);
+               et.push_back(CursorSlice(inset));
+               et.pit() = boost::prior(cache.end())->first;
+               if (et.pit() >= et.lastpit())
+                       et = doc_iterator_end(inset);
+               else
+                       ++et.pit();
 
                double best_dist = std::numeric_limits<double>::max();;
                DocIterator best_cursor = et;
 
                for ( ; it != et; it.forwardPos(true)) {
                        // avoid invalid nesting when selecting
-                       if (bv_funcs::status(&cursor.bv(), it) == bv_funcs::CUR_INSIDE
-                           && (!cursor.selection() || positionable(it, cursor.anchor_))) {
+                       if (!cursor.selection() || positionable(it, cursor.anchor_)) {
                                Point p = bv_funcs::getPos(it, false);
                                int xo = p.x_;
                                int yo = p.y_;
@@ -147,7 +158,7 @@ namespace {
                                        // '<=' in order to take the last possible position
                                        // this is important for clicking behind \sum in e.g. '\sum_i a'
                                        if (d <= best_dist) {
-                                               lyxerr << "*" << endl;
+                                               //      lyxerr << "*" << endl;
                                                best_dist   = d;
                                                best_cursor = it;
                                        }
@@ -179,8 +190,8 @@ namespace {
                //lyxerr << "Pit start: " << from << endl;
 
                //lyxerr << "bruteFind3: x: " << x << " y: " << y
-               //      << " xlow: " << xlow << " xhigh: " << xhigh 
-               //      << " ylow: " << ylow << " yhigh: " << yhigh 
+               //      << " xlow: " << xlow << " xhigh: " << xhigh
+               //      << " ylow: " << ylow << " yhigh: " << yhigh
                //      << endl;
                InsetBase & inset = bv.buffer()->inset();
                DocIterator it = doc_iterator_begin(inset);
@@ -627,7 +638,7 @@ void LCursor::plainErase()
 
 void LCursor::markInsert()
 {
-       insert(char(0));
+       insert(char_type(0));
 }
 
 
@@ -647,12 +658,12 @@ void LCursor::plainInsert(MathAtom const & t)
 void LCursor::insert(string const & str)
 {
        for_each(str.begin(), str.end(),
-                boost::bind(static_cast<void(LCursor::*)(char)>
+                boost::bind(static_cast<void(LCursor::*)(char_type)>
                             (&LCursor::insert), this, _1));
 }
 
 
-void LCursor::insert(char c)
+void LCursor::insert(char_type c)
 {
        //lyxerr << "LCursor::insert char '" << c << "'" << endl;
        BOOST_ASSERT(!empty());
@@ -848,6 +859,9 @@ bool LCursor::macroModeClose()
        if (macro && macro->getInsetName() == name)
                lyxerr << "can't enter recursive macro" << endl;
 
+       MathNestInset * const in = inset().asMathInset()->asNestInset();
+       if (in && in->interpret(*this, s))
+               return true;
        plainInsert(createMathInset(name));
        return true;
 }
@@ -1005,7 +1019,7 @@ bool LCursor::goUpDown(bool up)
 // FIXME: Switch this on for more robust movement
 #if 0
 
-       return bruteFind3(*this, xo, yo, up); 
+       return bruteFind3(*this, xo, yo, up);
 
 #else
        //xarray().boundingBox(xlow, xhigh, ylow, yhigh);