Andreas' patch to prevent crash on click on previewd inset

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

diff --git a/src/mathed/math_parser.h b/src/mathed/math_parser.h
index 9b356fbec429f8b4cfd54b58a993875ba9f31404..e2321c6b31c07afdffb4a7aba196915df2687eee 100644 (file)
--- a/src/mathed/math_parser.h
+++ b/src/mathed/math_parser.h
@@ -1,132 +1,62 @@
 // -*- C++ -*-
-/*
- *  File:        math_parser.h
- *  Purpose:     Declaration of parsing utilities for mathed
- *  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx> 
- *  Created:     January 1996
- *  Description: Parse LaTeX2e math mode code.
+/**
+ * \file math_parser.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *  Dependencies: Xlib, XForms
+ * \author Alejandro Aguilar Sierra
+ * \author André Pönitz
  *
- *  Copyright: 1996, Alejandro Aguilar Sierra
- *
- *   Version: 0.8beta.
- *
- *   You are free to use and modify this code under the terms of
- *   the GNU General Public Licence version 2 or later.
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef MATH_PARSER_H
 #define MATH_PARSER_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
+#include <string>
 
-#include "LString.h"
-
-#include "math_defs.h"
-#include "symbol_def.h"
 
+class MathAtom;
 class MathArray;
-class MathMatrixInset;
-class MathMacroTemplate;
+class MathGridInset;
 class LyXLex;
 
-///
-enum MathTokenEnum
-{
-       ///
-       LM_TK_BOP = 256,
-       ///
-       LM_TK_ALPHA,
-       ///
-       LM_TK_STR,
-       ///
-       LM_TK_SYM,
-       ///
-       LM_TK_FRAC,
-       ///
-       LM_TK_CHOOSE,
-       ///
-       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_DECORATION,
-       ///
-       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_PROTECT,
-       ///
-       LM_TK_STY,
-       ///
-       LM_TK_MACRO,
-       ///
-       LM_TK_SPECIAL,
-       ///
-       LM_TK_ARGUMENT, 
-       ///
-       LM_TK_NEWCOMMAND,
-       ///
-       LM_TK_MATH,
-       ///
-       LM_TK_STACK
-};
-
 
 ///
-struct latexkeys {
-       ///
-       char const * name;
-       ///
-       short token;
-       ///
-       unsigned int id;
-       ///
-       MathBinaryTypes bin;
+class latexkeys {
+public:
+       /// name of the macro or primitive
+       std::string name;
+       /// name of a inset that handles that macro
+       std::string inset;
+       /// position of the ting in a font
+       std::string draw;
+       /// operator/..., fontname e
+       std::string extra;
+       /// how is this called as XML entity?
+       std::string xmlname;
+       /// required LaTeXFeatures
+       std::string requires;
 };
 
 
-///
-latexkeys const * in_word_set(string const & str);
-
-///
-latexkeys const * lm_get_key_by_id(unsigned int id, short tc);
+/// check whether this is a well-known (La)TeX macro or primitive
+latexkeys const * in_word_set(std::string const & str);
 
+/// parse formula from a string
+bool mathed_parse_normal(MathAtom &, std::string const &);
+/// ... a stream
+bool mathed_parse_normal(MathAtom &, std::istream &);
+/// ... the LyX lexxer
+bool mathed_parse_normal(MathAtom &, LyXLex &);
+/// ... the LyX lexxer
+void mathed_parse_normal(MathGridInset &, std::string const &);
 
-MathMatrixInset * mathed_parse_normal(string const &);
-MathMatrixInset * mathed_parse_normal(std::istream &);
-MathMatrixInset * mathed_parse_normal(LyXLex &);
+/// parse a single cell from a string
+void mathed_parse_cell(MathArray & ar, std::string const &);
+/// ... a stream
+void mathed_parse_cell(MathArray & ar, std::istream &);
 
-MathMacroTemplate * mathed_parse_macro(string const &);
-MathMacroTemplate * mathed_parse_macro(std::istream &);
-MathMacroTemplate * mathed_parse_macro(LyXLex &);
+void initParser();
 
 #endif