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

diff --git a/src/insets/insetlatexaccent.h b/src/insets/insetlatexaccent.h
index acf1afbfd6..018eb86d18 100644
--- a/src/insets/insetlatexaccent.h
+++ b/src/insets/insetlatexaccent.h
@@ -1,12 +1,12 @@
 // -*- C++ -*-
 /* This file is part of*
- * ======================================================
+ * ====================================================== 
  *
  *           LyX, The Document Processor
  * 	 
- *	    Copyright (C) 1995 Matthias Ettrich
+ *	    Copyright 1995 Matthias Ettrich
  *
- *======================================================*/
+ * ====================================================== */
 
 #ifndef INSET_LATEX_ACCENT_H
 #define INSET_LATEX_ACCENT_H
@@ -27,52 +27,50 @@
   it also can handle other special characters (e.g. Hstroke)
   Initiated by Ivan Schreter, later modified by Lgb.
   */
-class InsetLatexAccent: public Inset {
+class InsetLatexAccent : public Inset {
 public:
 	///
 	InsetLatexAccent(); 
 	///
+	explicit
 	InsetLatexAccent(string const & string);
 	///
-	InsetLatexAccent(InsetLatexAccent const &);
+	int ascent(Painter &, LyXFont const &) const;
 	///
-	~InsetLatexAccent();
+	int descent(Painter &, LyXFont const &) const;
 	///
-	int Ascent(LyXFont const & font) const;
+	int width(Painter &, LyXFont const &) const;
 	///
-	int Descent(LyXFont const & font) const;
+	void draw(Painter &, LyXFont const &, int baseline, float & x) const;
 	///
-	int Width(LyXFont const & font) const;
+	int Lbearing(LyXFont const & font) const;
 	///
-	bool DisplayISO8859_9(LyXFont font, LyXScreen & scr,
-			      int baseline, float & x);
+	int Rbearing(LyXFont const & font) const;
 	///
-	void Draw(LyXFont font, LyXScreen & scr, int baseline, float & x);
+	bool DisplayISO8859_9(Painter &, LyXFont const & font,
+			      int baseline, float & x) const;
 	///
-	void Write(FILE * file);
+	void Write(std::ostream &) const;
 	///
 	void Read(LyXLex & lex);
 	///
-	int Latex(FILE * file, 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;
 	///
 	bool DirectWrite() const;
 	///
-	Inset * Clone();
+	Inset * Clone() const;
 	///
 	Inset::Code LyxCode()const;
 	///
-	bool IsEqual(Inset * other);
-	///
 	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();
 	///
@@ -129,14 +127,14 @@ private:
 	/// modifier type
 	ACCENT_TYPES  modtype;
 	
-	/// remove dot from 'i' and 'j' or transform l,L into lslash,LSLaSH
+	/// remove dot from 'i' and 'j' or transform l, L into lslash, LSLaSH
 	bool  remdot;
 	/// add something to ascent - accent at the top
 	bool  plusasc;
 	/// add something to descent - underlined char
 	bool  plusdesc;
 	/// international char
-	char  ic;    
+	mutable char  ic;    
 };
 
 bool InsetLatexAccent::CanDisplay()