X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMath.h;h=088fce6c2be97a281bf32112be25ebf8fbf1cffb;hb=8cd80803220e02f7a9148f11b99f4f3aeb0d3f38;hp=e043a733fbc95a4a7e013339ac7129dd3453b4eb;hpb=d546a9b286b53636ec0c34262942831670d2d167;p=lyx.git

diff --git a/src/mathed/InsetMath.h b/src/mathed/InsetMath.h
index e043a733fb..088fce6c2b 100644
--- a/src/mathed/InsetMath.h
+++ b/src/mathed/InsetMath.h
@@ -17,6 +17,8 @@
 
 #include "insets/Inset.h"
 
+#include "TexRow.h"
+
 
 namespace lyx {
 
@@ -32,7 +34,8 @@ enum HullType {
 	hullFlAlign,
 	hullMultline,
 	hullGather,
-	hullRegexp
+	hullRegexp,
+	hullUnknown
 };
 
 HullType hullType(docstring const & name);
@@ -44,8 +47,8 @@ Abstract base class for all math objects.  A math insets is for use of the
 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
+Math insets do not know their parents, a cursor position or things
+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.
@@ -58,6 +61,7 @@ class InsetMathAMSArray;
 class InsetMathBrace;
 class InsetMathChar;
 class InsetMathDelim;
+class InsetMathFracBase;
 class InsetMathFrac;
 class InsetMathFont;
 class InsetMathGrid;
@@ -81,11 +85,9 @@ class MaximaStream;
 class MathematicaStream;
 class MathStream;
 class WriteStream;
-class InfoStream;
 
 class MathMacroTemplate;
 class MathMacro;
-class MathPosFinder;
 class Cursor;
 class TextPainter;
 class TextMetricsInfo;
@@ -102,6 +104,8 @@ public:
 	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; }
@@ -127,6 +131,8 @@ public:
 	virtual InsetMathChar const     * asCharInset() const     { return 0; }
 	virtual InsetMathDelim          * asDelimInset()          { return 0; }
 	virtual InsetMathDelim const    * asDelimInset() const    { return 0; }
+	virtual InsetMathFracBase       * asFracBaseInset()       { return 0; }
+	virtual InsetMathFracBase const * asFracBaseInset() const { return 0; }
 	virtual InsetMathFrac           * asFracInset()           { return 0; }
 	virtual InsetMathFrac const     * asFracInset() const     { return 0; }
 	virtual InsetMathFont           * asFontInset()           { return 0; }
@@ -156,8 +162,12 @@ public:
 
 	/// identifies things that can get scripts
 	virtual bool isScriptable() const { return false; }
-	/// is the a relational operator (used for splitting equations)
-	virtual bool isRelOp() const { return false; }
+	/// identifies a binary operators (used for spacing)
+	virtual bool isMathBin() const { return false; }
+	/// identifies relational operators (used for spacing and splitting equations)
+	virtual bool isMathRel() const { return false; }
+	/// identifies punctuation (used for spacing)
+	virtual bool isMathPunct() const { return false; }
 	/// will this get written as a single block in {..}
 	virtual bool extraBraces() const { return false; }
 
@@ -166,8 +176,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,7 +185,10 @@ public:
 	/// access to the lock (only nest array have one)
 	virtual void lock(bool) {}
 
-	/// write LaTeX and Lyx code
+	// Indicate that we do not want to hide the normal version of
+	// write(). This is to shut off a clang warning.
+	using Inset::write;
+	/// write LaTeX and LyX code
 	virtual void write(WriteStream & os) const;
 	/// write normalized content
 	virtual void normalize(NormalStream &) const;
@@ -198,7 +209,7 @@ public:
 	virtual void octave(OctaveStream &) const;
 
 	/// plain text output in ucs4 encoding
-	int plaintext(odocstream &, OutputParams const &) const;
+	int plaintext(odocstringstream &, OutputParams const &, size_t) const;
 
 	/// dump content to stderr for debugging
 	virtual void dump() const;
@@ -216,7 +227,11 @@ public:
 	/// superscript kerning
 	virtual int kerning(BufferView const *) const { return 0; }
 	///
+	bool isInToc() const { return true; }
+	///
 	InsetCode lyxCode() const { return MATH_CODE; }
+	///
+	uid_type id() const { return this; }
 };
 
 ///