use stream-like syntax for LaTeX output

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

diff --git a/src/mathed/math_parser.h b/src/mathed/math_parser.h
index 9b356fbec429f8b4cfd54b58a993875ba9f31404..e49a4f7ce6c44616097c7180d34fd0dc8088a05c 100644 (file)
--- a/src/mathed/math_parser.h
+++ b/src/mathed/math_parser.h
@@ -24,41 +24,46 @@
 #endif
 
 #include "LString.h"
-
 #include "math_defs.h"
-#include "symbol_def.h"
 
-class MathArray;
 class MathMatrixInset;
 class MathMacroTemplate;
+class MathAtom;
+class MathArray;
 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_FRAC,
        ///
        LM_TK_SQRT,
        ///
+       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_FONT,
        ///
        LM_TK_LEFT,
@@ -71,7 +76,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 +102,6 @@ enum MathTokenEnum
        ///
        LM_TK_STY,
        ///
-       LM_TK_MACRO,
-       ///
        LM_TK_SPECIAL,
        ///
        LM_TK_ARGUMENT, 
@@ -97,6 +110,10 @@ enum MathTokenEnum
        ///
        LM_TK_MATH,
        ///
+       LM_TK_NOT,
+       ///
+       LM_TK_KERN,
+       ///
        LM_TK_STACK
 };
 
@@ -104,13 +121,15 @@ enum MathTokenEnum
 ///
 struct latexkeys {
        ///
-       char const * name;
+       string name;
        ///
        short token;
        ///
        unsigned int id;
        ///
-       MathBinaryTypes bin;
+       unsigned char latex_font_id;
+       ///
+       MathSymbolTypes type;
 };
 
 
@@ -118,15 +137,17 @@ struct latexkeys {
 latexkeys const * in_word_set(string const & str);
 
 ///
-latexkeys const * lm_get_key_by_id(unsigned int id, short tc);
+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 &);
 
-MathMatrixInset * mathed_parse_normal(string const &);
-MathMatrixInset * mathed_parse_normal(std::istream &);
-MathMatrixInset * mathed_parse_normal(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