X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMath.h;h=24884ba541ebf0c827ce0524d848aff10a59ee56;hb=38b9a4530e8eb870e60cf8a15c208010fb292054;hp=508f9af95d8d7c4c111464e20bbe60d32751ab80;hpb=71e8668375ae367b07dfe1000e7f0410ef1013db;p=lyx.git

diff --git a/src/mathed/InsetMath.h b/src/mathed/InsetMath.h
index 508f9af95d..24884ba541 100644
--- 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);
@@ -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 RefInset;
+class InsetMathRef;
 
+class HtmlStream;
 class NormalStream;
 class OctaveStream;
 class MapleStream;
@@ -84,18 +86,27 @@ class InfoStream;
 class MathMacroTemplate;
 class MathMacro;
 class MathPosFinder;
-class LCursor;
+class Cursor;
 class TextPainter;
 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
@@ -104,9 +115,9 @@ public:
 	virtual void drawT(TextPainter &, int x, int y) const;
 
 	/// return cell given its number
-	virtual MathArray & cell(idx_type);
+	virtual MathData & cell(idx_type);
 	/// return cell given its number
-	virtual MathArray const & cell(idx_type) const;
+	virtual MathData const & cell(idx_type) const;
 
 	/// identifies certain types of insets
 	virtual InsetMathAMSArray       * asAMSArrayInset()       { return 0; }
@@ -133,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,7 +153,8 @@ public:
 	virtual InsetMathSymbol const   * asSymbolInset() const   { return 0; }
 	virtual InsetMathUnknown        * asUnknownInset()        { return 0; }
 	virtual InsetMathUnknown const  * asUnknownInset() const  { return 0; }
-	virtual RefInset                * asRefInset()            { 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; }
@@ -162,7 +173,7 @@ public:
 	/// replace things by other things
 	virtual void replace(ReplaceData &) {}
 	/// do we contain a given subsequence?
-	virtual bool contains(MathArray const &) const { return false; }
+	virtual bool contains(MathData const &) const { return false; }
 	/// access to the lock (only nest array have one)
 	virtual bool lock() const { return false; }
 	/// access to the lock (only nest array have one)
@@ -178,14 +189,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(odocstream &, OutputParams const &) const;
 
 	/// dump content to stderr for debugging
 	virtual void dump() const;
@@ -196,14 +211,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; }
 };
 
 ///