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 27f647ead48b34a6cc6f92701ce044324368388d..e49a4f7ce6c44616097c7180d34fd0dc8088a05c 100644 (file)
--- a/src/mathed/math_parser.h
+++ b/src/mathed/math_parser.h
@@ -24,13 +24,12 @@
 #endif
 
 #include "LString.h"
-
 #include "math_defs.h"
-#include "symbol_def.h"
 
-class MathArray;
 class MathMatrixInset;
 class MathMacroTemplate;
+class MathAtom;
+class MathArray;
 class LyXLex;
 
 ///
@@ -39,6 +38,8 @@ enum MathTokenEnum
        ///
        LM_TK_SYM = 256,
        ///
+       LM_TK_BOX,
+       ///
        LM_TK_CHOOSE,
        ///
        LM_TK_BINOM,
@@ -53,13 +54,13 @@ enum MathTokenEnum
        ///
        LM_TK_ROOT,
        ///
+       LM_TK_LEFTEQN,
+       ///
        LM_TK_BEGIN,
        ///
        LM_TK_END,
        ///
        LM_TK_NEWLINE,
-       ///
-       LM_TK_UNDEF,
        /// mathcal, mathrm...
        LM_TK_OLDFONT,
        /// cal,...
@@ -75,11 +76,7 @@ enum MathTokenEnum
        ///
        LM_TK_FUNCLIM,
        ///
-       LM_TK_BIGSYM,
-       ///
-       LM_TK_NOGLYPH,
-       ///
-       LM_TK_NOGLYPHB,
+       LM_TK_CMR,
        ///
        LM_TK_CMSY,
        ///
@@ -133,8 +130,6 @@ struct latexkeys {
        unsigned char latex_font_id;
        ///
        MathSymbolTypes type;
-       ///
-       string const & Name() const { return name;}
 };
 
 
@@ -144,12 +139,15 @@ latexkeys const * in_word_set(string const & str);
 ///
 void ReadSymbols(string const & file);
 
-MathMatrixInset * mathed_parse_normal(string const &);
-MathMatrixInset * mathed_parse_normal(std::istream &);
-MathMatrixInset * mathed_parse_normal(LyXLex &);
+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