remove symbol_def.h

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

diff --git a/src/mathed/math_parser.h b/src/mathed/math_parser.h
index 9141ba4a68fb51c938dd2bd657d86601177a85cf..68ef43cce915ff519575b7ddc74a2acf6bf37754 100644 (file)
--- a/src/mathed/math_parser.h
+++ b/src/mathed/math_parser.h
@@ -16,38 +16,40 @@
  *   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 "math_defs.h"
 
-#include "symbol_def.h"
-
-///
-#define LM_TK_OPEN '{'
-///
-#define LM_TK_CLOSE '}'
+class MathMatrixInset;
+class MathMacroTemplate;
+class LyXLex;
 
 ///
 enum MathTokenEnum
 {
        ///
-       LM_TK_BOP = 256,
+       LM_TK_SYM = 256,
+       ///
+       LM_TK_CHOOSE,
        ///
-       LM_TK_ALPHA,
+       LM_TK_BINOM,
        ///
-       LM_TK_STR,
+       LM_TK_ATOP,
        ///
-       LM_TK_SYM,
+       LM_TK_OVER,
        ///
        LM_TK_FRAC,
        ///
        LM_TK_SQRT,
        ///
+       LM_TK_ROOT,
+       ///
        LM_TK_BEGIN,
        ///
        LM_TK_END,
@@ -55,22 +57,32 @@ enum MathTokenEnum
        LM_TK_NEWLINE,
        ///
        LM_TK_UNDEF,
-       ///
+       /// mathcal, mathrm...
+       LM_TK_OLDFONT,
+       /// cal,...
        LM_TK_FONT,
        ///
        LM_TK_LEFT,
        ///
        LM_TK_RIGHT,
        ///
-       LM_TK_ACCENT,
-       ///
-       LM_TK_WIDE,
+       LM_TK_DECORATION,
        ///
        LM_TK_FUNC,
        ///
        LM_TK_FUNCLIM,
        ///
-       LM_TK_BIGSYM,
+       LM_TK_CMR,
+       ///
+       LM_TK_CMSY,
+       ///
+       LM_TK_CMM,
+       ///
+       LM_TK_CMEX,
+       ///
+       LM_TK_MSA,
+       ///
+       LM_TK_MSB,
        ///
        LM_TK_LABEL,
        ///
@@ -82,13 +94,9 @@ enum MathTokenEnum
        ///
        LM_TK_LIMIT,
        ///
-       LM_TK_STY,
+       LM_TK_PROTECT,
        ///
-       LM_TK_PMOD,
-       ///
-       LM_TK_BMOD,
-       ///
-       LM_TK_MACRO,
+       LM_TK_STY,
        ///
        LM_TK_SPECIAL,
        ///
@@ -96,6 +104,12 @@ enum MathTokenEnum
        ///
        LM_TK_NEWCOMMAND,
        ///
+       LM_TK_MATH,
+       ///
+       LM_TK_NOT,
+       ///
+       LM_TK_KERN,
+       ///
        LM_TK_STACK
 };
 
@@ -103,25 +117,30 @@ enum MathTokenEnum
 ///
 struct latexkeys {
        ///
-       char const * name;
+       string name;
        ///
        short token;
        ///
-       int id;
+       unsigned int id;
+       ///
+       unsigned char latex_font_id;
+       ///
+       MathSymbolTypes type;
 };
 
 
-///
-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);
+void ReadSymbols(string const & file);
 
-///
-latexkeys const * lm_get_key_by_id(int id, short tc = LM_TK_SYM);
+MathMatrixInset * mathed_parse_normal(string const &);
+MathMatrixInset * mathed_parse_normal(std::istream &);
+MathMatrixInset * mathed_parse_normal(LyXLex &);
+
+MathMacroTemplate * mathed_parse_macro(string const &);
+MathMacroTemplate * mathed_parse_macro(std::istream &);
+MathMacroTemplate * mathed_parse_macro(LyXLex &);
 
 #endif