-bool mathed_parse_normal(MathAtom &, std::string const &);
-/// ... a stream
-bool mathed_parse_normal(MathAtom &, std::istream &);
-/// ... the LyX lexxer
-bool mathed_parse_normal(MathAtom &, LyXLex &);
-/// ... the LyX lexxer
-void mathed_parse_normal(InsetMathGrid &, std::string const &);
+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
+bool mathed_parse_normal(InsetMathGrid &, docstring const &,
+ Parse::flags f = Parse::NORMAL);