class MathAtom;
-class MathArray;
+class MathData;
class InsetMathGrid;
-class LyXLex;
+class Lexer;
///
/// 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 &);
/// ... the LyX lexxer
+bool mathed_parse_normal(MathAtom &, Lexer &);
+/// parse formula from a string into a grid
void mathed_parse_normal(InsetMathGrid &, docstring const &);
/// 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 &);
+void mathed_parse_cell(MathData & ar, docstring const &);
+/// 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 &);
void initParser();