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 b2472a86cf0639aab105a09e0023afaab9cf1439..e2321c6b31c07afdffb4a7aba196915df2687eee 100644 (file)
--- a/src/mathed/math_parser.h
+++ b/src/mathed/math_parser.h
@@ -13,8 +13,8 @@
 #ifndef MATH_PARSER_H
 #define MATH_PARSER_H
 
+#include <string>
 
-#include "LString.h"
 
 class MathAtom;
 class MathArray;
@@ -23,35 +23,40 @@ class LyXLex;
 
 
 ///
-struct latexkeys {
+class latexkeys {
+public:
        /// name of the macro or primitive
-       string name;
+       std::string name;
        /// name of a inset that handles that macro
-       string inset;
+       std::string inset;
        /// position of the ting in a font
-       string draw;
+       std::string draw;
        /// operator/..., fontname e
-       string extra;
+       std::string extra;
        /// how is this called as XML entity?
-       string xmlname;
+       std::string xmlname;
+       /// required LaTeXFeatures
+       std::string requires;
 };
 
 
 /// check whether this is a well-known (La)TeX macro or primitive
-latexkeys const * in_word_set(string const & str);
+latexkeys const * in_word_set(std::string const & str);
 
 /// parse formula from a string
-bool mathed_parse_normal(MathAtom &, string const &);
+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 &, string const &);
+void mathed_parse_normal(MathGridInset &, std::string const &);
 
 /// parse a single cell from a string
-void mathed_parse_cell(MathArray & ar, string const &);
+void mathed_parse_cell(MathArray & ar, std::string const &);
 /// ... a stream
 void mathed_parse_cell(MathArray & ar, std::istream &);
 
+void initParser();
+
 #endif