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 a3131f8888992ea4ba66d138f7eeaa065ef25e11..b46757f97c3c2f78fa70c4900f86012b8960884f 100644 (file)
--- a/src/mathed/math_parser.h
+++ b/src/mathed/math_parser.h
@@ -8,7 +8,7 @@
  *
  *  Dependencies: Xlib, XForms
  *
- *  Copyright: (c) 1996, Alejandro Aguilar Sierra
+ *  Copyright: 1996, Alejandro Aguilar Sierra
  *
  *   Version: 0.8beta.
  *
@@ -16,81 +16,109 @@
  *   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
 #endif
 
+#include "LString.h"
+
 #include "symbol_def.h"
 
-///
-#define LM_TK_OPEN '{'
-///
-#define LM_TK_CLOSE '}'
+class MathArray;
+class MathInset;
+class LyXLex;
 
 ///
 enum MathTokenEnum
 {
-   LM_TK_BOP = 256,
-     LM_TK_ALPHA,
-     LM_TK_STR,
-     LM_TK_SYM,
-     LM_TK_FRAC,
-     LM_TK_SQRT,
-     LM_TK_BEGIN,
-     LM_TK_END,
-     LM_TK_NEWLINE,
-     LM_TK_UNDEF,
-     LM_TK_FONT,
-     LM_TK_LEFT,
-     LM_TK_RIGHT,
-     LM_TK_ACCENT,
-     LM_TK_WIDE,
-     LM_TK_FUNC,
-     LM_TK_FUNCLIM,
-     LM_TK_BIGSYM,
-     LM_TK_LABEL,
-     LM_TK_NONUM,
-     LM_TK_SPACE,
-     LM_TK_DOTS,
-     LM_TK_LIMIT,
-     LM_TK_STY,
-     LM_TK_PMOD,
-     LM_TK_BMOD,
-     LM_TK_MACRO,
-     LM_TK_SPECIAL,
-     LM_TK_ARGUMENT, 
-     LM_TK_NEWCOMMAND,
-     LM_TK_STACK
+       ///
+       LM_TK_BOP = 256,
+       ///
+       LM_TK_ALPHA,
+       ///
+       LM_TK_STR,
+       ///
+       LM_TK_SYM,
+       ///
+       LM_TK_FRAC,
+       ///
+       LM_TK_CHOOSE,
+       ///
+       LM_TK_SQRT,
+       ///
+       LM_TK_BEGIN,
+       ///
+       LM_TK_END,
+       ///
+       LM_TK_NEWLINE,
+       ///
+       LM_TK_UNDEF,
+       ///
+       LM_TK_FONT,
+       ///
+       LM_TK_LEFT,
+       ///
+       LM_TK_RIGHT,
+       ///
+       LM_TK_DECORATION,
+       ///
+       LM_TK_FUNC,
+       ///
+       LM_TK_FUNCLIM,
+       ///
+       LM_TK_BIGSYM,
+       ///
+       LM_TK_LABEL,
+       ///
+       LM_TK_NONUM,
+       ///
+       LM_TK_SPACE,
+       ///
+       LM_TK_DOTS,
+       ///
+       LM_TK_LIMIT,
+       ///
+       LM_TK_STY,
+       ///
+       LM_TK_PMOD,
+       ///
+       LM_TK_BMOD,
+       ///
+       LM_TK_MACRO,
+       ///
+       LM_TK_SPECIAL,
+       ///
+       LM_TK_ARGUMENT, 
+       ///
+       LM_TK_NEWCOMMAND,
+       ///
+       LM_TK_STACK
 };
 
-///
-struct latexkeys { char const * name; short token; int id; };
 
 ///
-struct latexkeys *
-in_word_set (register char const * str, register int len);
+struct latexkeys {
+       ///
+       char const * name;
+       ///
+       short token;
+       ///
+       unsigned int id;
+};
 
-///
-struct latexkeys * lm_get_key(int index);
 
 ///
-struct latexkeys * lm_get_key_by_id(int id, short tc = LM_TK_SYM);
+latexkeys const * in_word_set(string const & str);
 
 ///
-typedef union{
-  ///
-unsigned char c;
-  ///
-char * s;
-  ///
-int i;
-  ///
-latexkeys * l;
-} YYSTYPE;
+latexkeys const * lm_get_key_by_id(unsigned int id, short tc);
+
 
-extern YYSTYPE yylval;
+MathInset * mathed_parse(string const &);
+MathInset * mathed_parse(std::istream &);
+MathInset * mathed_parse(LyXLex &);
 
 #endif