use stream-like syntax for LaTeX output

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

diff --git a/src/mathed/formulabase.h b/src/mathed/formulabase.h
index cd80d0e92de163b33a3dccabd0808f3a043cc4e5..3d45a7814fbc6ba7ee1519344091c30d9d8ef890 100644 (file)
--- a/src/mathed/formulabase.h
+++ b/src/mathed/formulabase.h
@@ -27,7 +27,7 @@
 
 class Buffer;
 class BufferView;
-class MathInset;
+class MathAtom;
 
 ///
 class InsetFormulaBase : public UpdatableInset {
@@ -42,39 +42,9 @@ 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;
-
 public:
        ///
        virtual void validate(LaTeXFeatures &) const;
@@ -86,6 +56,7 @@ public:
        virtual string const editMessage() const;
        ///
        virtual void edit(BufferView *, int x, int y, unsigned int button);
+       ///
        virtual void edit(BufferView *, bool front = true);
        ///
        virtual void toggleInsetCursor(BufferView *);
@@ -114,15 +85,20 @@ 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 metrics(BufferView * bv = 0, LyXFont const * font = 0) const;
        ///
        virtual void updateLocal(BufferView * bv, bool mark_dirty);
 private:
        /// unimplemented
        void operator=(const InsetFormulaBase &);
+       ///
+       mutable BufferView * view_;     
+       ///
+       mutable LyXFont const * font_;
 };
 
 // We don't really mess want around with mathed stuff outside mathed.
@@ -142,6 +118,8 @@ void mathDispatchInsertMath(BufferView *, string const &);
 //
 void mathDispatchInsertMatrix(BufferView *, string const &);
 //
+void mathDispatchGreek(BufferView *, string const &);
+//
 void mathDispatchMathImportSelection(BufferView *, string const &);
 
 #endif