Fix unwanted curly braces in formula (bug #8679)

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

diff --git a/src/mathed/InsetMath.h b/src/mathed/InsetMath.h
index 8bc070ee32af9061254d9c37fc1610a3d4d4352d..5e5f492dc925a260e0989940b142eff92c122628 100644 (file)
--- a/src/mathed/InsetMath.h
+++ b/src/mathed/InsetMath.h
@@ -5,7 +5,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Alejandro Aguilar Sierra
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -15,7 +15,7 @@
 
 #include "MathData.h"
 
-#include "insets/InsetBase.h"
+#include "insets/Inset.h"
 
 
 namespace lyx {
@@ -31,7 +31,8 @@ enum HullType {
        hullXXAlignAt,
        hullFlAlign,
        hullMultline,
-       hullGather
+       hullGather,
+       hullRegexp
 };
 
 HullType hullType(docstring const & name);
@@ -44,7 +45,7 @@ math editor only, it isn't a general LyX inset. It's used to represent all
 the math objects.
 
 Math insets do not know there parents, a cursor position or things
-like that. The are dumb object that are contained in other math insets
+like that. They are dumb objects that are contained in other math insets
 (InsetMathNests, in fact) thus forming a tree. The root of this tree is
 always a InsetMathHull, which provides an interface to the Outer World by
 inclusion in the "real LyX insets" FormulaInset and FormulaMacroInset.
@@ -63,15 +64,16 @@ class InsetMathGrid;
 class InsetMathHull;
 class InsetMathMatrix;
 class InsetMathNest;
-class InsetMathParbox;
 class InsetMathScript;
 class InsetMathString;
 class InsetMathSpace;
+class InsetMathSpecialChar;
 class InsetMathSymbol;
 class InsetMathUnknown;
 
 class InsetMathRef;
 
+class HtmlStream;
 class NormalStream;
 class OctaveStream;
 class MapleStream;
@@ -90,12 +92,21 @@ class TextMetricsInfo;
 class ReplaceData;
 
 
-class InsetMath : public InsetBase {
+class InsetMath : public Inset {
 public:
+       ///
+       InsetMath(Buffer * buf = 0) : Inset(buf) {}
        /// identification as math inset
        InsetMath * asInsetMath() { return this; }
+       /// identification as math inset
+       InsetMath const * asInsetMath() const { return this; }
        /// this is overridden in math text insets (i.e. mbox)
        bool inMathed() const { return true; }
+       ///
+       virtual docstring name() const;
+
+       /// this is overridden by specific insets
+       virtual mode_type currentMode() const { return MATH_MODE; }
 
        /// the ascent of the inset above the baseline
        /// compute the size of the object for text based drawing
@@ -113,6 +124,7 @@ public:
        virtual InsetMathAMSArray const * asAMSArrayInset() const { return 0; }
        virtual InsetMathArray          * asArrayInset()          { return 0; }
        virtual InsetMathArray const    * asArrayInset() const    { return 0; }
+       virtual InsetMathBrace          * asBraceInset()          { return 0; }
        virtual InsetMathBrace const    * asBraceInset() const    { return 0; }
        virtual InsetMathChar const     * asCharInset() const     { return 0; }
        virtual InsetMathDelim          * asDelimInset()          { return 0; }
@@ -132,7 +144,6 @@ public:
        virtual InsetMathMatrix const   * asMatrixInset() const   { return 0; }
        virtual InsetMathNest           * asNestInset()           { return 0; }
        virtual InsetMathNest const     * asNestInset() const     { return 0; }
-       virtual InsetMathParbox         * asParboxInset()         { return 0; }
        virtual InsetMathScript         * asScriptInset()         { return 0; }
        virtual InsetMathScript const   * asScriptInset() const   { return 0; }
        virtual InsetMathSpace          * asSpaceInset()          { return 0; }
@@ -143,6 +154,7 @@ public:
        virtual InsetMathUnknown        * asUnknownInset()        { return 0; }
        virtual InsetMathUnknown const  * asUnknownInset() const  { return 0; }
        virtual InsetMathRef            * asRefInset()            { return 0; }
+       virtual InsetMathSpecialChar const * asSpecialCharInset() const { return 0; }
 
        /// identifies things that can get scripts
        virtual bool isScriptable() const { return false; }
@@ -156,8 +168,6 @@ public:
        /// identifies things that can get \limits or \nolimits
        virtual bool takesLimits() const { return false; }
 
-       /// char char code if possible
-       virtual void handleFont(docstring const &) {}
        /// replace things by other things
        virtual void replace(ReplaceData &) {}
        /// do we contain a given subsequence?
@@ -177,14 +187,18 @@ public:
        virtual void maxima(MaximaStream &) const;
        /// write content as something readable by Mathematica
        virtual void mathematica(MathematicaStream &) const;
-       /// write content as something resembling MathML
+       /// write content as MathML
        virtual void mathmlize(MathStream &) const;
+       /// write content as HTML, best we can.
+       /// the idea for this, and some of the details, come from
+       /// eLyXer, written by Alex Fernandez. no code is borrowed. rather,
+       /// we try to mimic how eLyXer outputs some math.
+       virtual void htmlize(HtmlStream &) const;
        /// write content as something readable by Octave
        virtual void octave(OctaveStream &) const;
 
        /// plain text output in ucs4 encoding
-       int plaintext(Buffer const &, odocstream &,
-                     OutputParams const &) const;
+       int plaintext(odocstringstream &, OutputParams const &, size_t) const;
 
        /// dump content to stderr for debugging
        virtual void dump() const;
@@ -195,14 +209,16 @@ public:
        virtual HullType getType() const;
        /// change type
        virtual void mutate(HullType /*newtype*/) {}
-       /// usually the latex name
-       virtual docstring name() const;
 
        /// math stuff usually isn't allowed in text mode
        virtual bool allowedIn(mode_type mode) const { return mode == MATH_MODE; }
 
        /// superscript kerning
-       virtual int kerning() const { return 0; }
+       virtual int kerning(BufferView const *) const { return 0; }
+       ///
+       bool isInToc() const { return true; }
+       ///
+       InsetCode lyxCode() const { return MATH_CODE; }
 };
 
 ///