Revert this change as it sneaked in and wasn't discussed yet.

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

diff --git a/src/insets/insetlatexaccent.h b/src/insets/insetlatexaccent.h
index c61bfec1c6677456be5bbbd5b3d4235224146847..a314e6500b018137910a596b3b42d38bf1cde9db 100644 (file)
--- a/src/insets/insetlatexaccent.h
+++ b/src/insets/insetlatexaccent.h
@@ -1,9 +1,9 @@
 // -*- C++ -*-
 /* This file is part of*
- * ====================================================== 
+ * ======================================================
  *
  *           LyX, The Document Processor
- *      
+ *
  *         Copyright 1995 Matthias Ettrich
  *
  * ====================================================== */
@@ -15,12 +15,12 @@
 #pragma interface
 #endif
 
-#include "lyxinset.h"
+#include "inset.h"
 #include "LString.h"
 #include "lyxlex.h"
 
 /** Insertion of accents
-  
+
   Proper handling of accented characters.
   This is class is supposed to handle all LaTeX accents, it
   is also possible that the class will change a bit so that
@@ -43,35 +43,38 @@ public:
        ///
        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(BufferView *, LyXFont const & font,
+       bool displayISO8859_9(BufferView *, LyXFont const & font,
                              int baseline, float & x) const;
        ///
-       void Write(Buffer const *, std::ostream &) const;
+       void write(Buffer const *, std::ostream &) const;
        ///
-       void Read(Buffer const *, LyXLex & lex);
+       void read(Buffer const *, LyXLex & lex);
        ///
-       int Latex(Buffer const *, std::ostream &,
+       int latex(Buffer const *, std::ostream &,
                  bool fragile, bool free_spc) const;
        ///
-       int Ascii(Buffer const *, std::ostream &) const;
+       int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
-       int Linuxdoc(Buffer const *, std::ostream &) const;
+       int linuxdoc(Buffer const *, std::ostream &) const;
        ///
-       int DocBook(Buffer const *, std::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{
                ///
@@ -111,11 +114,11 @@ public:
                ///
                DOT_LESS_I,
                ///
-               DOT_LESS_J, // 18
+               DOT_LESS_J, // 18
                ///
-               lSLASH,
+               lSLASH,
                ///
-               LSLASH
+               LSLASH
        };
 private:
        friend std::ostream & operator<<(std::ostream &, ACCENT_TYPES);
@@ -127,7 +130,7 @@ private:
        bool  candisp;
        /// modifier type
        ACCENT_TYPES  modtype;
-       
+
        /// remove dot from 'i' and 'j' or transform l, L into lslash, LSLaSH
        bool  remdot;
        /// add something to ascent - accent at the top
@@ -135,11 +138,11 @@ private:
        /// add something to descent - underlined char
        bool  plusdesc;
        /// international char
-       mutable char  ic;    
+       mutable char  ic;
 };
 
 
-bool InsetLatexAccent::CanDisplay()
+bool InsetLatexAccent::canDisplay()
 {
        return candisp;
 }