whichFont down to 5.3%

[lyx.git] / src / mathed / math_cursor.C

diff --git a/src/mathed/math_cursor.C b/src/mathed/math_cursor.C
index f9c92bbc9134d59aad96aaf51933cf1cdac9915b..a3581aff1a7aad7c2911bc5abcc300000564a88c 100644 (file)
--- a/src/mathed/math_cursor.C
+++ b/src/mathed/math_cursor.C
@@ -428,6 +428,20 @@ void MathCursor::plainErase()
 }
 
 
+void MathCursor::markInsert()
+{
+       //lyxerr << "inserting mark\n";
+       array().insert(pos(), MathAtom(new MathCharInset(0, lastcode_)));
+}
+
+
+void MathCursor::markErase()
+{
+       //lyxerr << "deleting mark\n";
+       array().erase(pos());
+}
+
+
 void MathCursor::plainInsert(MathAtom const & t)
 {
        array().insert(pos(), t);
@@ -442,6 +456,12 @@ void MathCursor::insert(char c, MathTextCodes t)
 }
 
 
+void MathCursor::insert(char c)
+{
+       insert(c, lastcode_);
+}
+
+
 void MathCursor::insert(MathAtom const & t)
 {
        macroModeClose();
@@ -565,8 +585,8 @@ void MathCursor::delLine()
                par()->asGridInset()->delRow(hullRow());
        }
 
-       if (idx() > par()->nargs())
-               idx() = par()->nargs();
+       if (idx() >= par()->nargs())
+               idx() = par()->nargs() - 1;
 
        if (pos() > size())
                pos() = size();
@@ -906,6 +926,8 @@ void MathCursor::pullArg(bool goright)
                array().insert(pos(), a);
                if (goright)
                        pos() += a.size();
+       } else {
+               formula()->mutateToText();
        }
 }
 
@@ -1186,22 +1208,27 @@ bool MathCursor::bruteFind(int x, int y, int xlow, int xhigh, int ylow, int yhig
 
        MathIterator it = ibegin(formula()->par().nucleus());
        MathIterator et = iend(formula()->par().nucleus());
-       for ( ; it != et; ++it) {
-               // avoid invalid nesting hen selecting
-               if (selection_ && !positionable(it.cursor(), Anchor_))
-                       continue;
-               int xo = it.position().xpos();
-               int yo = it.position().ypos();
-               if (xlow - 2 <= xo && xo <= xhigh + 2 &&
-                   ylow - 2 <= yo && yo <= yhigh + 2)
-               {
-                       double d = (x - xo) * (x - xo) + (y - yo) * (y - yo);
-                       if (d < best_dist) {
-                               best_dist   = d;
-                               best_cursor = it.cursor();
+       while (1) {
+               // avoid invalid nesting when selecting
+               if (!selection_ || positionable(it.cursor(), Anchor_)) {
+                       int xo = it.position().xpos();
+                       int yo = it.position().ypos();
+                       if (xlow - 2 <= xo && xo <= xhigh + 2 &&
+                                       ylow - 2 <= yo && yo <= yhigh + 2)
+                       {
+                               double d = (x - xo) * (x - xo) + (y - yo) * (y - yo);
+                               if (d < best_dist) {
+                                       best_dist   = d;
+                                       best_cursor = it.cursor();
+                               }
                        }
                }
+
+               if (it == et)
+                       break;
+               ++it;
        }
+
        if (best_dist < 1e10)
                Cursor_ = best_cursor;
        return best_dist < 1e10;
@@ -1252,7 +1279,7 @@ bool MathCursor::interpret(string const & s)
                m = std::max(1u, m);
                n = std::max(1u, n);
                v_align += 'c';
-               niceInsert(MathAtom(new MathArrayInset(m, n, v_align[0], h_align)));
+               niceInsert(MathAtom(new MathArrayInset("array", m, n, v_align[0], h_align)));
                return true;
        }
 
@@ -1285,6 +1312,14 @@ bool MathCursor::interpret(string const & s)
                return true;
        }
 
+       // prevent entering of recursive macros
+       if (formula()->lyxCode() == Inset::MATHMACRO_CODE 
+               && formula()->getInsetName() == s.substr(1))
+       {
+               lyxerr << "can't enter recursive macro\n";
+               return true;
+       }
+
        niceInsert(createMathInset(s.substr(1)));
        return true;
 }
@@ -1356,6 +1391,8 @@ bool MathCursor::interpret(char c)
 
                if (c == '\\')
                        insert(c, LM_TC_TEX);
+               else
+                       insert(c, lastcode_);
 
                return true;
        }