X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMath.h;h=c872316abfbf5bc38613f991d9c0a562b8f9699b;hb=d9082639080b9de993742bd352f92e5183058cf5;hp=067bf6e876a2d0b7e46ee7f596fc37a89e44341a;hpb=7441172d4d9a26eb4824bb8bee003f457ef34f1c;p=lyx.git

diff --git a/src/mathed/InsetMath.h b/src/mathed/InsetMath.h
index 067bf6e876..c872316abf 100644
--- a/src/mathed/InsetMath.h
+++ b/src/mathed/InsetMath.h
@@ -50,6 +50,15 @@ enum Limits {
 };
 
 
+/// The possible marker types for math insets
+enum class marker_type : int {
+	NO_MARKER,
+	MARKER2,
+	MARKER,
+	BOX_MARKER
+};
+
+
 /**
 
 Abstract base class for all math objects.  A math insets is for use of the
@@ -64,7 +73,6 @@ inclusion in the "real LyX insets" FormulaInset and FormulaMacroInset.
 
 */
 
-class Cursor;
 class OutputParams;
 class MetricsInfo;
 
@@ -96,8 +104,8 @@ class OctaveStream;
 class MapleStream;
 class MaximaStream;
 class MathematicaStream;
-class MathStream;
-class WriteStream;
+class MathMLStream;
+class TeXMathStream;
 
 class MathData;
 class InsetMathMacroTemplate;
@@ -107,28 +115,23 @@ class TextPainter;
 class TextMetricsInfo;
 class ReplaceData;
 
-/// Type of unique identifiers for math insets (used in TexRow)
-typedef void const * uid_type;
-
 
 class InsetMath : public Inset {
 public:
 	///
 	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 };
 	/// this is overridden by insets with specific edit marker type
 	virtual marker_type marker(BufferView const *) const;
 
@@ -206,14 +209,14 @@ public:
 
 	/// Whether the inset allows \(no)limits
 	bool allowsLimitsChange() const { return mathClass() == MC_OP; }
-	/// The default limits value
-	virtual Limits defaultLimits() const { return NO_LIMITS; }
+	/// The default limits value depending on whether display mode is on
+	virtual Limits defaultLimits(bool /* display */) 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;
+	void writeLimits(TeXMathStream & os) const;
 
 	/// replace things by other things
 	virtual void replace(ReplaceData &) {}
@@ -228,7 +231,7 @@ public:
 	// write(). This is to shut off a clang warning.
 	using Inset::write;
 	/// write LaTeX and LyX code
-	virtual void write(WriteStream & os) const;
+	virtual void write(TeXMathStream & os) const;
 	/// write normalized content
 	virtual void normalize(NormalStream &) const;
 	/// write content as something readable by Maple
@@ -238,7 +241,7 @@ public:
 	/// write content as something readable by Mathematica
 	virtual void mathematica(MathematicaStream &) const;
 	/// write content as MathML
-	virtual void mathmlize(MathStream &) const;
+	virtual void mathmlize(MathMLStream &) 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,
@@ -248,10 +251,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; }
@@ -261,14 +264,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; }
 };