X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetlatexaccent.h;h=018eb86d181c03fab67a187bae5cf2d2a09f0882;hb=3c8aba3b556871fb1100a2f98cd93d5d4e3f70c9;hp=47aa293175ab48c0d5d94ab2b3a7371f5b7505b9;hpb=b3bc8c1e7121e5f0926764b2df988f1239f66523;p=lyx.git

diff --git a/src/insets/insetlatexaccent.h b/src/insets/insetlatexaccent.h
index 47aa293175..018eb86d18 100644
--- a/src/insets/insetlatexaccent.h
+++ b/src/insets/insetlatexaccent.h
@@ -4,7 +4,7 @@
  *
  *           LyX, The Document Processor
  * 	 
- *	    Copyright (C) 1995 Matthias Ettrich
+ *	    Copyright 1995 Matthias Ettrich
  *
  * ====================================================== */
 
@@ -32,36 +32,35 @@ public:
 	///
 	InsetLatexAccent(); 
 	///
+	explicit
 	InsetLatexAccent(string const & string);
 	///
-	InsetLatexAccent(InsetLatexAccent const &);
+	int ascent(Painter &, LyXFont const &) const;
 	///
-	int Ascent(LyXFont const & font) const;
+	int descent(Painter &, LyXFont const &) const;
 	///
-	int Descent(LyXFont const & font) const;
+	int width(Painter &, LyXFont const &) const;
 	///
-	int Width(LyXFont const & font) const;
+	void draw(Painter &, LyXFont const &, int baseline, float & x) const;
 	///
 	int Lbearing(LyXFont const & font) const;
 	///
 	int Rbearing(LyXFont const & font) const;
 	///
-	bool DisplayISO8859_9(LyXFont font, LyXScreen & scr,
-			      int baseline, float & x);
+	bool DisplayISO8859_9(Painter &, LyXFont const & font,
+			      int baseline, float & x) const;
 	///
-	void Draw(LyXFont font, LyXScreen & scr, int baseline, float & x);
-	///
-	void Write(ostream &);
+	void Write(std::ostream &) const;
 	///
 	void Read(LyXLex & lex);
 	///
-	int Latex(ostream &, signed char fragile);
+	int Latex(std::ostream &, bool fragile, bool free_spc) const;
 	///
-	int Latex(string & file, signed char fragile);
+	int Ascii(std::ostream &) const;
 	///
-	int Linuxdoc(string & file);
+	int Linuxdoc(std::ostream &) const;
 	///
-	int DocBook(string & file);
+	int DocBook(std::ostream &) const;
 	///
 	bool Deletable() const;
 	///
@@ -72,7 +71,6 @@ public:
 	Inset::Code LyxCode()const;
 	///
 	inline bool CanDisplay();
-private:
 	/// all the accent types
 	enum ACCENT_TYPES{
 		///
@@ -118,8 +116,8 @@ private:
 		///
  		LSLASH
 	};
-
-	friend ostream & operator<<(ostream &, ACCENT_TYPES);
+private:
+	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 +134,7 @@ private:
 	/// add something to descent - underlined char
 	bool  plusdesc;
 	/// international char
-	char  ic;    
+	mutable char  ic;    
 };
 
 bool InsetLatexAccent::CanDisplay()