Compile fix gcc 2.95 + stlport

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

diff --git a/src/mathed/math_scriptinset.h b/src/mathed/math_scriptinset.h
index fad32bf22e243e971873a71665e3e28dd4bed5f2..2f9dd58b408cc92fa55e8eb99d893896ad89c625 100644 (file)
--- a/src/mathed/math_scriptinset.h
+++ b/src/mathed/math_scriptinset.h
@@ -1,16 +1,21 @@
 // -*- C++ -*-
+/**
+ * \file math_scriptinset.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
 #ifndef MATH_SCRIPTINSET_H
 #define MATH_SCRIPTINSET_H
 
 #include "math_nestinset.h"
 
 
-/** Inset for super- and subscripts
- *  \author André Pönitz
- *
- * Full author contact details are available in file CREDITS
- */
-
+/// An inset for super- and subscripts.
 class MathScriptInset : public MathNestInset {
 public:
        /// create inset without scripts
@@ -20,40 +25,41 @@ public:
        /// create inset with single script and given nucleus
        MathScriptInset(MathAtom const & at, bool up);
        ///
-       MathInset * clone() const;
+       std::auto_ptr<InsetBase> clone() const;
        ///
-       void metrics(MathMetricsInfo & mi) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
-       void draw(MathPainterInfo & pi, int x, int y) const;
+       void draw(PainterInfo & pi, int x, int y) const;
        ///
-       void metricsT(TextMetricsInfo const & mi) const;
+       void metricsT(TextMetricsInfo const & mi, Dimension & dim) const;
        ///
        void drawT(TextPainter & pi, int x, int y) const;
 
+       /// move cursor left
+       bool idxLeft(LCursor & cur) const;
+       /// move cursor right
+       bool idxRight(LCursor & cur) const;
+       /// move cursor up or down
+       bool idxUpDown(LCursor & cur, bool up) const;
+       /// Target pos when we enter the inset from the left by pressing "Right"
+       bool idxFirst(LCursor & cur) const;
+       /// Target pos when we enter the inset from the right by pressing "Left"
+       bool idxLast(LCursor & cur) const;
+       /// can we enter this cell?
+       bool validCell(idx_type i) const { return i == 2 || script_[i]; }
+
        /// write LaTeX and Lyx code
        void write(WriteStream & os) const;
        /// 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;
-       /// move cursor left
-       bool idxLeft(idx_type &, pos_type &) const;
-       /// move cursor right
-       bool idxRight(idx_type &, pos_type &) const;
-       /// move cursor up or down
-       bool idxUpDown(idx_type & idx, pos_type & pos, bool up, int targetx) const;
-       /// Target pos when we enter the inset from the left by pressing "Right"
-       bool idxFirst(idx_type & idx, pos_type & pos) const;
-       /// 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 i == 2 || script_[i]; }
+       void octave(OctaveStream &) const;
 
        /// identifies scriptinsets
        MathScriptInset const * asScriptInset() const;
@@ -90,9 +96,9 @@ public:
        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);
-
+protected:
+       ///
+       DispatchResult priv_dispatch(LCursor & cur, FuncRequest const & cmd);
 private:
        /// returns x offset for main part
        int dxx() const;