small cleanup, doxygen, formatting changes

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

diff --git a/src/mathed/math_parinset.h b/src/mathed/math_parinset.h
index 04938942919a1a0bdead6279f67b3a7454087393..d6583e8a11e2b73405049f11b47d3aed77dce6c8 100644 (file)
--- a/src/mathed/math_parinset.h
+++ b/src/mathed/math_parinset.h
@@ -3,128 +3,98 @@
 #define MATH_PARINSET_H
 
 #include "math_inset.h"
+#include "math_defs.h"
 
-struct MathedRowSt;
+class MathedRowSt;
+class MathedArray;
 
 
-/** The math paragraph base class, base to all editable math objects */
+/** The math paragraph base class, base to all editable math objects
+    \author Alejandro Aguilar Sierra
+ */
 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() { return array; }
-    /// Paragraph position
-    virtual void GetXY(int &, int &) const;
-    ///
-    virtual void setXY(int x, int y) { xo = x;  yo = 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 { return bool(f & flag); }
- protected:
-    /// Paragraph data is stored here
-    MathedArray * array;
-    /// Cursor start position
-    int xo;
-    ///
-    int yo;
-    /// 
-    short flag;
- private:
-    ///
-    virtual void setFlag(MathedParFlag f) { flag |= f; }
-    ///
-    friend class InsetFormula;
-    ///
-    friend class MathedXIter;
-    ///
-    friend class MathedCursor;
-    ///
-    friend MathedArray * mathed_parse(unsigned flags = 0,
-                                      MathedArray * a = 0,
-                                      MathParInset ** p = 0);
+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;
+       ///
+       int xo() const {
+               return xo_;
+       }
+       ///
+       int yo() const {
+               return yo_;
+       }
+protected:
+       /// Paragraph data is stored here
+       MathedArray * array;
+       /// 
+       short flag;
+       ///
+       void xo(int tx) {
+               xo_ = tx;
+       }
+       ///
+       void yo(int ty) {
+               yo_ = ty;
+       }
+private:
+       /// Cursor start position
+       int xo_;
+       ///
+       int yo_;
 };
-
-
-inline
-bool MathParInset::Inside(int x, int y) 
-{
-  return (x >= xo && x <= xo + width && y <= yo + descent && y >= yo - ascent);
-}
-
-
-inline
-void MathParInset::GetXY(int & x, int & y) const
-{
-   x = xo; y = yo;
-}
-
-
-inline
-void MathParInset::UserSetSize(short sz)
-{
-   if (sz >= 0) {
-       size = sz;      
-       flag = flag & ~LMPF_FIXED_SIZE;
-   }
-}
-
-
-inline
-void MathParInset::SetStyle(short sz) 
-{
-    if (Permit(LMPF_FIXED_SIZE)) {
-       if (Permit(LMPF_SCRIPT)) 
-         sz = (sz < LM_ST_SCRIPT) ? LM_ST_SCRIPT: LM_ST_SCRIPTSCRIPT;
-       if (Permit(LMPF_SMALLER) && sz < LM_ST_SCRIPTSCRIPT) {
-           ++sz;
-       } 
-       MathedInset::SetStyle(sz);
-    }
-}
 #endif