redo undo

[lyx.git] / src / mathed / formula.h

diff --git a/src/mathed/formula.h b/src/mathed/formula.h
index 76510dd0b1e00135f512df405ccba9e62fb93b23..2c79e230a378003b8abca08048ee73f729092c1d 100644 (file)
--- a/src/mathed/formula.h
+++ b/src/mathed/formula.h
@@ -13,81 +13,22 @@
 #ifndef INSET_FORMULA_H
 #define INSET_FORMULA_H
 
-#include "formulabase.h"
-#include "math_atom.h"
-
-#include <boost/scoped_ptr.hpp>
-
-class RenderPreview;
+#include "math_hullinset.h"
 
 
 /// The main LyX math inset
-class InsetFormula : public InsetFormulaBase {
+class InsetFormula : public MathHullInset {
 public:
        ///
-       InsetFormula(bool chemistry = false);
-       ///
-       explicit InsetFormula(BufferView *);
-       ///
-       explicit InsetFormula(std::string const & data);
-       ///
-       InsetFormula(InsetFormula const &);
-       ///
-       ~InsetFormula();
-       ///
-       void metrics(MetricsInfo & mi, Dimension & dim) const;
-       ///
-       void draw(PainterInfo & pi, int x, int y) const;
-
-       ///
-       void write(Buffer const &, std::ostream &) const;
-       ///
-       void read(Buffer const &, LyXLex & lex);
-       ///
-       int latex(Buffer const &, std::ostream &,
-                 LatexRunParams const &) const;
-       ///
-       int ascii(Buffer const &, std::ostream &,
-                 LatexRunParams const &) const;
+       std::auto_ptr<InsetBase> clone() const;
        ///
-       int linuxdoc(Buffer const &, std::ostream &,
-                    LatexRunParams const &) const;
+       void write(Buffer const & buf, std::ostream & os) const;
        ///
-       int docbook(Buffer const &, std::ostream &,
-                   LatexRunParams const &) const;
-
-       ///
-       virtual std::auto_ptr<InsetBase> clone() const;
-       ///
-       void validate(LaTeXFeatures & features) const;
-       ///
-       InsetOld::Code lyxCode() const;
-       ///
-       bool insetAllowed(InsetOld::Code code) const;
-       /// Appends \c list with all labels found within this inset.
-       void getLabelList(Buffer const &,
-                         std::vector<std::string> & list) const;
-       ///
-       MathAtom const & par() const { return par_; }
-       ///
-       MathAtom & par() { return par_; }
-       ///
-       void generatePreview(Buffer const &) const;
-       ///
-       void addPreview(lyx::graphics::PreviewLoader &) const;
-       ///
-       void mutate(std::string const & type);
-
-private:
-       /// Slot receiving a signal that the preview is ready to display.
-       void statusChanged() const;
-       /// available in AMS only?
-       bool ams() const;
+       void read(Buffer const & buf, LyXLex & lex);
+};
 
-       /// contents
-       MathAtom par_;
+// We don't really want to mess around with mathed stuff outside mathed.
+// So do it here.
+void mathDispatch(LCursor & cur, FuncRequest const & cmd);
 
-       /// The pointer never changes although *preview_'s contents may.
-       boost::scoped_ptr<RenderPreview> const preview_;
-};
 #endif