X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetlatexaccent.h;h=4d4713b39acbb944d24f1bcb46086dc9316495da;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=3a80b51f5eb4795cd58a046f293f093aefd53d04;hpb=85798535a19919e82cc94a177a8414c542a9c5bf;p=lyx.git

diff --git a/src/insets/insetlatexaccent.h b/src/insets/insetlatexaccent.h
index 3a80b51f5e..4d4713b39a 100644
--- a/src/insets/insetlatexaccent.h
+++ b/src/insets/insetlatexaccent.h
@@ -15,12 +15,10 @@
 #pragma interface
 #endif
 
-#include "lyxinset.h"
+#include "inset.h"
 #include "LString.h"
 #include "lyxlex.h"
 
-using std::ostream;
-
 /** Insertion of accents
   
   Proper handling of accented characters.
@@ -32,44 +30,51 @@ using std::ostream;
 class InsetLatexAccent : public Inset {
 public:
 	///
-	InsetLatexAccent(); 
+	InsetLatexAccent();
 	///
+	explicit
 	InsetLatexAccent(string const & string);
 	///
-	int ascent(Painter &, LyXFont const &) const;
+	int ascent(BufferView *, LyXFont const &) const;
 	///
-	int descent(Painter &, LyXFont const &) const;
+	int descent(BufferView *, LyXFont const &) const;
 	///
-	int width(Painter &, LyXFont const &) const;
+	int width(BufferView *, LyXFont const &) const;
 	///
-	void draw(Painter &, LyXFont const &, int baseline, float & x) const;
+	void draw(BufferView *, LyXFont const &, int, float &, bool) const;
 	///
-	int Lbearing(LyXFont const & font) const;
+	int lbearing(LyXFont const & font) const;
 	///
-	int Rbearing(LyXFont const & font) const;
+	int rbearing(LyXFont const & font) const;
 	///
-	bool DisplayISO8859_9(Painter &, LyXFont const & font,
+	bool displayISO8859_9(BufferView *, LyXFont const & font,
 			      int baseline, float & x) const;
 	///
-	void Write(ostream &) const;
+	void write(Buffer const *, std::ostream &) const;
+	///
+	void read(Buffer const *, LyXLex & lex);
 	///
-	void Read(LyXLex & lex);
+	int latex(Buffer const *, std::ostream &,
+		  bool fragile, bool free_spc) const;
 	///
-	int Latex(ostream &, signed char fragile, bool free_spc) const;
+	int ascii(Buffer const *, std::ostream &, int linelen) const;
 	///
-	int Linuxdoc(ostream &) const;
+	int linuxdoc(Buffer const *, std::ostream &) const;
 	///
-	int DocBook(ostream &) const;
+	int docbook(Buffer const *, std::ostream &) const;
 	///
-	bool Deletable() const;
+	bool deletable() const;
 	///
-	bool DirectWrite() const;
+	bool directWrite() const;
 	///
-	Inset * Clone() const;
+	virtual Inset * clone(Buffer const &, bool same_id = false) const;
 	///
-	Inset::Code LyxCode()const;
+	Inset::Code lyxCode()const;
 	///
-	inline bool CanDisplay();
+	inline bool canDisplay();
+	// should this inset be handled like a normal charater
+	bool isChar() const { return true; }
+	
 	/// all the accent types
 	enum ACCENT_TYPES{
 		///
@@ -116,7 +121,7 @@ public:
  		LSLASH
 	};
 private:
-	friend ostream & operator<<(ostream &, ACCENT_TYPES);
+	friend std::ostream & operator<<(std::ostream &, ACCENT_TYPES);
 	/// Check if we know the modifier and can display it ok on screen.
 	void checkContents();
 	///
@@ -136,7 +141,8 @@ private:
 	mutable char  ic;    
 };
 
-bool InsetLatexAccent::CanDisplay()
+
+bool InsetLatexAccent::canDisplay()
 {
 	return candisp;
 }