oh well

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

diff --git a/src/mathed/math_parser.h b/src/mathed/math_parser.h
index e1b167a2d4bffde5fc5f7c8ca16f22e818a7e808..0b51edbec19da0ca5ead06e3f0d0b55c8611e56c 100644 (file)
--- a/src/mathed/math_parser.h
+++ b/src/mathed/math_parser.h
@@ -2,7 +2,7 @@
 /*
  *  File:        math_parser.h
  *  Purpose:     Declaration of parsing utilities for mathed
- *  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx> 
+ *  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
  *  Created:     January 1996
  *  Description: Parse LaTeX2e math mode code.
  *
@@ -24,13 +24,10 @@
 #endif
 
 #include "LString.h"
-
 #include "math_defs.h"
-#include "symbol_def.h"
 
+class MathAtom;
 class MathArray;
-class MathMatrixInset;
-class MathMacroTemplate;
 class LyXLex;
 
 ///
@@ -39,6 +36,8 @@ enum MathTokenEnum
        ///
        LM_TK_SYM = 256,
        ///
+       LM_TK_BOX,
+       ///
        LM_TK_CHOOSE,
        ///
        LM_TK_BINOM,
@@ -53,13 +52,11 @@ 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,...
@@ -103,7 +100,7 @@ enum MathTokenEnum
        ///
        LM_TK_SPECIAL,
        ///
-       LM_TK_ARGUMENT, 
+       LM_TK_ARGUMENT,
        ///
        LM_TK_NEWCOMMAND,
        ///
@@ -111,7 +108,7 @@ enum MathTokenEnum
        ///
        LM_TK_NOT,
        ///
-       LM_TK_KERN,
+       LM_TK_UNDERSET,
        ///
        LM_TK_STACK
 };
@@ -119,33 +116,41 @@ enum MathTokenEnum
 
 ///
 struct latexkeys {
-       ///
+       /// name of the macro or primitive
        string name;
-       ///
-       short token;
-       ///
+       /// one of the categories above
+       MathTokenEnum token;
+       /// an id within a category if needed (only for spaces?)
        unsigned int id;
-       ///
-       unsigned char latex_font_id;
-       ///
-       MathSymbolTypes type;
-       ///
-       string const & Name() const { return name;}
+       /// 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);
 
-///
-void ReadSymbols(string const & file);
+/// 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
+bool mathed_parse_macro(string &, string const &);
+/// ... a stream
+bool mathed_parse_macro(string &, std::istream &);
+/// ... the LyX lexxer
+bool mathed_parse_macro(string &, 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