minimal effort implementation of:

[lyx.git] / src / cursor.C

diff --git a/src/cursor.C b/src/cursor.C
index a7fb543984224de44319a7c642fad6edb8a82205..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 {
 
@@ -138,7 +139,7 @@ namespace {
                et.pit() = boost::prior(cache.end())->first;
                if (et.pit() >= et.lastpit())
                        et = doc_iterator_end(inset);
-               else 
+               else
                        ++et.pit();
 
                double best_dist = std::numeric_limits<double>::max();;
@@ -189,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);
@@ -637,7 +638,7 @@ void LCursor::plainErase()
 
 void LCursor::markInsert()
 {
-       insert(char(0));
+       insert(char_type(0));
 }
 
 
@@ -657,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());
@@ -858,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;
 }
@@ -1015,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);