* InsetMathHull:

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

diff --git a/src/mathed/InsetMathNest.cpp b/src/mathed/InsetMathNest.cpp
index 923a1236665f54744d8767bce9b0069672502161..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();
@@ -412,15 +413,14 @@ void InsetMathNest::handleFont
 void InsetMathNest::handleFont(Cursor & cur, docstring const & arg,
        docstring const & font)
 {
+       cur.recordUndoSelection();
+
        // this whole function is a hack and won't work for incremental font
        // changes...
-
-       if (cur.inset().asInsetMath()->name() == font) {
-               cur.recordUndoInset();
+       if (cur.inset().asInsetMath()->name() == font)
                cur.handleFont(to_utf8(font));
-       } else {
+       else
                handleNest(cur, createInsetMath(font), arg);
-       }
 }
 
 
@@ -439,7 +439,6 @@ void InsetMathNest::handleNest(Cursor & cur, MathAtom const & nest,
                return;
        if (i1.idx() == i2.idx()) {
                // the easy case where only one cell is selected
-               cur.recordUndo();
                cur.handleNest(nest);
                cur.insert(arg);
                return;
@@ -447,7 +446,6 @@ void InsetMathNest::handleNest(Cursor & cur, MathAtom const & nest,
        
        // multiple selected cells in a simple non-grid inset
        if (i1.asInsetMath()->nrows() == 0 || i1.asInsetMath()->ncols() == 0) {
-               cur.recordUndoInset();
                for (idx_type i = i1.idx(); i <= i2.idx(); ++i) {
                        // select cell
                        cur.idx() = i;
@@ -469,7 +467,6 @@ void InsetMathNest::handleNest(Cursor & cur, MathAtom const & nest,
        }
        
        // the complicated case with multiple selected cells in a grid
-       cur.recordUndoInset();
        row_type r1, r2;
        col_type c1, c2;
        cap::region(i1, i2, r1, r2, c1, c2);
@@ -497,7 +494,7 @@ void InsetMathNest::handleNest(Cursor & cur, MathAtom const & nest,
 
 void InsetMathNest::handleFont2(Cursor & cur, docstring const & arg)
 {
-       cur.recordUndo();
+       cur.recordUndoSelection();
        Font font;
        bool b;
        font.fromString(to_utf8(arg), b);
@@ -1073,10 +1070,17 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd)
 // math-insert only handles special math things like "matrix".
        case LFUN_MATH_INSERT: {
                cur.recordUndoSelection();
-               if (cmd.argument() == "^" || cmd.argument() == "_") {
+               if (cmd.argument() == "^" || cmd.argument() == "_")
                        interpretChar(cur, cmd.argument()[0]);
-               } else
-                       cur.niceInsert(cmd.argument());
+               else {
+                       MathData ar;
+                       asArray(cmd.argument(), ar);
+                       if (ar.size() == 1 && ar[0]->asNestInset()
+                                       && ar[0]->asNestInset()->nargs() > 1)
+                               handleNest(cur, ar[0]);
+                       else
+                               cur.niceInsert(cmd.argument());
+               }
                break;
                }
 
@@ -1418,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();
@@ -1755,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
@@ -1774,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
@@ -1834,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"));