X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathParser.h;h=9ff6db1a91a2cb9f0f48932a99dfcda0972dc76d;hb=ecbd047cffa1c4af95cf4ab91a7d2fded4a5584c;hp=43b6f920909dab900d66e1c87a5501fff29d6459;hpb=f505227f6e0815379b45d268a9674a485ae55aeb;p=lyx.git

diff --git a/src/mathed/MathParser.h b/src/mathed/MathParser.h
index 43b6f92090..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,12 +13,14 @@
 #ifndef MATH_PARSER_H
 #define MATH_PARSER_H
 
-#include "support/types.h"
+#include "MathParser_flags.h"
+
 #include "support/docstring.h"
 
 
 namespace lyx {
 
+class Buffer;
 class MathAtom;
 class MathData;
 class InsetMathGrid;
@@ -28,10 +30,14 @@ 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
@@ -51,28 +57,36 @@ 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;
 };
 
 
 /// check whether this is a well-known (La)TeX macro or primitive
 latexkeys const * in_word_set(docstring const & str);
 
-/// tell the parser whether it should warn about unusual contents
-void mathed_parser_warn_contents(bool);
-
 /// parse formula from a string
-bool mathed_parse_normal(MathAtom &, docstring const &);
-/// ... the LyX lexxer
-bool mathed_parse_normal(MathAtom &, Lexer &);
+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(MathData & 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(MathData & ar, std::istream &);
+bool mathed_parse_cell(MathData & ar, std::istream &,
+		Parse::flags f = Parse::NORMAL);
 
 void initParser();