small cleanup, doxygen, formatting changes

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

diff --git a/src/mathed/math_inset.h b/src/mathed/math_inset.h
index fa759c5af6c196dc1f492926f53f9363ee88b70f..dd1cb92e0f6e6bdefd4db540365d7188974b7c52 100644 (file)
--- a/src/mathed/math_inset.h
+++ b/src/mathed/math_inset.h
@@ -27,82 +27,99 @@
 #endif
 
 #include "LString.h"
-#include "math_defs.h"
 #include "symbol_def.h"
 
+class Painter;
+
 /** Abstract base class for all math objects.
     A math insets is for use of the math editor only, it isn't a
     general LyX inset. It's used to represent all the math objects.
     The formulaInset (a LyX inset) encapsulates a math inset.
- */
+*/
 class MathedInset  {
- public: 
-    /// A math inset has a name (usually its LaTeX name), type and font-size
-    MathedInset(string const & nm, short ot, short st);
-    ///
-    explicit
-    MathedInset(MathedInset *);
-    ///
-    virtual ~MathedInset() {}
-    /// Draw the object
-    virtual void draw(Painter &, int x, int baseline) = 0;     
-    /// Write LaTeX and Lyx code
-    virtual void Write(std::ostream &, bool fragile) = 0;
-    /// Reproduces itself
-    virtual MathedInset * Clone() = 0;
-    /// Compute the size of the object
-    virtual void Metrics() = 0; 
-    /// 
-    virtual int Ascent() const { return ascent; }
-    ///
-    virtual int Descent() const { return descent; }
-    ///
-    virtual int Width() const { return width; }
-    ///
-    virtual int Height() const { return ascent + descent; }
-    ///
-    virtual bool GetLimits() const { return false; }
-    ///
-    virtual void SetLimits(bool) {}   
-    ///
-    string const & GetName() const { return name; }
-    ///
-    short GetType() const { return objtype; }
-    ///
-    short GetStyle() const { return size; }
-    //Man:  Avoid to use these functions if it's not strictly necessary 
-    ///
-    virtual void  SetType(short t) { objtype = t; }
-    ///
-    virtual void  SetStyle(short st) { size = st; } // Metrics();
-    ///
-    virtual void  SetName(string const & n) { name = n; }
-    ///
-    static int workWidth;
-        protected:
-    ///
-    string name;
-    ///
-    short objtype;
-    ///
-    int width;
-    ///
-    int ascent;
-    ///
-    int descent;
-    ///
-    short size;
-    /// Default metrics
-    static int df_asc;
-    ///
-    static int df_des;
-    ///
-    static int df_width;
-    /// In a near future maybe we use a better fonts renderer than X
-    void drawStr(Painter &, short, int, int, int, string const &);
-    ///
-    friend class MathedCursor;
-    ///
-    friend void mathed_init_fonts();
+public: 
+       /** A math inset has a name (usually its LaTeX name),
+           type and font-size
+       */
+       MathedInset(string const & nm, short ot, short st);
+       ///
+       explicit
+       MathedInset(MathedInset *);
+       ///
+       virtual ~MathedInset() {}
+       /// Draw the object
+       virtual void draw(Painter &, int x, int baseline) = 0;  
+       /// Write LaTeX and Lyx code
+       virtual void Write(std::ostream &, bool fragile) = 0;
+       /// Reproduces itself
+       virtual MathedInset * Clone() = 0;
+       /// Compute the size of the object
+       virtual void Metrics() = 0; 
+       /// 
+       virtual int Ascent() const;
+       ///
+       virtual int Descent() const;
+       ///
+       virtual int Width() const;
+       ///
+       virtual int Height() const;
+       ///
+       virtual bool GetLimits() const;
+       ///
+       virtual void SetLimits(bool);
+       ///
+       string const & GetName() const;
+       ///
+       short GetType() const;
+       ///
+       short GetStyle() const;
+       //Man:  Avoid to use these functions if it's not strictly necessary 
+       ///
+       virtual void  SetType(short t);
+       ///
+       virtual void  SetStyle(short st);
+       ///
+       virtual void  SetName(string const & n);
+       ///
+       static int workWidth;
+       ///
+       static void defaultAscent(int da);
+       ///
+       static void defaultDescent(int dd);
+       ///
+       static void defaultWidth(int dw);
+       ///
+       short size() const {
+               return size_;
+       }
+protected:
+       ///
+       string name;
+       ///
+       short objtype;
+       ///
+       int width;
+       ///
+       int ascent;
+       ///
+       int descent;
+       /// Default metrics
+       static int df_asc;
+       ///
+       static int df_des;
+       ///
+       static int df_width;
+       /// In a near future maybe we use a better fonts renderer than X
+       void drawStr(Painter &, short, int, int, int, string const &);
+       ///
+       void size(short s) {
+               size_ = s;
+       }
+       void incSize() {
+               ++size_;
+       }
+private:
+       ///
+       short size_;
 };
 #endif