X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetlatexaccent.h;h=33446bd11a227e1b1b330ac48ceeb5a3e46ecf1e;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=4b49eec77fb15f19cda53ea141f820edd9542aa9;hpb=236ea81bc5c0ce7101c9460d1ee97b8f3c9be9df;p=lyx.git

diff --git a/src/insets/insetlatexaccent.h b/src/insets/insetlatexaccent.h
index 4b49eec77f..33446bd11a 100644
--- a/src/insets/insetlatexaccent.h
+++ b/src/insets/insetlatexaccent.h
@@ -13,8 +13,13 @@
 #define INSET_LATEX_ACCENT_H
 
 #include "inset.h"
-#include "support/std_string.h"
-#include "dimension.h"
+#include "support/types.h"
+
+
+namespace lyx {
+
+class Dimension;
+
 
 /** Insertion of accents
 
@@ -29,42 +34,41 @@ public:
 	///
 	InsetLatexAccent();
 	///
-	explicit
-	InsetLatexAccent(string const & string);
+	explicit InsetLatexAccent(std::string const & str);
 	///
-	void metrics(MetricsInfo &, Dimension &) const;
+	bool metrics(MetricsInfo &, Dimension &) const;
 	///
 	void draw(PainterInfo & pi, int x, int y) const;
 	///
-	int lbearing(LyXFont const & font) const;
-	///
-	int rbearing(LyXFont const & font) const;
-	///
 	bool displayISO8859_9(PainterInfo & pi, int x, int y) const;
 	///
 	void write(Buffer const &, std::ostream &) const;
 	///
 	void read(Buffer const &, LyXLex & lex);
 	///
-	int latex(Buffer const &, std::ostream &,
-		  LatexRunParams const &) const;
-	///
-	int ascii(Buffer const &, std::ostream &, int linelen) const;
+	int latex(Buffer const &, odocstream &,
+		  OutputParams const &) const;
 	///
-	int linuxdoc(Buffer const &, std::ostream &) const;
+	int plaintext(Buffer const &, odocstream &,
+		  OutputParams const &) const;
 	///
-	int docbook(Buffer const &, std::ostream &, bool mixcont) const;
+	int docbook(Buffer const &, odocstream &,
+		    OutputParams const &) const;
+	/// the string that is passed to the TOC
+	virtual int textString(Buffer const &, odocstream &,
+		OutputParams const &) const;
 	///
 	bool directWrite() const;
 	///
-	virtual std::auto_ptr<InsetBase> clone() const;
-	///
-	InsetOld::Code lyxCode()const;
+	InsetBase::Code lyxCode()const;
 	///
 	inline bool canDisplay();
 	// should this inset be handled like a normal charater
 	bool isChar() const { return true; }
 
+	/// is this equivalent to a letter?
+	virtual bool isLetter() const { return candisp; }
+
 	/// all the accent types
 	enum ACCENT_TYPES{
 		///
@@ -112,10 +116,15 @@ public:
 	};
 private:
 	friend std::ostream & operator<<(std::ostream &, ACCENT_TYPES);
+
+	virtual std::auto_ptr<InsetBase> doClone() const;
+
 	/// Check if we know the modifier and can display it ok on screen.
 	void checkContents();
 	///
-	string contents;
+	void drawAccent(PainterInfo const & pi, int x, int y, char_type accent) const;
+	///
+	std::string contents;
 	/// can display as proper char
 	bool  candisp;
 	/// modifier type
@@ -137,4 +146,7 @@ bool InsetLatexAccent::canDisplay()
 	return candisp;
 }
 
+
+} // namespace lyx
+
 #endif