enable direct input of #1...#9; some whitespace changes

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

diff --git a/src/mathed/math_parser.h b/src/mathed/math_parser.h
index 9b356fbec429f8b4cfd54b58a993875ba9f31404..d641de67f4937bfa8c7357a88c0a97b172ddc556 100644 (file)
--- a/src/mathed/math_parser.h
+++ b/src/mathed/math_parser.h
@@ -24,41 +24,42 @@
 #endif
 
 #include "LString.h"
-
 #include "math_defs.h"
-#include "symbol_def.h"
 
+class MathAtom;
 class MathArray;
-class MathMatrixInset;
-class MathMacroTemplate;
 class LyXLex;
 
 ///
 enum MathTokenEnum
 {
        ///
-       LM_TK_BOP = 256,
+       LM_TK_SYM = 256,
        ///
-       LM_TK_ALPHA,
+       LM_TK_BOX,
        ///
-       LM_TK_STR,
+       LM_TK_CHOOSE,
        ///
-       LM_TK_SYM,
+       LM_TK_BINOM,
        ///
-       LM_TK_FRAC,
+       LM_TK_ATOP,
        ///
-       LM_TK_CHOOSE,
+       LM_TK_OVER,
        ///
-       LM_TK_SQRT,
+       LM_TK_FRAC,
        ///
-       LM_TK_BEGIN,
+       LM_TK_SQRT,
        ///
-       LM_TK_END,
+       LM_TK_ROOT,
        ///
-       LM_TK_NEWLINE,
+       LM_TK_LEFTEQN,
        ///
-       LM_TK_UNDEF,
+       LM_TK_BEGIN,
        ///
+       LM_TK_END,
+       /// mathcal, mathrm...
+       LM_TK_OLDFONT,
+       /// cal,...
        LM_TK_FONT,
        ///
        LM_TK_LEFT,
@@ -71,7 +72,17 @@ enum MathTokenEnum
        ///
        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,
        ///
@@ -87,8 +98,6 @@ enum MathTokenEnum
        ///
        LM_TK_STY,
        ///
-       LM_TK_MACRO,
-       ///
        LM_TK_SPECIAL,
        ///
        LM_TK_ARGUMENT, 
@@ -97,36 +106,51 @@ enum MathTokenEnum
        ///
        LM_TK_MATH,
        ///
+       LM_TK_NOT,
+       ///
+       LM_TK_KERN,
+       ///
        LM_TK_STACK
 };
 
 
 ///
 struct latexkeys {
-       ///
-       char const * name;
-       ///
-       short token;
-       ///
+       /// name of the macro or primitive
+       string name;
+       /// one of the categories above
+       MathTokenEnum token;
+       /// an id within a category if needed (only for spaces?)
        unsigned int id;
-       ///
-       MathBinaryTypes bin;
+       /// which font to use (optional)
+       unsigned int latex_font_id;
+       /// operator/...
+       string type;
+       /// how is this called as XML entity?
+       string xmlname;
 };
 
 
-///
+/// check whether this is a well-known (La)TeX macro or primitive
 latexkeys const * in_word_set(string const & str);
 
-///
-latexkeys const * lm_get_key_by_id(unsigned int id, short tc);
-
+/// parse formula from a string
+bool mathed_parse_normal(MathAtom &, string const &);
+/// ... a stream
+bool mathed_parse_normal(MathAtom &, std::istream &);
+/// ... the LyX lexxer
+bool mathed_parse_normal(MathAtom &, LyXLex &);
 
-MathMatrixInset * mathed_parse_normal(string const &);
-MathMatrixInset * mathed_parse_normal(std::istream &);
-MathMatrixInset * mathed_parse_normal(LyXLex &);
+/// parse a macro definition from a string, enter it into the macro table
+string mathed_parse_macro(string const &);
+/// ... a stream
+string mathed_parse_macro(std::istream &);
+/// ... the LyX lexxer
+string mathed_parse_macro(LyXLex &);
 
-MathMacroTemplate * mathed_parse_macro(string const &);
-MathMacroTemplate * mathed_parse_macro(std::istream &);
-MathMacroTemplate * mathed_parse_macro(LyXLex &);
+/// parse a single cell from a string
+void mathed_parse_cell(MathArray & ar, string const &);
+/// ... a stream
+void mathed_parse_cell(MathArray & ar, std::istream &);
 
 #endif