X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathSymbol.h;h=6ca3ded7d1bbd0df864326e00305184a0c823caf;hb=8cd80803220e02f7a9148f11b99f4f3aeb0d3f38;hp=9a1e9ac8974168e081c2c43daaafcae584fc7f85;hpb=00e305c9d9bd8b0ff54b6c58adb6192d5934ed60;p=lyx.git

diff --git a/src/mathed/InsetMathSymbol.h b/src/mathed/InsetMathSymbol.h
index 9a1e9ac897..6ca3ded7d1 100644
--- a/src/mathed/InsetMathSymbol.h
+++ b/src/mathed/InsetMathSymbol.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -14,8 +14,6 @@
 
 #include "InsetMath.h"
 
-#include "LyXFont.h"
-
 namespace lyx {
 
 class latexkeys;
@@ -33,14 +31,20 @@ public:
 	///
 	explicit InsetMathSymbol(docstring const & name);
 	///
-	bool metrics(MetricsInfo & mi, Dimension & dim) const;
+	void metrics(MetricsInfo & mi, Dimension & dim) const;
 	///
 	void draw(PainterInfo &, int x, int y) const;
 	///
-	int kerning() const { return kerning_; }
+	int kerning(BufferView const *) const { return kerning_; }
 
 	///
-	bool isRelOp() const;
+	mode_type currentMode() const;
+	///
+	bool isMathRel() const;
+	///
+	bool isMathBin() const;
+	///
+	bool isMathPunct() const;
 	///
 	bool isOrdAlpha() const;
 	/// do we take scripts?
@@ -65,14 +69,21 @@ public:
 	///
 	void mathmlize(MathStream &) const;
 	///
+	void htmlize(HtmlStream &) const;
+	/// \param spacing controls whether we print spaces around
+	/// "operator"-type symbols or just print them raw
+	void htmlize(HtmlStream &, bool spacing) const;
+	///
 	void octave(OctaveStream &) const;
 	///
 	void write(WriteStream & os) const;
 	///
 	void infoize2(odocstream & os) const;
+	///
+	InsetCode lyxCode() const { return MATH_SYMBOL_CODE; }
 
 private:
-	virtual std::auto_ptr<InsetBase> doClone() const;
+	virtual Inset * clone() const;
 	///
 	latexkeys const * sym_;
 	///
@@ -81,8 +92,6 @@ private:
 	mutable int kerning_;
 	///
 	mutable bool scriptable_;
-	///
-	mutable LyXFont font_cache_;
 };
 
 } // namespace lyx