small up/down tweaking

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

diff --git a/src/mathed/formulabase.C b/src/mathed/formulabase.C
index 3d9764da34409cba58ec3a97af1d0ff1b1f61b59..d2295a967eba416a6b99549e5c7b6d358bd0f352 100644 (file)
--- a/src/mathed/formulabase.C
+++ b/src/mathed/formulabase.C
@@ -227,17 +227,17 @@ void InsetFormulaBase::getCursorPos(BufferView *, int & x, int & y) const
        x = mathcursor->targetX();
        x -= xo_;
        y -= yo_;
-       //lyxerr << "getCursorPos: " << x << " " << y << "\n";
+       //lyxerr << "getCursorPos: " << x << ' ' << y << endl;
 }
 
 
 void InsetFormulaBase::toggleInsetCursor(BufferView * bv)
 {
        if (!mathcursor) {
-               lyxerr << "toggleInsetCursor impossible\n";
+               lyxerr[Debug::MATHED] << "toggleInsetCursor impossible" << endl;
                return;
        }
-       //lyxerr << "toggleInsetCursor: " << isCursorVisible() << "\n";
+       //lyxerr << "toggleInsetCursor: " << isCursorVisible() << endl;
        if (isCursorVisible())
                hideInsetCursor(bv);
        else
@@ -248,7 +248,7 @@ void InsetFormulaBase::toggleInsetCursor(BufferView * bv)
 void InsetFormulaBase::showInsetCursor(BufferView * bv, bool)
 {
        if (!mathcursor) {
-               lyxerr << "showInsetCursor impossible\n";
+               lyxerr << "showInsetCursor impossible" << endl;
                return;
        }
        if (isCursorVisible())
@@ -258,7 +258,7 @@ void InsetFormulaBase::showInsetCursor(BufferView * bv, bool)
        math_font_max_dim(font_, asc, des);
        bv->showLockedInsetCursor(x, y - yo_, asc, des);
        setCursorVisible(true);
-       //lyxerr << "showInsetCursor: " << x << " " << y << "\n";
+       //lyxerr << "showInsetCursor: " << x << ' ' << y << endl;
 }
 
 
@@ -270,7 +270,7 @@ void InsetFormulaBase::hideInsetCursor(BufferView * bv)
                return;
        bv->hideLockedInsetCursor();
        setCursorVisible(false);
-       //lyxerr << "hideInsetCursor: \n";
+       //lyxerr << "hideInsetCursor: " << endl;
 }
 
 
@@ -282,7 +282,7 @@ void InsetFormulaBase::fitInsetCursor(BufferView * bv) const
        math_font_max_dim(font_, asc, des);
        getCursorPos(bv, x, y);
        //y += yo_;
-       //lyxerr << "fitInsetCursor: x: " << x << " y: " << y << " yo: " << yo_ << "\n";
+       //lyxerr << "fitInsetCursor: x: " << x << " y: " << y << " yo: " << yo_ << endl;
        bv->fitLockedInsetCursor(x, y, asc, des);
 }
 
@@ -315,7 +315,7 @@ Inset::RESULT InsetFormulaBase::lfunMouseRelease(FuncRequest const & cmd)
        hideInsetCursor(bv);
        showInsetCursor(bv);
        bv->updateInset(this, false);
-       //lyxerr << "lfunMouseRelease: buttons: " << cmd.button() << "\n";
+       //lyxerr << "lfunMouseRelease: buttons: " << cmd.button() << endl;
 
        if (cmd.button() == mouse_button::button3) {
                // try to dispatch to enclosed insets first
@@ -353,10 +353,10 @@ Inset::RESULT InsetFormulaBase::lfunMouseRelease(FuncRequest const & cmd)
 Inset::RESULT InsetFormulaBase::lfunMousePress(FuncRequest const & cmd)
 {
        BufferView * bv = cmd.view();
-       //lyxerr << "lfunMousePress: buttons: " << cmd.button() << "\n";
+       //lyxerr << "lfunMousePress: buttons: " << cmd.button() << endl;
 
        if (!mathcursor || mathcursor->formula() != this) {
-               lyxerr << "re-create cursor\n";
+               lyxerr[Debug::MATHED] << "re-create cursor" << endl;
                releaseMathCursor(bv);
                mathcursor = new MathCursor(this, cmd.x == 0);
                metrics(bv);
@@ -418,7 +418,7 @@ Inset::RESULT InsetFormulaBase::localDispatch(FuncRequest const & cmd)
        //      << " arg: '" << cmd.argument
        //      << " x: '" << cmd.x
        //      << " y: '" << cmd.y
-       //      << "' button: " << cmd.button() << "\n";
+       //      << "' button: " << cmd.button() << endl;
 
        switch (cmd.action) {
                case LFUN_MOUSE_PRESS:
@@ -506,6 +506,14 @@ Inset::RESULT InsetFormulaBase::localDispatch(FuncRequest const & cmd)
                updateLocal(bv, false);
                break;
 
+       case LFUN_UP_PARAGRAPHSEL:
+       case LFUN_UP_PARAGRAPH:
+       case LFUN_DOWN_PARAGRAPHSEL:
+       case LFUN_DOWN_PARAGRAPH:
+               result = FINISHED;
+               updateLocal(bv, false);
+               break;
+
        case LFUN_HOMESEL:
        case LFUN_WORDLEFTSEL:
                sel = true; // fall through
@@ -528,7 +536,7 @@ Inset::RESULT InsetFormulaBase::localDispatch(FuncRequest const & cmd)
        case LFUN_PRIOR:
        case LFUN_BEGINNINGBUFSEL:
        case LFUN_BEGINNINGBUF:
-               result = FINISHED_UP;
+               result = FINISHED;
                updateLocal(bv, false);
                break;
 
@@ -536,7 +544,7 @@ Inset::RESULT InsetFormulaBase::localDispatch(FuncRequest const & cmd)
        case LFUN_NEXT:
        case LFUN_ENDBUFSEL:
        case LFUN_ENDBUF:
-               result = FINISHED_DOWN;
+               result = FINISHED_RIGHT;
                updateLocal(bv, false);
                break;
 
@@ -552,14 +560,14 @@ Inset::RESULT InsetFormulaBase::localDispatch(FuncRequest const & cmd)
 
        case LFUN_DELETE_WORD_BACKWARD:
        case LFUN_BACKSPACE:
-               bv->lockedInsetStoreUndo(Undo::DELETE);
+               bv->lockedInsetStoreUndo(Undo::EDIT);
                mathcursor->backspace();
                updateLocal(bv, true);
                break;
 
        case LFUN_DELETE_WORD_FORWARD:
        case LFUN_DELETE:
-               bv->lockedInsetStoreUndo(Undo::DELETE);
+               bv->lockedInsetStoreUndo(Undo::EDIT);
                mathcursor->erase();
                bv->updateInset(this, true);
                break;