fix compile problem

[lyx.git] / src / mathed / math_nestinset.C

diff --git a/src/mathed/math_nestinset.C b/src/mathed/math_nestinset.C
index 5133148207d0ae9f0b20190849cc50b61437ce46..6a6ceb3e7017e6e2c8ff69e08c025206748c6dd1 100644 (file)
--- a/src/mathed/math_nestinset.C
+++ b/src/mathed/math_nestinset.C
@@ -442,9 +442,8 @@ void MathNestInset::priv_dispatch(LCursor & cur, FuncRequest & cmd)
                cur.selHandle(cmd.action == LFUN_RIGHTSEL);
                cur.autocorrect() = false;
                cur.clearTargetX();
-               if (cur.inMacroMode())
-                       cur.macroModeClose();
-               else if (cur.pos() != cur.lastpos() && cur.openable(cur.nextAtom())) {
+               cur.macroModeClose();
+               if (cur.pos() != cur.lastpos() && cur.openable(cur.nextAtom())) {
                        cur.pushLeft(*cur.nextAtom().nucleus());
                        cur.inset().idxFirst(cur);
                } else if (cur.posRight() || idxRight(cur)
@@ -459,9 +458,8 @@ void MathNestInset::priv_dispatch(LCursor & cur, FuncRequest & cmd)
                cur.selHandle(cmd.action == LFUN_LEFTSEL);
                cur.autocorrect() = false;
                cur.clearTargetX();
-               if (cur.inMacroMode())
-                       cur.macroModeClose();
-               else if (cur.pos() != 0 && cur.openable(cur.prevAtom())) {
+               cur.macroModeClose();
+               if (cur.pos() != 0 && cur.openable(cur.prevAtom())) {
                        cur.posLeft();
                        cur.push(*cur.nextAtom().nucleus());
                        cur.inset().idxLast(cur);
@@ -1009,7 +1007,7 @@ bool MathNestInset::interpret(LCursor & cur, char c)
                                cur.niceInsert(MathAtom(new MathBraceInset));
                        } else if (c == '%') {
                                cur.backspace();
-                               cur.niceInsert(MathAtom(new MathSymbolInset("%")));
+                               cur.niceInsert(MathAtom(new MathCommentInset));
                        } else if (c == '#') {
                                lyxerr << "setting name to " << name + c << endl;
                                BOOST_ASSERT(cur.activeMacro());
@@ -1097,10 +1095,10 @@ bool MathNestInset::interpret(LCursor & cur, char c)
                return true;
        }
 
-       //if (c == '%') {
-       //      cur.niceInsert(MathAtom(new MathCommentInset));
-       //      return true;
-       //}
+       if (c == '~') {
+               cur.niceInsert(createMathInset("sim"));
+               return true;
+       }
 
        // try auto-correction
        //if (autocorrect() && hasPrevAtom() && math_autocorrect(prevAtom(), c))
@@ -1115,7 +1113,7 @@ bool MathNestInset::interpret(LCursor & cur, char c)
 
 bool MathNestInset::script(LCursor & cur, bool up)
 {
-       // Hack to get \\^ and \\_ working
+       // Hack to get \^ and \_ working
        lyxerr << "handling script: up: " << up << endl;
        if (cur.inMacroMode() && cur.macroName() == "\\") {
                if (up)