#endif
#include "LString.h"
-
#include "math_defs.h"
-#include "symbol_def.h"
-class MathArray;
-class MathMatrixInset;
+class MathHullInset;
class MathMacroTemplate;
+class MathAtom;
+class MathArray;
class LyXLex;
///
///
LM_TK_SYM = 256,
///
+ LM_TK_BOX,
+ ///
LM_TK_CHOOSE,
///
LM_TK_BINOM,
///
+ LM_TK_ATOP,
+ ///
LM_TK_OVER,
///
LM_TK_FRAC,
///
LM_TK_ROOT,
///
+ LM_TK_LEFTEQN,
+ ///
LM_TK_BEGIN,
///
LM_TK_END,
- ///
- LM_TK_NEWLINE,
- ///
- LM_TK_UNDEF,
/// mathcal, mathrm...
LM_TK_OLDFONT,
/// cal,...
///
LM_TK_FUNCLIM,
///
- LM_TK_BIGSYM,
+ LM_TK_CMR,
+ ///
+ LM_TK_CMSY,
///
- LM_TK_NOGLYPH,
+ LM_TK_CMM,
///
- LM_TK_NOGLYPHB,
+ LM_TK_CMEX,
+ ///
+ LM_TK_MSA,
+ ///
+ LM_TK_MSB,
///
LM_TK_LABEL,
///
///
LM_TK_NOT,
///
+ LM_TK_KERN,
+ ///
LM_TK_STACK
};
///
struct latexkeys {
///
- char const * name;
+ string name;
///
short token;
///
unsigned int id;
///
- int numargs;
+ unsigned char latex_font_id;
+ ///
+ string type;
+ ///
+ string xmlname;
};
///
latexkeys const * in_word_set(string const & str);
-MathMatrixInset * mathed_parse_normal(string const &);
-MathMatrixInset * mathed_parse_normal(std::istream &);
-MathMatrixInset * mathed_parse_normal(LyXLex &);
+///
+void ReadSymbols(string const & file);
+
+bool mathed_parse_normal(MathAtom &, string const &);
+bool mathed_parse_normal(MathAtom &, std::istream &);
+bool mathed_parse_normal(MathAtom &, LyXLex &);
+
+string mathed_parse_macro(string const &);
+string mathed_parse_macro(std::istream &);
+string mathed_parse_macro(LyXLex &);
-MathMacroTemplate * mathed_parse_macro(string const &);
-MathMacroTemplate * mathed_parse_macro(std::istream &);
-MathMacroTemplate * mathed_parse_macro(LyXLex &);
+void mathed_parse_cell(MathArray & ar, string const & str);
+void mathed_parse_cell(MathArray & ar, std::istream & is);
#endif