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

[lyx.git] / src / mathed / math_parser.h

diff --git a/src/mathed/math_parser.h b/src/mathed/math_parser.h
index 9141ba4a68fb51c938dd2bd657d86601177a85cf..b46757f97c3c2f78fa70c4900f86012b8960884f 100644 (file)
--- a/src/mathed/math_parser.h
+++ b/src/mathed/math_parser.h
@@ -16,8 +16,8 @@
  *   the GNU General Public Licence version 2 or later.
  */
 
-#ifndef MATH_PARSER
-#define MATH_PARSER
+#ifndef MATH_PARSER_H
+#define MATH_PARSER_H
 
 #ifdef __GNUG__
 #pragma interface
@@ -27,10 +27,9 @@
 
 #include "symbol_def.h"
 
-///
-#define LM_TK_OPEN '{'
-///
-#define LM_TK_CLOSE '}'
+class MathArray;
+class MathInset;
+class LyXLex;
 
 ///
 enum MathTokenEnum
@@ -46,6 +45,8 @@ enum MathTokenEnum
        ///
        LM_TK_FRAC,
        ///
+       LM_TK_CHOOSE,
+       ///
        LM_TK_SQRT,
        ///
        LM_TK_BEGIN,
@@ -62,9 +63,7 @@ enum MathTokenEnum
        ///
        LM_TK_RIGHT,
        ///
-       LM_TK_ACCENT,
-       ///
-       LM_TK_WIDE,
+       LM_TK_DECORATION,
        ///
        LM_TK_FUNC,
        ///
@@ -107,21 +106,19 @@ struct latexkeys {
        ///
        short token;
        ///
-       int id;
+       unsigned int id;
 };
 
 
-///
-latexkeys const *
-in_word_set (register char const * str, register int len);
-
 ///
 latexkeys const * in_word_set(string const & str);
 
 ///
-latexkeys * lm_get_key(int index);
+latexkeys const * lm_get_key_by_id(unsigned int id, short tc);
 
-///
-latexkeys const * lm_get_key_by_id(int id, short tc = LM_TK_SYM);
+
+MathInset * mathed_parse(string const &);
+MathInset * mathed_parse(std::istream &);
+MathInset * mathed_parse(LyXLex &);
 
 #endif