small cleanup, doxygen, formatting changes

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

diff --git a/src/mathed/math_xiter.h b/src/mathed/math_xiter.h
index b97aaafc9953baa656eab107f9b2fba80089a0e4..309c1596cd2b221b0e2a27fbd95f74a47a1dceb3 100644 (file)
--- a/src/mathed/math_xiter.h
+++ b/src/mathed/math_xiter.h
@@ -4,110 +4,106 @@
 
 #include "math_iter.h"
 
-struct MathedRowSt;
+class MathedRowSt;
+class MathParInset;
 
 /**
- A graphic iterator (updates position.) Used for
- metrics and updating cursor position
- */
+   A graphic iterator (updates position.) Used for
+   metrics and updating cursor position
+*/
 class MathedXIter: public MathedIter {
-  public:
-  ///
-  MathedXIter();
-    //
-    MathedXIter(MathParInset *);
-    ///
-    void SetData(MathParInset *);
-    ///
-    MathParInset * getPar() const { return p; }
-    ///
-    bool Next();
-    ///
-    bool Prev();
-    ///
-    bool Up();
-    ///
-    bool Down();
-    ///
-    bool goNextColumn();
-    ///
-    void GoLast();
-    ///
-    void GoBegin();
-    ///
-    void Adjust();
-    ///
-    inline
-    void GetPos(int &, int &) const;
-    ///
-    inline
-    void GetIncPos(int &, int &) const;
-    ///
-    string const GetString() const;
-    ///
-    int GetX() const;
-    ///
-    int GetY() const;
-    ///
-    void subMetrics(int, int);
-    ///
-    void fitCoord(int, int);
-    /// 
-    void getAD(int & a, int & d) const;
-    
-    /// Create a new row and insert #ncols# tabs.
-    void addRow();
-    ///
-    void delRow();
-    
-    ///
-    bool setLabel(string const & label);
-    ///
-    static string error_label;
-    ///
-    string const & getLabel() const;
-    ///
-    bool setNumbered(bool);
+public:
+       ///
+       MathedXIter();
+       //
+       MathedXIter(MathParInset *);
+       ///
+       void SetData(MathParInset *);
+       ///
+       MathParInset * getPar() const;
+       ///
+       bool Next();
+       ///
+       bool Prev();
+       ///
+       bool Up();
+       ///
+       bool Down();
+       ///
+       void goNextColumn();
+       ///
+       void GoLast();
+       ///
+       void GoBegin();
+       ///
+       void Adjust();
+       ///
+       void GetPos(int &, int &) const;
+       ///
+       void GetIncPos(int &, int &) const;
+       ///
+       string const GetString() const;
+       ///
+       int GetX() const;
+       ///
+       int GetY() const;
+       ///
+       void subMetrics(int, int);
+       ///
+       void fitCoord(int, int);
+       /// 
+       void getAD(int & a, int & d) const;
        
-    ///
-    void setTab(int, int);
-    /// Merge the array at current position
-    void Merge(MathedArray *);
-    /// Delete every object from current position to pos2
-    void Clean(int pos2);
-    ///
-    MathedRowSt * adjustVerticalSt();
-    
+       /// Create a new row and insert #ncols# tabs.
+       void addRow();
+       ///
+       void delRow();
+       
+       ///
+       bool setLabel(string const & label);
+       ///
+       static string error_label;
+       ///
+       string const & getLabel() const;
+       ///
+       bool setNumbered(bool);
+       
+       ///
+       void setTab(int, int);
+       /// Merge the array at current position
+       void Merge(MathedArray *);
+       /// Delete every object from current position to pos2
+       void Clean(int pos2);
+       ///
+       MathedRowSt * adjustVerticalSt();
 private:
-    /// This function is not recursive, as MathPar::Metrics is
-    void IMetrics(int, int &, int &, int &);
-    /// Font size (display, text, script, script2) 
-    int size;
-    /// current position
-    mutable int x;
-    ///
-    int y;
-    ///
-    MathParInset * p;
-    
-    // Limits auxiliary variables
-    /// Position and max width of a script
-    int sx, sw;
-    /// true= center, false= left align (default)
-    bool limits;
-    /// Type of previous script
-    short s_type;  
-    ///
-    void ipush();
-    ///
-    void ipop();
-
+       /// This function is not recursive, as MathPar::Metrics is
+       void IMetrics(int, int &, int &, int &);
+       /// Font size (display, text, script, script2) 
+       int size;
+       /// current position
+       mutable int x;
+       ///
+       int y;
+       ///
+       MathParInset * p;
+       
+       // Limits auxiliary variables
+       /// Position and max width of a script
+       int sx;
+       ///
+       int sw;
+       /// true= center, false= left align (default)
+       bool limits;
+       ///
+       void ipush();
+       ///
+       void ipop();
 protected:
-    /// 
-    MathedRowSt * crow;
-    
-private:
-    ///
-    friend class MathedCursor;
+       /// 
+       MathedRowSt * crow;
+       
+       ///
+       friend class MathedCursor;
 };
 #endif