Revert "Fix a number of signedness warnings"

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

diff --git a/src/mathed/InsetMath.h b/src/mathed/InsetMath.h
index 32f265950ca7b18dd0323145f72c05cc6f81fffe..3eae9295a46d95e3c4825cf9f882a631a4632d66 100644 (file)
--- a/src/mathed/InsetMath.h
+++ b/src/mathed/InsetMath.h
@@ -39,6 +39,17 @@ enum HullType {
 HullType hullType(docstring const & name);
 docstring hullName(HullType type);
 
+
+enum Limits {
+       // what is obtained with \c \\nolimits
+       NO_LIMITS = -1,
+       // the default
+       AUTO_LIMITS = 0,
+       // what is obtained with \c \\limits
+       LIMITS = 1
+};
+
+
 /**
 
 Abstract base class for all math objects.  A math insets is for use of the
@@ -53,7 +64,6 @@ inclusion in the "real LyX insets" FormulaInset and FormulaMacroInset.
 
 */
 
-class Cursor;
 class OutputParams;
 class MetricsInfo;
 
@@ -61,6 +71,7 @@ class InsetMathArray;
 class InsetMathAMSArray;
 class InsetMathBrace;
 class InsetMathChar;
+class InsetMathClass;
 class InsetMathDelim;
 class InsetMathFracBase;
 class InsetMathFrac;
@@ -102,18 +113,18 @@ typedef void const * uid_type;
 class InsetMath : public Inset {
 public:
        ///
-       InsetMath(Buffer * buf = 0) : Inset(buf) {}
+       explicit InsetMath(Buffer * buf = 0) : Inset(buf) {}
        /// identification as math inset
-       InsetMath * asInsetMath() { return this; }
+       InsetMath * asInsetMath() override { return this; }
        /// identification as math inset
-       InsetMath const * asInsetMath() const { return this; }
+       InsetMath const * asInsetMath() const override { return this; }
        /// this is overridden in math text insets (i.e. mbox)
-       bool inMathed() const { return true; }
+       bool inMathed() const override { return true; }
        ///
        virtual docstring name() const;
 
        /// this is overridden by specific insets
-       virtual mode_type currentMode() const { return MATH_MODE; }
+       mode_type currentMode() const override { return MATH_MODE; }
 
        // The possible marker types for math insets
        enum marker_type { NO_MARKER, MARKER2, MARKER, BOX_MARKER };
@@ -139,6 +150,7 @@ public:
        virtual InsetMathBrace          * asBraceInset()          { return nullptr; }
        virtual InsetMathBrace const    * asBraceInset() const    { return nullptr; }
        virtual InsetMathChar const     * asCharInset() const     { return nullptr; }
+       virtual InsetMathClass const    * asClassInset() const    { return nullptr; }
        virtual InsetMathDelim          * asDelimInset()          { return nullptr; }
        virtual InsetMathDelim const    * asDelimInset() const    { return nullptr; }
        virtual InsetMathFracBase       * asFracBaseInset()       { return nullptr; }
@@ -173,7 +185,7 @@ public:
        virtual InsetMathSpecialChar const * asSpecialCharInset() const { return nullptr; }
 
        /// The class of the math object (used primarily for spacing)
-       virtual MathClass mathClass() const;
+       virtual MathClass mathClass() const { return MC_ORD; }
        /// Add this inset to a math row. Return true if contents got added
        virtual bool addToMathRow(MathRow &, MetricsInfo & mi) const;
        /// Hook that is run before metrics computation starts
@@ -185,15 +197,22 @@ public:
        /// Hook that is run after drawing
        virtual void afterDraw(PainterInfo const &) const {}
 
-       /// identifies things that can get scripts
-       virtual bool isScriptable() const { return false; }
        /// will this get written as a single block in {..}
        virtual bool extraBraces() const { return false; }
 
        /// return the content as char if the inset is able to do so
        virtual char_type getChar() const { return 0; }
-       /// identifies things that can get \limits or \nolimits
-       virtual bool takesLimits() const { return false; }
+
+       /// Whether the inset allows \(no)limits
+       bool allowsLimitsChange() const { return mathClass() == MC_OP; }
+       /// The default limits value
+       virtual Limits defaultLimits() const { return NO_LIMITS; }
+       /// whether the inset has limit-like sub/superscript
+       virtual Limits limits() const { return AUTO_LIMITS; }
+       /// sets types of sub/superscripts
+       virtual void limits(Limits) {}
+       /// write limits status for LaTeX and LyX code
+       void writeLimits(WriteStream & os) const;
 
        /// replace things by other things
        virtual void replace(ReplaceData &) {}
@@ -228,10 +247,10 @@ public:
        virtual void octave(OctaveStream &) const;
 
        /// plain text output in ucs4 encoding
-       int plaintext(odocstringstream &, OutputParams const &, size_t) const;
+       int plaintext(odocstringstream &, OutputParams const &, size_t) const override;
 
        /// dump content to stderr for debugging
-       virtual void dump() const;
+       void dump() const override;
 
        /// LyXInset stuff
        virtual bool numberedType() const { return false; }
@@ -241,14 +260,14 @@ public:
        virtual void mutate(HullType /*newtype*/) {}
 
        /// math stuff usually isn't allowed in text mode
-       virtual bool allowedIn(mode_type mode) const { return mode == MATH_MODE; }
+       bool allowedIn(mode_type mode) const override { return mode == MATH_MODE; }
 
        /// Italic correction as described in InsetMathScript.h
        virtual int kerning(BufferView const *) const { return 0; }
        ///
-       bool isInToc() const { return true; }
+       bool isInToc() const override { return true; }
        ///
-       InsetCode lyxCode() const { return MATH_CODE; }
+       InsetCode lyxCode() const override { return MATH_CODE; }
        ///
        uid_type id() const { return this; }
 };