Don't remove cell selections after fontchange.

[lyx.git] / src / insets / insetlatexaccent.h

diff --git a/src/insets/insetlatexaccent.h b/src/insets/insetlatexaccent.h
index 40448ca9e59150a602581cb5894830ecdcf97ff3..4d4713b39acbb944d24f1bcb46086dc9316495da 100644 (file)
--- a/src/insets/insetlatexaccent.h
+++ b/src/insets/insetlatexaccent.h
@@ -15,7 +15,7 @@
 #pragma interface
 #endif
 
-#include "lyxinset.h"
+#include "inset.h"
 #include "LString.h"
 #include "lyxlex.h"
 
@@ -30,53 +30,51 @@
 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(LyXLex & lex);
+       void read(Buffer const *, LyXLex & lex);
        ///
-       int Latex(ostream &, signed char fragile, bool free_spc) const;
-#ifndef USE_OSTREAM_ONLY
+       int latex(Buffer const *, std::ostream &,
+                 bool fragile, bool free_spc) const;
        ///
-       int Latex(string & file, signed char fragile, bool free_spc) const;
+       int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
-       int Linuxdoc(string & file) const;
+       int linuxdoc(Buffer const *, std::ostream &) const;
        ///
-       int DocBook(string & file) const;
-#else
+       int docbook(Buffer const *, std::ostream &) const;
        ///
-       int Linuxdoc(ostream &) const;
+       bool deletable() const;
        ///
-       int DocBook(ostream &) const;
-#endif
-       ///
-       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{
                ///
@@ -123,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();
        ///
@@ -143,7 +141,8 @@ private:
        mutable char  ic;    
 };
 
-bool InsetLatexAccent::CanDisplay()
+
+bool InsetLatexAccent::canDisplay()
 {
        return candisp;
 }