* 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.
*/
#ifndef MATH_PARSER_H
#define MATH_PARSER_H
+#include "MathParser_flags.h"
+
#include "support/types.h"
#include "support/docstring.h"
-#include <string>
-#include <vector>
namespace lyx {
-
class MathAtom;
-class MathArray;
+class MathData;
class InsetMathGrid;
-class LyXLex;
+class Lexer;
///
latexkeys const * in_word_set(docstring const & str);
/// parse formula from a string
-bool mathed_parse_normal(MathAtom &, docstring const &);
-/// ... a stream
-bool mathed_parse_normal(MathAtom &, std::istream &);
-/// ... the LyX lexxer
-bool mathed_parse_normal(MathAtom &, LyXLex &);
+bool mathed_parse_normal(MathAtom &, docstring const &, Parse::flags f = Parse::NORMAL);
/// ... the LyX lexxer
-void mathed_parse_normal(InsetMathGrid &, docstring const &);
+bool mathed_parse_normal(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);
/// parse a single cell from a string
-void mathed_parse_cell(MathArray & ar, docstring const &);
-/// ... a stream
-void mathed_parse_cell(MathArray & ar, std::istream &);
+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 &).
+bool mathed_parse_cell(MathData & ar, std::istream &, Parse::flags f = Parse::NORMAL);
void initParser();