Jean-Marc's fix for wrong descent

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

diff --git a/src/mathed/math_scriptinset.h b/src/mathed/math_scriptinset.h
index c0964b107d0a93e4b37a297e47ab71c0f3597089..fa5dc7653fc92d2a3d7ea3132cc63375e99559c0 100644 (file)
--- a/src/mathed/math_scriptinset.h
+++ b/src/mathed/math_scriptinset.h
@@ -4,12 +4,11 @@
 
 #include "math_nestinset.h"
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
 /** Inset for super- and subscripts
-    \author André Pönitz
+ *  \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS
  */
 
 class MathScriptInset : public MathNestInset {
@@ -36,13 +35,13 @@ public:
        /// write normalized content
        void normalize(NormalStream &) const;
        /// write content as something readable by Maple
-       void maplize(MapleStream &) const;
+       void maple(MapleStream &) const;
        /// write content as something readable by Mathematica
-       void mathematicize(MathematicaStream &) const;
+       void mathematica(MathematicaStream &) const;
        /// write content as something resembling MathML
        void mathmlize(MathMLStream &) const;
        /// write content as something readable by Octave
-       void octavize(OctaveStream &) const;
+       void octave(OctaveStream &) const;
        /// move cursor left
        bool idxLeft(idx_type &, pos_type &) const;
        /// move cursor right
@@ -54,7 +53,7 @@ public:
        /// Target pos when we enter the inset from the right by pressing "Left"
        bool idxLast(idx_type & idx, pos_type & pos) const;
        /// can we enter this cell?
-       bool validCell(idx_type i) const { return script_[i]; }
+       bool validCell(idx_type i) const { return i == 2 || script_[i]; }
 
        /// identifies scriptinsets
        MathScriptInset const * asScriptInset() const;
@@ -66,33 +65,33 @@ public:
        /// get limits
        int limits() const { return limits_; }
        /// returns subscript
-       MathXArray const & down() const;
+       MathArray const & down() const;
        /// returns subscript
-       MathXArray & down();
+       MathArray & down();
        /// returns superscript
-       MathXArray const & up() const;
+       MathArray const & up() const;
        /// returns superscript
-       MathXArray & up();
+       MathArray & up();
        /// returns nucleus
-       MathXArray const & nuc() const;
+       MathArray const & nuc() const;
        /// returns nucleus
-       MathXArray & nuc();
+       MathArray & nuc();
        /// do we have a superscript?
        bool hasUp() const;
        /// do we have a subscript?
        bool hasDown() const;
        /// do we have a script?
        bool has(bool up) const;
-       /// do we have a anything?
-       bool empty() const;
        /// remove script
        void removeScript(bool up);
-       /// remove script
-       void removeEmptyScripts();
        /// make sure a script is accessible
        void ensure(bool up);
-       ///
+       /// say that we have scripts
        void infoize(std::ostream & os) const;
+       /// say whether we have displayed limits
+       void infoize2(std::ostream & os) const;
+       /// local dispatcher
+       dispatch_result dispatch(FuncRequest const & cmd, idx_type & idx, pos_type & pos);
 
 private:
        /// returns x offset for main part
@@ -113,13 +112,13 @@ private:
        int ndes() const;
        /// where do we have to draw the scripts?
        bool hasLimits() const;
+       /// clean up empty cells
+       void notifyCursorLeaves(idx_type idx);
 
        /// possible subscript (index 0) and superscript (index 1)
        bool script_[2];
        /// 1 - "limits", -1 - "nolimits", 0 - "default"
        int limits_;
-       /// cached font
-       mutable LyXFont font_;
 };
 
 #endif