X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_parser.h;h=ffd966549c7bdfc87687a7ff901367e7a2e6c185;hb=e093e5e80c334995a77445c8e66a9f3c9594dda1;hp=a99966423097732a5e257aa281c85de3919ab080;hpb=45a03f4f67bb00f8142e465c615f348f0622eb32;p=lyx.git

diff --git a/src/mathed/math_parser.h b/src/mathed/math_parser.h
index a999664230..ffd966549c 100644
--- 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.
  *
@@ -16,126 +16,56 @@
  *   the GNU General Public Licence version 2 or later.
  */
 
-#ifndef MATH_PARSER
-#define MATH_PARSER
+#ifndef MATH_PARSER_H
+#define MATH_PARSER_H
 
 #ifdef __GNUG__
 #pragma interface
 #endif
 
 #include "LString.h"
+#include "math_defs.h"
 
-#include "symbol_def.h"
-
-///
-#define LM_TK_OPEN '{'
-///
-#define LM_TK_CLOSE '}'
-
-///
-enum MathTokenEnum
-{
-    ///
-    LM_TK_BOP = 256,
-    ///
-    LM_TK_ALPHA,
-    ///
-    LM_TK_STR,
-    ///
-    LM_TK_SYM,
-    ///
-    LM_TK_FRAC,
-    ///
-    LM_TK_SQRT,
-    ///
-    LM_TK_BEGIN,
-    ///
-    LM_TK_END,
-    ///
-    LM_TK_NEWLINE,
-    ///
-    LM_TK_UNDEF,
-    ///
-    LM_TK_FONT,
-    ///
-    LM_TK_LEFT,
-    ///
-    LM_TK_RIGHT,
-    ///
-    LM_TK_ACCENT,
-    ///
-    LM_TK_WIDE,
-    ///
-    LM_TK_FUNC,
-    ///
-    LM_TK_FUNCLIM,
-    ///
-    LM_TK_BIGSYM,
-    ///
-    LM_TK_LABEL,
-    ///
-    LM_TK_NONUM,
-    ///
-    LM_TK_SPACE,
-    ///
-    LM_TK_DOTS,
-    ///
-    LM_TK_LIMIT,
-    ///
-    LM_TK_STY,
-    ///
-    LM_TK_PMOD,
-    ///
-    LM_TK_BMOD,
-    ///
-    LM_TK_MACRO,
-    ///
-    LM_TK_SPECIAL,
-    ///
-    LM_TK_ARGUMENT, 
-    ///
-    LM_TK_NEWCOMMAND,
-    ///
-    LM_TK_STACK
-};
+class MathAtom;
+class MathArray;
+class LyXLex;
 
 
 ///
 struct latexkeys {
-    ///
-    char const * name;
-    ///
-    short token;
-    ///
-    int id;
+	/// name of the macro or primitive
+	string name;
+	/// name of a inset that handles that macro
+	string inset;
+	/// position of the ting in a font
+	string draw;
+	/// operator/..., fontname e
+	string extra;
+	/// how is this called as XML entity?
+	string xmlname;
 };
 
 
-///
-latexkeys *
-in_word_set (register char const * str, register int len);
-
-///
-latexkeys * in_word_set(string const & str);
+/// check whether this is a well-known (La)TeX macro or primitive
+latexkeys const * in_word_set(string const & str);
 
-///
-latexkeys * lm_get_key(int index);
+/// 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 &);
 
-///
-latexkeys * lm_get_key_by_id(int id, short tc = LM_TK_SYM);
-
-///
-union YYSTYPE {
-    ///
-    unsigned char c;
-    ///
-    char * s;
-    ///
-    int i;
-    ///
-    latexkeys * l;
-};
+/// 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 &);
 
-extern YYSTYPE yylval;
+/// 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