split inset -> inset + updatableinset

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

diff --git a/src/mathed/math_scriptinset.h b/src/mathed/math_scriptinset.h
index baf9099f7fdae856d766955977f0eff0ab72f7e3..fa5dc7653fc92d2a3d7ea3132cc63375e99559c0 100644 (file)
--- a/src/mathed/math_scriptinset.h
+++ b/src/mathed/math_scriptinset.h
@@ -4,9 +4,6 @@
 
 #include "math_nestinset.h"
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
 /** Inset for super- and subscripts
  *  \author André Pönitz
@@ -38,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
@@ -56,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;
@@ -89,10 +86,12 @@ public:
        void removeScript(bool up);
        /// 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
-       result_type dispatch(FuncRequest const & cmd, idx_type & idx, pos_type & pos);
+       dispatch_result dispatch(FuncRequest const & cmd, idx_type & idx, pos_type & pos);
 
 private:
        /// returns x offset for main part