* InsetMathHull:

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

diff --git a/src/mathed/InsetMathNest.cpp b/src/mathed/InsetMathNest.cpp
index ad06eeda5927959dec228f1f320e74710c4da0f6..c63bcfeec32ecdbfd820b686ab58a59367a82c88 100644 (file)
--- a/src/mathed/InsetMathNest.cpp
+++ b/src/mathed/InsetMathNest.cpp
@@ -52,6 +52,7 @@
 #include "frontends/Painter.h"
 #include "frontends/Selection.h"
 
+#include "support/lassert.h"
 #include "support/debug.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
@@ -111,7 +112,7 @@ void InsetMathNest::cursorPos(BufferView const & bv,
 // to touch all (math)inset's draw() methods. Right now, we'll store
 // absolute value, and make them here relative, only to make them
 // absolute again when actually drawing the cursor. What a mess.
-       BOOST_ASSERT(&sl.inset() == this);
+       LASSERT(&sl.inset() == this, /**/);
        MathData const & ar = sl.cell();
        CoordCache const & coord_cache = bv.coordCache();
        if (!coord_cache.getArrays().has(&ar)) {
@@ -156,7 +157,7 @@ void InsetMathNest::metrics(MetricsInfo const & mi) const
 
 bool InsetMathNest::idxNext(Cursor & cur) const
 {
-       BOOST_ASSERT(&cur.inset() == this);
+       LASSERT(&cur.inset() == this, /**/);
        if (cur.idx() == cur.lastidx())
                return false;
        ++cur.idx();
@@ -173,7 +174,7 @@ bool InsetMathNest::idxForward(Cursor & cur) const
 
 bool InsetMathNest::idxPrev(Cursor & cur) const
 {
-       BOOST_ASSERT(&cur.inset() == this);
+       LASSERT(&cur.inset() == this, /**/);
        if (cur.idx() == 0)
                return false;
        --cur.idx();
@@ -190,7 +191,7 @@ bool InsetMathNest::idxBackward(Cursor & cur) const
 
 bool InsetMathNest::idxFirst(Cursor & cur) const
 {
-       BOOST_ASSERT(&cur.inset() == this);
+       LASSERT(&cur.inset() == this, /**/);
        if (nargs() == 0)
                return false;
        cur.idx() = 0;
@@ -201,7 +202,7 @@ bool InsetMathNest::idxFirst(Cursor & cur) const
 
 bool InsetMathNest::idxLast(Cursor & cur) const
 {
-       BOOST_ASSERT(&cur.inset() == this);
+       LASSERT(&cur.inset() == this, /**/);
        if (nargs() == 0)
                return false;
        cur.idx() = cur.lastidx();
@@ -1074,7 +1075,8 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd)
                else {
                        MathData ar;
                        asArray(cmd.argument(), ar);
-                       if (ar.size() == 1 && ar[0]->asNestInset())
+                       if (ar.size() == 1 && ar[0]->asNestInset()
+                                       && ar[0]->asNestInset()->nargs() > 1)
                                handleNest(cur, ar[0]);
                        else
                                cur.niceInsert(cmd.argument());
@@ -1420,7 +1422,7 @@ bool InsetMathNest::interpretChar(Cursor & cur, char_type c)
                                cur.backspace();
                                cur.niceInsert(MathAtom(new InsetMathComment));
                        } else if (c == '#') {
-                               BOOST_ASSERT(cur.activeMacro());
+                               LASSERT(cur.activeMacro(), /**/);
                                cur.activeMacro()->setName(name + docstring(1, c));
                        } else {
                                cur.backspace();
@@ -1757,7 +1759,7 @@ bool InsetMathNest::cursorMathForward(Cursor & cur)
                cur.inset().idxFirst(cur);
                return true;
        } 
-       if (cur.posForward() || idxForward(cur) || cur.selection())
+       if (cur.posForward() || idxForward(cur))
                return true;
        // try to pop forwards --- but don't pop out of math! leave that to
        // the FINISH lfuns
@@ -1776,7 +1778,7 @@ bool InsetMathNest::cursorMathBackward(Cursor & cur)
                cur.inset().idxLast(cur);
                return true;
        } 
-       if (cur.posBackward() || idxBackward(cur) || cur.selection())
+       if (cur.posBackward() || idxBackward(cur))
                return true;
        // try to pop backwards --- but don't pop out of math! leave that to 
        // the FINISH lfuns
@@ -1836,7 +1838,8 @@ MathCompletionList::MathCompletionList(Cursor const & cur)
        globals.push_back(from_ascii("\\stackrel"));
        globals.push_back(from_ascii("\\binom"));
        globals.push_back(from_ascii("\\choose"));
-       globals.push_back(from_ascii("\\choose"));
+       globals.push_back(from_ascii("\\brace"));
+       globals.push_back(from_ascii("\\brack"));
        globals.push_back(from_ascii("\\frac"));
        globals.push_back(from_ascii("\\over"));
        globals.push_back(from_ascii("\\nicefrac"));