fix off-by-two drawing error

[lyx.git] / src / mathed / InsetMathScript.cpp

diff --git a/src/mathed/InsetMathScript.cpp b/src/mathed/InsetMathScript.cpp
index 3fd94d11d88ad3d02724a09a9dd1463ac58ad15b..5c4fcbfb3ed9919215e9dd56b1a72298b70aa9a5 100644 (file)
--- a/src/mathed/InsetMathScript.cpp
+++ b/src/mathed/InsetMathScript.cpp
@@ -10,18 +10,20 @@
 
 #include <config.h>
 
+#include "BufferView.h"
+#include "Cursor.h"
+#include "DispatchResult.h"
+#include "FuncRequest.h"
+#include "InsetMathFont.h"
 #include "InsetMathScript.h"
+#include "InsetMathSymbol.h"
 #include "MathData.h"
 #include "MathStream.h"
 #include "MathSupport.h"
-#include "InsetMathSymbol.h"
-#include "InsetMathFont.h"
-#include "DispatchResult.h"
-#include "Cursor.h"
+
 #include "support/debug.h"
-#include "FuncRequest.h"
 
-#include <boost/assert.hpp>
+#include "support/lassert.h"
 
 #include <ostream>
 
@@ -43,7 +45,7 @@ InsetMathScript::InsetMathScript(bool up)
 InsetMathScript::InsetMathScript(MathAtom const & at, bool up)
        : InsetMathNest(2), cell_1_is_up_(up), limits_(0)
 {
-       BOOST_ASSERT(nargs() >= 1);
+       LASSERT(nargs() >= 1, /**/);
        cell(0).push_back(at);
 }
 
@@ -86,7 +88,7 @@ MathData const & InsetMathScript::down() const
 {
        if (nargs() == 3)
                return cell(2);
-       BOOST_ASSERT(nargs() > 1);
+       LASSERT(nargs() > 1, /**/);
        return cell(1);
 }
 
@@ -95,21 +97,21 @@ MathData & InsetMathScript::down()
 {
        if (nargs() == 3)
                return cell(2);
-       BOOST_ASSERT(nargs() > 1);
+       LASSERT(nargs() > 1, /**/);
        return cell(1);
 }
 
 
 MathData const & InsetMathScript::up() const
 {
-       BOOST_ASSERT(nargs() > 1);
+       LASSERT(nargs() > 1, /**/);
        return cell(1);
 }
 
 
 MathData & InsetMathScript::up()
 {
-       BOOST_ASSERT(nargs() > 1);
+       LASSERT(nargs() > 1, /**/);
        return cell(1);
 }
 
@@ -243,7 +245,7 @@ int InsetMathScript::dy1(BufferView const & bv) const
 
 int InsetMathScript::dx0(BufferView const & bv) const
 {
-       BOOST_ASSERT(hasDown());
+       LASSERT(hasDown(), /**/);
        Dimension const dim = dimension(bv);
        return hasLimits() ? (dim.wid - down().dimension(bv).width()) / 2 : nwid(bv);
 }
@@ -251,7 +253,7 @@ int InsetMathScript::dx0(BufferView const & bv) const
 
 int InsetMathScript::dx1(BufferView const & bv) const
 {
-       BOOST_ASSERT(hasUp());
+       LASSERT(hasUp(), /**/);
        Dimension const dim = dimension(bv);
        return hasLimits() ? (dim.wid - up().dimension(bv).width()) / 2 : nwid(bv) + nker(&bv);
 }
@@ -460,7 +462,7 @@ Inset::idx_type InsetMathScript::idxOfScript(bool up) const
                return (cell_1_is_up_ == up) ? 1 : 0;
        if (nargs() == 3)
                return up ? 1 : 2;
-       BOOST_ASSERT(false);
+       LASSERT(false, /**/);
        // Silence compiler
        return 0;
 }
@@ -523,6 +525,8 @@ bool InsetMathScript::idxUpDown(Cursor & cur, bool up) const
 
 void InsetMathScript::write(WriteStream & os) const
 {
+       MathEnsurer ensurer(os);
+
        if (nuc().size()) {
                os << nuc();
                //if (nuc().back()->takesLimits()) {
@@ -658,40 +662,56 @@ void InsetMathScript::infoize2(odocstream & os) const
 }
 
 
-bool InsetMathScript::notifyCursorLeaves(Cursor & cur)
+bool InsetMathScript::notifyCursorLeaves(Cursor const & old, Cursor & cur)
 {
-       InsetMathNest::notifyCursorLeaves(cur);
+       InsetMathNest::notifyCursorLeaves(old, cur);
 
        //LYXERR0("InsetMathScript::notifyCursorLeaves: 1 " << cur);
 
-       // remove empty scripts if possible
-       if (nargs() > 2) {
-               // Case of two scripts. In this case, 1 = super, 2 = sub
-               if (cur.idx() == 2 && cell(2).empty()) {
+       // Remove empty scripts if possible:
+
+       // The case of two scripts, but only one got empty (1 = super, 2 = sub).
+       // We keep the script inset, but remove the empty script.
+       if (nargs() > 2 && (!cell(1).empty() || !cell(2).empty())) {
+               if (cell(2).empty()) {
                        // must be a subscript...
-                       cur.recordUndoInset();
                        removeScript(false);
+                       cur.updateFlags(cur.disp_.update() | Update::SinglePar);
                        return true;
-               } else if (cur.idx() == 1 && cell(1).empty()) {
+               } else if (cell(1).empty()) {
                        // must be a superscript...
-                       cur.recordUndoInset();
                        removeScript(true);
+                       cur.updateFlags(cur.disp_.update() | Update::SinglePar);
                        return true;
                }
-       } else if (nargs() > 1 && cur.idx() == 1 && cell(1).empty()) {
-               // could be either subscript or super script
-               cur.recordUndoInset();
-               removeScript(cell_1_is_up_);
+       }
+       // Now the two suicide cases:
+       // * we have only one script which is empty
+       // * we have two scripts which are both empty.
+       // The script inset is removed completely.
+       if ((nargs() == 2 && cell(1).empty())
+           || (nargs() == 3 && cell(1).empty() && cell(2).empty())) {
+               // Make undo step. We cannot use cur for this because
+               // it does not necessarily point to us anymore. But we
+               // should be on top of the cursor old.
+               Cursor insetCur = old;
+               int scriptSlice = insetCur.find(this);
+               LASSERT(scriptSlice != -1, /**/);
+               insetCur.cutOff(scriptSlice);
+               insetCur.recordUndoInset();
+
                // Let the script inset commit suicide. This is
                // modelled on Cursor.pullArg(), but tries not to
                // invoke notifyCursorLeaves again and does not touch
                // cur (since the top slice will be deleted
-               // afterwards))
+               // afterwards)
                MathData ar = cell(0);
-               Cursor tmpcur = cur;
-               tmpcur.pop();
-               tmpcur.cell().erase(tmpcur.pos());
-               tmpcur.cell().insert(tmpcur.pos(), ar);
+               insetCur.pop();
+               insetCur.cell().erase(insetCur.pos());
+               insetCur.cell().insert(insetCur.pos(), ar);
+
+               // redraw
+               cur.updateFlags(cur.disp_.update() | Update::SinglePar);
                return true;
        }