X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_parinset.h;h=17b6e0bd069c79ed8134cc87970d539757631ecb;hb=d359dd8fca52c4f0100f7cf4bf636113c5c4e49f;hp=52ab59ad2daaffd222a45f242f3824d195fe7211;hpb=84b7ffa3473faa9cfe66a974d2e0a5f9d6641187;p=lyx.git

diff --git a/src/mathed/math_parinset.h b/src/mathed/math_parinset.h
index 52ab59ad2d..17b6e0bd06 100644
--- a/src/mathed/math_parinset.h
+++ b/src/mathed/math_parinset.h
@@ -1,96 +1,22 @@
-// -*- C++ -*-
 #ifndef MATH_PARINSET_H
 #define MATH_PARINSET_H
 
-#include "math_inset.h"
-#include "math_defs.h"
+#include "math_hullinset.h"
 
-struct MathedRowSt;
-class MathedArray;
-
-
-/** The math paragraph base class, base to all editable math objects */
-class MathParInset: public MathedInset  {
- public: 
-    ///
-    MathParInset(short st = LM_ST_TEXT, string const & nm = string(),
-		 short ot = LM_OT_MIN);
-    ///
-    explicit
-    MathParInset(MathParInset *);
-    ///
-    virtual ~MathParInset();
-    ///
-    virtual MathedInset * Clone();
-    /// Draw the object on a drawable
-    virtual void draw(Painter &, int x, int baseline);
-    /// Write LaTeX code
-    virtual void Write(std::ostream &, bool fragile);
-    ///
-    virtual void Metrics();
-    ///
-    virtual void UserSetSize(short);
-    /// Data is stored in a LyXArray
-    virtual void SetData(MathedArray *);
-    ///
-    virtual MathedArray * GetData();
-    /// Paragraph position
-    virtual void GetXY(int &, int &) const;
-    ///
-    virtual void setXY(int x, int y);
-    ///
-    virtual void SetFocus(int, int) {}
-    ///
-    virtual bool Inside(int, int);   
-    // Tab stuff used by Matrix.
-    ///
-    virtual void SetAlign(char, string const &) {}
-    ///
-    virtual int GetColumns() const { return 1; }
-    ///
-    virtual int GetRows() const { return 1; }
-    ///
-    virtual bool isMatrix() const { return false; }
-    // Vertical switching
-    ///
-    virtual bool setArgumentIdx(int i) { return (i == 0); }
-    ///
-    virtual bool setNextArgIdx() { return false; }
-    ///
-    virtual int getArgumentIdx() const { return 0; }
-    ///
-    virtual int getMaxArgumentIdx() const { return 0; }
-    ///
-    virtual void SetStyle(short);
-    ///
-    virtual MathedRowSt * getRowSt() const;
-    ///
-    virtual void setRowSt(MathedRowSt *) {}
-    ///
-    virtual bool Permit(short f) const;
- protected:
-    /// Paragraph data is stored here
-    MathedArray * array;
-    /// Cursor start position
-    int xo;
-    ///
-    int yo;
-    /// 
-    short flag;
- private:
-    ///
-    virtual void setFlag(MathedParFlag f);
-    ///
-    friend class InsetFormula;
-    ///
-    friend class MathedXIter;
-    ///
-    friend class MathedCursor;
-    ///
-    friend MathedArray * mathed_parse(unsigned flags = 0,
-				       MathedArray * a = 0,
-				       MathParInset ** p = 0);
+class MathParInset : public MathHullInset {
+public:
+	///
+	MathParInset();
+	///
+	MathParInset * asParInset() { return this; }
+	///
+	void metrics(MathMetricsInfo & mi) const;
+	///
+	void draw(MathPainterInfo &, int x, int y) const;
+	///
+	void infoize(std::ostream & os) const;
+	///
+	void write(WriteStream & os) const;
 };
 
-
 #endif