small up/down tweaking

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

diff --git a/src/mathed/math_nestinset.h b/src/mathed/math_nestinset.h
index 5ec120e7a42396d9c82be6a6ece499a05ccded52..5c39425e82dcad15d1519fe9d8c24a71ba79d637 100644 (file)
--- a/src/mathed/math_nestinset.h
+++ b/src/mathed/math_nestinset.h
@@ -9,7 +9,7 @@
 
 /** Abstract base class for all math objects that contain nested items.
     This is basically everything that is not a single character or a
-    single symbol
+    single symbol.
 */
 
 
@@ -21,11 +21,27 @@ public:
        explicit MathNestInset(idx_type ncells);
 
        /// the size is usuall some sort of convex hull of the cells
-       void metrics(MathMetricsInfo const & st) const;
+       void metrics(MathMetricsInfo const & mi) const;
+       /// add space for markers
+       void metricsMarkers(int frame = 1) const;
+       /// add space for markers
+       void metricsMarkers2(int frame = 1) const;
+       /// draw background if locked
+       void draw(MathPainterInfo & pi, int x, int y) const;
+       /// draw selection background
+       void drawSelection(MathPainterInfo & pi,
+               idx_type idx1, pos_type pos1, idx_type idx2, pos_type pos2) const;
+       void drawMarkers(MathPainterInfo & pi, int x, int y) const;
+       /// draw four angular markers
+       void drawMarkers2(MathPainterInfo & pi, int x, int y) const;
        /// appends itself with macro arguments substituted
        void substitute(MathMacro const & macro);
        /// identifies NestInsets
        MathNestInset * asNestInset() { return this; }
+       /// identifies NestInsets
+       MathNestInset const * asNestInset() const { return this; }
+       /// get cursor position
+       void getPos(idx_type idx, pos_type pos, int & x, int & y) const;
 
        /// order of movement through the cells when pressing the left key
        bool idxLeft(idx_type & idx, pos_type & pos) const;
@@ -53,15 +69,13 @@ public:
        bool lock() const;
        /// access to the lock
        void lock(bool);
+       /// get notification when the cursor leaves this inset
+       void notifyCursorLeaves(idx_type);
 
        /// direct access to the cell
        MathArray & cell(idx_type);
        /// direct access to the cell
        MathArray const & cell(idx_type) const;
-       /// direct access to the cell including the drawing cache
-       MathXArray & xcell(idx_type);
-       /// direct access to the cell including the drawing cache
-       MathXArray const & xcell(idx_type) const;
 
        /// can we move into this cell (see macroarg.h)
        bool isActive() const;
@@ -69,23 +83,33 @@ public:
        void validate(LaTeXFeatures & features) const;
 
        /// match in all cells
-       bool match(MathInset *) const;
+       bool match(MathAtom const &) const;
        /// replace in all cells
        void replace(ReplaceData &);
        /// do we contain a given pattern?
-       bool contains(MathArray const &);
+       bool contains(MathArray const &) const;
+       /// glue everything to a single cell
+       MathArray glue() const;
 
        /// debug helper
        void dump() const;
-       ///
+       /// is the cursor currently somewhere within this inset?
        virtual bool editing() const;
 
+       /// writes \\, name(), and args in braces and '\\lyxlock' if necessary
+       void write(WriteStream & os) const;
+       /// writes [, name(), and args in []
+       void normalize(NormalStream & os) const;
+
+       /// local dispatcher
+       result_type dispatch(FuncRequest const & cmd, idx_type & idx, pos_type & pos);
+
 protected:
        /// we store the cells in a vector
-       typedef std::vector<MathXArray> cells_type;
+       typedef std::vector<MathArray> cells_type;
        /// thusly:
        cells_type cells_;
-       /// if the inset is locked, it can't be enter with the cursor
+       /// if the inset is locked, it can't be entered with the cursor
        bool lock_;
 };