X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathParser.h;h=9ff6db1a91a2cb9f0f48932a99dfcda0972dc76d;hb=400703aff1984aa304a71e1ba315e1047d344020;hp=2fb712fa1124aecc43231c9c96b6ac56db70132e;hpb=1ca55d1c8f1bc16d80db26d287ecf6f1a8e51aee;p=lyx.git

diff --git a/src/mathed/MathParser.h b/src/mathed/MathParser.h
index 2fb712fa11..9ff6db1a91 100644
--- a/src/mathed/MathParser.h
+++ b/src/mathed/MathParser.h
@@ -5,7 +5,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Alejandro Aguilar Sierra
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -13,28 +13,31 @@
 #ifndef MATH_PARSER_H
 #define MATH_PARSER_H
 
-#include "support/types.h"
+#include "MathParser_flags.h"
+
 #include "support/docstring.h"
 
-#include <string>
-#include <vector>
 
 namespace lyx {
 
-
+class Buffer;
 class MathAtom;
-class MathArray;
+class MathData;
 class InsetMathGrid;
-class LyXLex;
+class Lexer;
 
 
 ///
 class latexkeys {
 public:
+	///
+	latexkeys() : hidden(false) {}
+	///
+	char const * MathMLtype() const;
 	/// name of the macro or primitive
 	docstring name;
 	/// name of a inset that handles that macro
-	docstring inset;
+	std::string inset;
 	/**
 	 * The string or symbol to draw.
 	 * This is a string of length 1 if \p name is a known symbol, and
@@ -54,7 +57,10 @@ public:
 	/// how is this called as XML entity in MathML?
 	docstring xmlname;
 	/// required LaTeXFeatures
-	docstring requires;
+	std::string requires;
+	/// Should this macro be hidden from autocompletion (since it requires
+	/// user preamble code)?
+	bool hidden;
 };
 
 
@@ -62,17 +68,25 @@ public:
 latexkeys const * in_word_set(docstring const & str);
 
 /// parse formula from a string
-bool mathed_parse_normal(MathAtom &, docstring const &);
-/// ... the LyX lexxer
-bool mathed_parse_normal(MathAtom &, LyXLex &);
+bool mathed_parse_normal(Buffer * buf, MathAtom &, docstring const &,
+		Parse::flags f = Parse::NORMAL);
+
+/// parse formula from the LyX lexxer
+bool mathed_parse_normal(Buffer * buf, MathAtom &, Lexer &,
+		Parse::flags f = Parse::NORMAL);
+
 /// parse formula from a string into a grid
-void mathed_parse_normal(InsetMathGrid &, docstring const &);
+bool mathed_parse_normal(InsetMathGrid &, docstring const &,
+		Parse::flags f = Parse::NORMAL);
 
 /// parse a single cell from a string
-void mathed_parse_cell(MathArray & ar, docstring const &);
+bool mathed_parse_cell(MathData & ar, docstring const &,
+		Parse::flags f = Parse::NORMAL);
+
 /// parse a single cell from a stream. Only use this for reading from .lyx
 /// file format, for the reason see Parser::tokenize(std::istream &).
-void mathed_parse_cell(MathArray & ar, std::istream &);
+bool mathed_parse_cell(MathData & ar, std::istream &,
+		Parse::flags f = Parse::NORMAL);
 
 void initParser();