Fix regression of 5261ae6a2

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

diff --git a/src/mathed/InsetMathNest.cpp b/src/mathed/InsetMathNest.cpp
index 9dd01cca0c66562c8516596f58f5d29858ab05a2..0b24a1d74bc19bb5350f77e70e22bf8c2414f990 100644 (file)
--- a/src/mathed/InsetMathNest.cpp
+++ b/src/mathed/InsetMathNest.cpp
@@ -706,6 +706,10 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd)
                        act == LFUN_UP_SELECT;
                cur.selHandle(select);
 
+               // handle autocorrect:
+               cur.autocorrect() = false;
+               cur.message(_("Autocorrect Off ('!' to enter)"));
+
                // go up/down
                bool up = act == LFUN_UP || act == LFUN_UP_SELECT;
                bool successful = cur.upDownInMath(up);
@@ -806,7 +810,7 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd)
                if (cur.pos() == 0)
                        // May affect external cell:
                        cur.recordUndoInset();
-               else
+               else if (!cur.inMacroMode())
                        cur.recordUndoSelection();
                // if the inset can not be removed from within, delete it
                if (!cur.backspace()) {
@@ -872,7 +876,7 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd)
                // if relevant. Think typing "\frac<space>".
                if (cmd.argument()[0] == ' '
                    && cur.inMacroMode() && cur.macroName() != "\\"
-                   && cur.macroModeClose()) {
+                   && cur.macroModeClose() && cur.pos() > 0) {
                        MathAtom const atom = cur.prevAtom();
                        if (atom->asNestInset() && atom->isActive()) {
                                cur.posBackward();
@@ -1134,10 +1138,34 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd)
                break;
        }
 
-       case LFUN_SPACE_INSERT:
+       case LFUN_SPACE_INSERT: {
                cur.recordUndoSelection();
-               cur.insert(MathAtom(new InsetMathSpace));
+               string const name = cmd.getArg(0);
+               if (name == "normal")
+                       cur.insert(MathAtom(new InsetMathSpace(" ", "")));
+               else if (name == "protected")
+                       cur.insert(MathAtom(new InsetMathSpace("~", "")));
+               else if (name == "thin" || name == "med" || name == "thick")
+                       cur.insert(MathAtom(new InsetMathSpace(name + "space", "")));
+               else if (name == "hfill*")
+                       cur.insert(MathAtom(new InsetMathSpace("hspace*{\\fill}", "")));
+               else if (name == "quad" || name == "qquad" ||
+                        name == "enspace" || name == "enskip" ||
+                        name == "negthinspace" || name == "negmedspace" ||
+                        name == "negthickspace" || name == "hfill")
+                       cur.insert(MathAtom(new InsetMathSpace(name, "")));
+               else if (name == "hspace" || name == "hspace*") {
+                       string const len = cmd.getArg(1);
+                       if (len.empty() || !isValidLength(len)) {
+                               lyxerr << "LyX function 'space-insert " << name << "' "
+                                         "needs a valid length argument." << endl;
+                               break;
+                       }
+                       cur.insert(MathAtom(new InsetMathSpace(name, len)));
+               } else
+                       cur.insert(MathAtom(new InsetMathSpace));
                break;
+       }
 
        case LFUN_MATH_SPACE:
                cur.recordUndoSelection();
@@ -1344,7 +1372,6 @@ bool InsetMathNest::getStatus(Cursor & cur, FuncRequest const & cmd,
        // we just need to be in math mode to enable that
        case LFUN_MATH_SIZE:
        case LFUN_MATH_SPACE:
-       case LFUN_MATH_LIMITS:
        case LFUN_MATH_EXTERN:
                flag.setEnabled(true);
                break;
@@ -1390,6 +1417,14 @@ bool InsetMathNest::getStatus(Cursor & cur, FuncRequest const & cmd,
                break;
        }
 
+       case LFUN_DIALOG_SHOW_NEW_INSET: {
+               docstring const & name = cmd.argument();
+               if (name == "space")
+                       flag.setEnabled(false);
+               break;
+       }
+
+
        case LFUN_MATH_DELIM:
        case LFUN_MATH_BIGDELIM:
                // Don't do this with multi-cell selections
@@ -1410,6 +1445,17 @@ bool InsetMathNest::getStatus(Cursor & cur, FuncRequest const & cmd,
                flag.setEnabled(false);
                break;
 
+       case LFUN_CAPTION_INSERT:
+               flag.setEnabled(false);
+               break;
+       
+       case LFUN_SPACE_INSERT: {
+               docstring const & name = cmd.argument();
+               if (name == "visible")
+                       flag.setEnabled(false);
+               break;
+       }
+
        case LFUN_INSET_DISSOLVE:
                flag.setEnabled(!asHullInset());
                break;
@@ -1667,6 +1713,7 @@ bool InsetMathNest::interpretChar(Cursor & cur, char_type const c)
                //lyxerr << "starting with macro" << endl;
                bool reduced = cap::reduceSelectionToOneCell(cur);
                if (reduced || !cur.selection()) {
+                       cur.recordUndoInset();
                        docstring const safe = cap::grabAndEraseSelection(cur);
                        if (!cur.inRegexped())
                                cur.insert(MathAtom(new InsetMathUnknown(from_ascii("\\"), safe, false)));
@@ -2025,7 +2072,7 @@ MathCompletionList::MathCompletionList(Cursor const & cur)
        }
        sort(locals.begin(), locals.end());
 
-       if (globals.size() > 0)
+       if (!globals.empty())
                return;
 
        // fill in global macros
@@ -2060,6 +2107,7 @@ MathCompletionList::MathCompletionList(Cursor const & cur)
        globals.push_back(from_ascii("\\root"));
        globals.push_back(from_ascii("\\tabular"));
        globals.push_back(from_ascii("\\stackrel"));
+       globals.push_back(from_ascii("\\stackrelthree"));
        globals.push_back(from_ascii("\\binom"));
        globals.push_back(from_ascii("\\choose"));
        globals.push_back(from_ascii("\\brace"));
@@ -2089,6 +2137,14 @@ MathCompletionList::MathCompletionList(Cursor const & cur)
        globals.push_back(from_ascii("\\hphantom"));
        globals.push_back(from_ascii("\\phantom"));
        globals.push_back(from_ascii("\\vphantom"));
+       globals.push_back(from_ascii("\\cancel"));
+       globals.push_back(from_ascii("\\bcancel"));
+       globals.push_back(from_ascii("\\xcancel"));
+       globals.push_back(from_ascii("\\cancelto"));
+       globals.push_back(from_ascii("\\smash"));
+       globals.push_back(from_ascii("\\mathclap"));
+       globals.push_back(from_ascii("\\mathllap"));
+       globals.push_back(from_ascii("\\mathrlap"));
        MathWordList const & words = mathedWordList();
        MathWordList::const_iterator it2;
        //lyxerr << "Globals completion commands: ";