make \newcommand{\bb}[1]{\mathbf{#1}} work for read/write/display.

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

diff --git a/src/mathed/formulabase.h b/src/mathed/formulabase.h
index 81b36fb66b993fdc49b9dc5d0c1908d23cfe4571..54e255495608269b31acca090f821ff2fe196b19 100644 (file)
--- a/src/mathed/formulabase.h
+++ b/src/mathed/formulabase.h
@@ -21,13 +21,14 @@
 
 #include <iosfwd>
 #include "insets/inset.h"
+#include "lyxfont.h"
 
 // only for getType():
 #include "math_defs.h"
 
 class Buffer;
 class BufferView;
-class MathInset;
+class MathAtom;
 
 ///
 class InsetFormulaBase : public UpdatableInset {
@@ -42,38 +43,16 @@ public:
        virtual int width(BufferView *, LyXFont const &) const = 0;
        ///
        virtual void draw(BufferView *,LyXFont const &, int, float &, bool) const = 0;
-
-       /// These are just wrappers taking the unused Buffer * dummy parameter
-       /// 
-       virtual void write(Buffer const *, std::ostream &) const;
-       ///
-       virtual void read(Buffer const *, LyXLex & lex);
-       ///
-       virtual int latex(Buffer const *, std::ostream &,
-                 bool fragile, bool free_spc) const;
-       ///
-       virtual int ascii(Buffer const *, std::ostream &, int linelen) const;
-       ///
-       virtual int linuxdoc(Buffer const *, std::ostream &) const;
-       ///
-       virtual int docBook(Buffer const *, std::ostream &) const;
        ///
        virtual MathInsetTypes getType() const = 0;
-
-protected:
-       /// the actual functions don't use the Buffer * parameter
-       ///
-       virtual void write(std::ostream &) const = 0;
-       ///
-       virtual void read(LyXLex & lex) = 0;
-       ///
-       virtual int latex(std::ostream &, bool fragile, bool free_spc) const = 0;
-       ///
-       virtual int ascii(std::ostream &, int linelen) const = 0;
-       ///
-       virtual int linuxdoc(std::ostream &) const = 0;
-       ///
-       virtual int docBook(std::ostream &) const = 0;
+       /// lowest x coordinate
+       virtual int xlow() const;
+       /// highest x coordinate
+       virtual int xhigh() const;
+       /// lowest y coordinate
+       virtual int ylow() const;
+       /// highest y coordinate
+       virtual int yhigh() const;
 
 public:
        ///
@@ -101,7 +80,7 @@ public:
        ///
        virtual void insetButtonPress(BufferView *, int x, int y, int button);
        ///
-       virtual void insetButtonRelease(BufferView *, int x, int y, int button);
+       virtual bool insetButtonRelease(BufferView *, int x, int y, int button);
        ///
        virtual void insetKeyPress(XKeyEvent * ev);
        ///
@@ -115,15 +94,43 @@ public:
        ///
        virtual std::vector<string> const getLabelList() const;
        ///
-       virtual MathInset const * par() const = 0;
+       virtual MathAtom const & par() const = 0;
        ///
-       virtual void metrics() const = 0;
-protected:
+       virtual MathAtom & par() = 0;
        ///
        virtual void updateLocal(BufferView * bv, bool mark_dirty);
+       ///
+       BufferView * view() const { return view_; }
+
+       ///
+       virtual bool searchForward(BufferView *, string const &,
+                                  bool const & = true, bool const & = false);
+       ///
+       virtual bool searchBackward(BufferView *, string const &,
+                                   bool const & = true, bool const & = false);
+       ///
+       virtual bool isTextInset() const { return true; }
+
+
 private:
        /// unimplemented
        void operator=(const InsetFormulaBase &);
+
+       ///
+       mutable BufferView * view_;     
+       ///
+       mutable LyXFont font_;
+
+protected:
+       ///
+       void metrics(BufferView * bv, LyXFont const & font) const;
+       ///
+       void metrics(BufferView * bv = 0) const;
+
+       ///
+       mutable int xo_;
+       ///
+       mutable int yo_;
 };
 
 // We don't really mess want around with mathed stuff outside mathed.
@@ -143,6 +150,10 @@ void mathDispatchInsertMath(BufferView *, string const &);
 //
 void mathDispatchInsertMatrix(BufferView *, string const &);
 //
+void mathDispatchGreek(BufferView *, string const &);
+//
 void mathDispatchMathImportSelection(BufferView *, string const &);
+//
+void mathDispatch(BufferView *, kb_action, string const &);
 
 #endif