X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_charinset.h;h=76a1feab001a61fb5476971bf6ae88a0504ad211;hb=12ac7f339e14c4f76a24f45a21c0697303099145;hp=22664138f6ff1c6bd074e4d9944e2c61ea6e7379;hpb=c3a3e12319242b01426120983aea1d4d46b6b3e2;p=lyx.git

diff --git a/src/mathed/math_charinset.h b/src/mathed/math_charinset.h
index 22664138f6..76a1feab00 100644
--- a/src/mathed/math_charinset.h
+++ b/src/mathed/math_charinset.h
@@ -1,48 +1,55 @@
 // -*- C++ -*-
+/**
+ * \file math_charinset.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
 #ifndef MATH_CHARINSET_H
 #define MATH_CHARINSET_H
 
-#include "math_diminset.h"
-
-#ifdef __GNUG__
-#pragma interface
-#endif
+#include "math_inset.h"
 
-/** The base character inset.
-    \author André Pönitz
- */
 
-class MathCharInset : public MathDimInset {
+/// The base character inset.
+class MathCharInset : public MathInset {
 public:
 	///
 	explicit MathCharInset(char c);
 	///
-	MathInset * clone() const;
+	virtual std::auto_ptr<InsetBase> clone() const;
 	///
-	void metrics(MathMetricsInfo & st) const;
+	void metrics(MetricsInfo & mi, Dimension & dim) const;
 	///
-	void draw(MathPainterInfo &, int x, int y) const;
+	void draw(PainterInfo & pi, int x, int y) const;
 	///
-	void metricsT(TextMetricsInfo const & st) const;
+	void metricsT(TextMetricsInfo const & mi, Dimension & dim) const;
 	///
 	void drawT(TextPainter &, int x, int y) const;
+	///
+	int width() const { return width_; }
+
 	///
 	void write(WriteStream & os) const;
 	///
 	void normalize(NormalStream & ns) const;
 	///
-	void octavize(OctaveStream & os) const;
+	void octave(OctaveStream & os) const;
 	/// identifies Charinsets
 	MathCharInset const * asCharInset() const { return this; }
 	///
 	char getChar() const { return char_; }
 	///
 	bool isRelOp() const;
-	///
-	bool match(MathInset *) const;
 
 private:
 	/// the character
 	char char_;
+	/// cached width
+	mutable int width_;
 };
 #endif