fix pullArg when pressing <Delete> at the end of an cell

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

diff --git a/src/mathed/math_macrotable.C b/src/mathed/math_macrotable.C
index 4f3368fa07fdf23a658a86c3932a4da122f9b7ec..978766ab5be514833619ea5047d77fa827b3c17d 100644 (file)
--- a/src/mathed/math_macrotable.C
+++ b/src/mathed/math_macrotable.C
@@ -11,7 +11,7 @@
 #include "math_macrotemplate.h"
 #include "math_parser.h"
 #include "array.h"
-#include "math_accentinset.h"
+#include "math_decorationinset.h"
 #include "math_deliminset.h"
 #include "math_fracinset.h"
 #include "math_inset.h"
@@ -94,7 +94,7 @@ void MathMacroTable::builtinMacros()
        // This macro doesn't have arguments
        {
                MathMacroTemplate * t = new MathMacroTemplate("notin", 0);
-               MathAccentInset * p = new MathAccentInset(LM_not);
+               MathDecorationInset * p = new MathDecorationInset("not", LM_not);
                p->cell(0).push_back(LM_in, LM_TC_BOPS);
                t->push_back(p);
                insertTemplate(t);
@@ -113,12 +113,24 @@ void MathMacroTable::builtinMacros()
 
        {
                MathMacroTemplate * t = new MathMacroTemplate("emptyset", 0);
-               MathAccentInset * p = new MathAccentInset(LM_not);
-               p->cell(0).push_back('0', LM_TC_VAR);
+               MathDecorationInset * p = new MathDecorationInset("not", LM_not);
+               p->cell(0).push_back('O', LM_TC_VAR);
                t->push_back(p);
                insertTemplate(t);
        }
 
+       {
+               MathMacroTemplate * t = new MathMacroTemplate("land", 0);
+               t->push_back(LM_wedge, LM_TC_SYMB);
+               insertTemplate(t);
+       }
+
+       {
+               MathMacroTemplate * t = new MathMacroTemplate("lor", 0);
+               t->push_back(LM_vee, LM_TC_SYMB);
+               insertTemplate(t);
+       }
+
        {
                MathMacroTemplate * t = new MathMacroTemplate("to", 0);
                t->push_back(LM_rightarrow, LM_TC_SYMB);
@@ -130,6 +142,7 @@ void MathMacroTable::builtinMacros()
                t->push_back(LM_bot, LM_TC_BOP);
                insertTemplate(t);
        }
+
 /*
        {
                MathMacroTemplate & m = createTemplate("lint", 4);