X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathParser.h;h=9ff6db1a91a2cb9f0f48932a99dfcda0972dc76d;hb=2de30c62f8d671a8c8d4d52a6a7310e2c5ca84de;hp=31cbecc2723d07e89cd555e2435dd10c8d78896e;hpb=a1a34443eff8d3224141a8d170cef3d628fb1ae4;p=lyx.git

diff --git a/src/mathed/MathParser.h b/src/mathed/MathParser.h
index 31cbecc272..9ff6db1a91 100644
--- a/src/mathed/MathParser.h
+++ b/src/mathed/MathParser.h
@@ -15,7 +15,6 @@
 
 #include "MathParser_flags.h"
 
-#include "support/types.h"
 #include "support/docstring.h"
 
 
@@ -31,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
@@ -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,25 +68,25 @@ public:
 latexkeys const * in_word_set(docstring const & str);
 
 /// parse formula from a string
-bool mathed_parse_normal(MathAtom &, docstring const &,
-		Parse::flags f = Parse::NORMAL, Buffer * buf = 0);
+bool mathed_parse_normal(Buffer * buf, MathAtom &, docstring const &,
+		Parse::flags f = Parse::NORMAL);
 
 /// parse formula from the LyX lexxer
-bool mathed_parse_normal(MathAtom &, Lexer &,
-		Parse::flags f = Parse::NORMAL, Buffer * buf = 0);
+bool mathed_parse_normal(Buffer * buf, MathAtom &, Lexer &,
+		Parse::flags f = Parse::NORMAL);
 
 /// parse formula from a string into a grid
 bool mathed_parse_normal(InsetMathGrid &, docstring const &,
-		Parse::flags f = Parse::NORMAL, Buffer * buf = 0);
+		Parse::flags f = Parse::NORMAL);
 
 /// parse a single cell from a string
 bool mathed_parse_cell(MathData & ar, docstring const &,
-		Parse::flags f = Parse::NORMAL, Buffer * buf = 0);
+		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 &).
 bool mathed_parse_cell(MathData & ar, std::istream &,
-		Parse::flags f = Parse::NORMAL, Buffer * buf = 0);
+		Parse::flags f = Parse::NORMAL);
 
 void initParser();