Fix reading of math macros

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

diff --git a/src/mathed/math_cursor.C b/src/mathed/math_cursor.C
index f24655af01cef37f9a99adca0b8868d3bd3bd1c7..f76e0618fbf1fdb865b8022bbd7e092e34c40d42 100644 (file)
--- a/src/mathed/math_cursor.C
+++ b/src/mathed/math_cursor.C
@@ -65,7 +65,7 @@ string theCutBuffer;
 
 
 MathCursor::MathCursor(InsetFormulaBase * formula, bool front)
-       :       formula_(formula), autocorrect_(false), selection_(false)
+       :       formula_(formula), autocorrect_(false), selection_(false), targetx_(-1)
 {
        front ? first() : last();
        Anchor_ = Cursor_;
@@ -74,9 +74,9 @@ MathCursor::MathCursor(InsetFormulaBase * formula, bool front)
 
 MathCursor::~MathCursor()
 {
-  // ensure that 'notifyCursorLeave' is called
-  while (popLeft())
-    ;
+       // ensure that 'notifyCursorLeave' is called
+       while (popLeft())
+               ;
 }
 
 
@@ -136,14 +136,14 @@ bool MathCursor::popRight()
 #if FILEDEBUG
        void MathCursor::dump(char const * what) const
        {
-               lyxerr << "MC: " << what << "\n";
-               lyxerr << " Cursor: " << depth() << "\n";
+               lyxerr << "MC: " << what << endl;
+               lyxerr << " Cursor: " << depth() << endl;
                for (unsigned i = 0; i < depth(); ++i)
-                       lyxerr << "    i: " << i << " " << Cursor_[i] << "\n";
-               lyxerr << " Anchor: " << Anchor_.size() << "\n";
+                       lyxerr << "    i: " << i << ' ' << Cursor_[i] << endl;
+               lyxerr << " Anchor: " << Anchor_.size() << endl;
                for (unsigned i = 0; i < Anchor_.size(); ++i)
-                       lyxerr << "    i: " << i << " " << Anchor_[i] << "\n";
-               lyxerr  << " sel: " << selection_ << "\n";
+                       lyxerr << "    i: " << i << ' ' << Anchor_[i] << endl;
+               lyxerr  << " sel: " << selection_ << endl;
        }
 #else
        void MathCursor::dump(char const *) const {}
@@ -378,7 +378,7 @@ void MathCursor::niceInsert(string const & t)
        MathArray ar = asArray(t);
        if (ar.size() == 1)
                niceInsert(ar[0]);
-       else 
+       else
                insert(ar);
 }
 
@@ -666,12 +666,12 @@ MathCursor::pos_type MathCursor::pos() const
 }
 
 
-void MathCursor::adjust(pos_type from, size_type size)
+void MathCursor::adjust(pos_type from, difference_type diff)
 {
        if (cursor().pos_ > from)
-               cursor().pos_ += size;
+               cursor().pos_ += diff;
        if (Anchor_.back().pos_ > from)
-               Anchor_.back().pos_ += size;
+               Anchor_.back().pos_ += diff;
        // just to be on the safe side
        // theoretically unecessary
        normalize();
@@ -778,18 +778,19 @@ void MathCursor::normalize()
 {
        if (idx() >= par()->nargs()) {
                lyxerr << "this should not really happen - 1: "
-                      << idx() << " " << par()->nargs() << " in: " << par() << "\n";
+                      << idx() << ' ' << par()->nargs()
+                      << " in: " << par() << endl;
                dump("error 2");
        }
        idx() = min(idx(), par()->nargs() - 1);
 
        if (pos() > size()) {
                lyxerr << "this should not really happen - 2: "
-                       << pos() << " " << size() <<  " in idx: " << idx()
-                       << " in atom: '";
+                       << pos() << ' ' << size() <<  " in idx: " << idx()
+                      << " in atom: '";
                WriteStream wi(lyxerr, false, true);
                par()->write(wi);
-               lyxerr << "\n";
+               lyxerr << endl;
                dump("error 4");
        }
        pos() = min(pos(), size());
@@ -1200,7 +1201,7 @@ bool MathCursor::interpret(char c)
        }
 
        if (c == '\n') {
-               if (currentMode() == MathInset::TEXT_MODE) 
+               if (currentMode() == MathInset::TEXT_MODE)
                        insert(c);
                return true;
        }
@@ -1290,7 +1291,7 @@ string MathCursor::info() const
                if (prevAtom()->asSymbolInset() || prevAtom()->asScriptInset())
                        prevAtom()->infoize(os);
        os << "                    ";
-       return os.str().c_str(); // .c_str() needed for lyxstring
+       return STRCONV(os.str());
 }
 
 
@@ -1346,7 +1347,7 @@ string MathCursor::grabSelection() const
                        data += "\\\\";
                for (col_type col = c1; col <= c2; ++col) {
                        if (col > c1)
-                               data += "&";
+                               data += '&';
                        data += asString(i1.par_->cell(i1.par_->index(row, col)));
                }
        }
@@ -1467,10 +1468,11 @@ void MathCursor::handleFont(string const & font)
 
 void releaseMathCursor(BufferView * bv)
 {
-       if (!mathcursor)
-               return;
-       mathcursor->formula()->hideInsetCursor(bv);
-       delete mathcursor;
-       mathcursor = 0;
+       if (mathcursor) {
+               InsetFormulaBase * f =  mathcursor->formula();
+               f->hideInsetCursor(bv);
+               delete mathcursor;
+               mathcursor = 0;
+               f->insetUnlock(bv);
+       }
 }
-