revert last patch. there's something wrong, possibly unrelated to this

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

diff --git a/src/mathed/InsetMathNest.cpp b/src/mathed/InsetMathNest.cpp
index d1b8baf9f03dbe214c90c9f8a19bf09c6b875fda..2ba467d3f5981a9301bc091b02ff8f4e8fa2dfa5 100644 (file)
--- a/src/mathed/InsetMathNest.cpp
+++ b/src/mathed/InsetMathNest.cpp
@@ -25,6 +25,7 @@
 #include "InsetMathSpace.h"
 #include "InsetMathSymbol.h"
 #include "InsetMathUnknown.h"
+#include "MathCompletionList.h"
 #include "MathData.h"
 #include "MathFactory.h"
 #include "MathMacro.h"
@@ -408,20 +409,28 @@ void InsetMathNest::handleFont
 }
 
 
-void InsetMathNest::handleFont(Cursor & cur, docstring const & arg, docstring const & font)
+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);
 }
 
 
-void InsetMathNest::handleNest(Cursor & cur, MathAtom const & nest, docstring const & arg)
+void InsetMathNest::handleNest(Cursor & cur, MathAtom const & nest)
+{
+       handleNest(cur, nest, docstring());
+}
+
+
+void InsetMathNest::handleNest(Cursor & cur, MathAtom const & nest,
+       docstring const & arg)
 {
        CursorSlice i1 = cur.selBegin();
        CursorSlice i2 = cur.selEnd();
@@ -429,7 +438,6 @@ void InsetMathNest::handleNest(Cursor & cur, MathAtom const & nest, docstring co
                return;
        if (i1.idx() == i2.idx()) {
                // the easy case where only one cell is selected
-               cur.recordUndo();
                cur.handleNest(nest);
                cur.insert(arg);
                return;
@@ -437,7 +445,6 @@ void InsetMathNest::handleNest(Cursor & cur, MathAtom const & nest, docstring co
        
        // 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;
@@ -459,12 +466,11 @@ void InsetMathNest::handleNest(Cursor & cur, MathAtom const & nest, docstring co
        }
        
        // the complicated case with multiple selected cells in a grid
-       cur.recordUndoInset();
-       Inset::row_type r1, r2;
-       Inset::col_type c1, c2;
+       row_type r1, r2;
+       col_type c1, c2;
        cap::region(i1, i2, r1, r2, c1, c2);
-       for (Inset::row_type row = r1; row <= r2; ++row) {
-               for (Inset::col_type col = c1; col <= c2; ++col) {
+       for (row_type row = r1; row <= r2; ++row) {
+               for (col_type col = c1; col <= c2; ++col) {
                        // select cell
                        cur.idx() = i1.asInsetMath()->index(row, col);
                        cur.pos() = 0;
@@ -487,7 +493,7 @@ void InsetMathNest::handleNest(Cursor & cur, MathAtom const & nest, docstring co
 
 void InsetMathNest::handleFont2(Cursor & cur, docstring const & arg)
 {
-       cur.recordUndo();
+       cur.recordUndoSelection();
        Font font;
        bool b;
        font.fromString(to_utf8(arg), b);
@@ -502,7 +508,6 @@ void InsetMathNest::handleFont2(Cursor & cur, docstring const & arg)
 void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
        //lyxerr << "InsetMathNest: request: " << cmd << endl;
-       //CursorSlice sl = cur.current();
 
        switch (cmd.action) {
 
@@ -585,7 +590,7 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd)
                //    reverseDirectionNeeded() function
                
                bool forward;
-               kb_action finish_lfun;
+               FuncCode finish_lfun;
 
                if (cmd.action == LFUN_CHAR_FORWARD 
                                || cmd.action == LFUN_CHAR_FORWARD_SELECT) {
@@ -1064,10 +1069,16 @@ 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())
+                               handleNest(cur, ar[0]);
+                       else
+                               cur.niceInsert(cmd.argument());
+               }
                break;
                }
 
@@ -1588,6 +1599,12 @@ bool InsetMathNest::interpretString(Cursor & cur, docstring const & str)
 }
 
 
+bool InsetMathNest::script(Cursor & cur, bool up)
+{
+       return script(cur, up, docstring());
+}
+
+
 bool InsetMathNest::script(Cursor & cur, bool up,
                docstring const & save_selection)
 {
@@ -1666,7 +1683,7 @@ bool InsetMathNest::automaticPopupCompletion() const
 }
 
 
-Inset::CompletionList const *
+CompletionList const *
 InsetMathNest::createCompletionList(Cursor const & cur) const
 {
        if (!cur.inMacroMode())
@@ -1819,7 +1836,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"));