Clean up InsetGraphics::Cache and rename as GraphicsInset.

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

diff --git a/src/insets/insetlatexaccent.h b/src/insets/insetlatexaccent.h
index 2ffaf2b677bc708c5574a74fef9ce19ef14d9393..707b0853f5446f9689ede2c3285bf8e0b96ec477 100644 (file)
--- a/src/insets/insetlatexaccent.h
+++ b/src/insets/insetlatexaccent.h
@@ -1,26 +1,23 @@
 // -*- C++ -*-
-/* This file is part of*
- * ====================================================== 
+/**
+ * \file insetlatexaccent.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
- *      
- *         Copyright (C) 1995 Matthias Ettrich
+ * \author Lars Gullik Bjønnes
  *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS
+ */
 
 #ifndef INSET_LATEX_ACCENT_H
 #define INSET_LATEX_ACCENT_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "lyxinset.h"
+#include "inset.h"
 #include "LString.h"
-#include "lyxlex.h"
+#include "dimension.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
@@ -30,45 +27,44 @@
 class InsetLatexAccent : public Inset {
 public:
        ///
-       InsetLatexAccent(); 
+       InsetLatexAccent();
        ///
+       explicit
        InsetLatexAccent(string const & string);
        ///
-       InsetLatexAccent(InsetLatexAccent const &);
+       void metrics(MetricsInfo &, Dimension &) const;
        ///
-       int Ascent(LyXFont const & font) const;
+       void draw(PainterInfo & pi, int x, int y) const;
        ///
-       int Descent(LyXFont const & font) const;
+       int lbearing(LyXFont const & font) const;
        ///
-       int Width(LyXFont const & font) const;
+       int rbearing(LyXFont const & font) const;
        ///
-       bool DisplayISO8859_9(LyXFont font, LyXScreen & scr,
-                             int baseline, float & x);
+       bool displayISO8859_9(PainterInfo & pi, int x, int y) const;
        ///
-       void Draw(LyXFont font, LyXScreen & scr, int baseline, float & x);
+       void write(Buffer const *, std::ostream &) const;
        ///
-       void Write(FILE * file);
+       void read(Buffer const *, LyXLex & lex);
        ///
-       void Read(LyXLex & lex);
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
-       int Latex(FILE * file, signed char fragile);
+       int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
-       int Latex(string & file, signed char fragile);
+       int linuxdoc(Buffer const *, std::ostream &) const;
        ///
-       int Linuxdoc(string & file);
+       int docbook(Buffer const *, std::ostream &, bool mixcont) const;
        ///
-       int DocBook(string & file);
+       bool directWrite() const;
        ///
-       bool Deletable() const;
+       virtual Inset * clone() const;
        ///
-       bool DirectWrite() const;
+       Inset::Code lyxCode()const;
        ///
-       Inset * Clone() const;
-       ///
-       Inset::Code LyxCode()const;
-       ///
-       inline bool CanDisplay();
-private:
+       inline bool canDisplay();
+       // should this inset be handled like a normal charater
+       bool isChar() const { return true; }
+
        /// all the accent types
        enum ACCENT_TYPES{
                ///
@@ -108,14 +104,14 @@ private:
                ///
                DOT_LESS_I,
                ///
-               DOT_LESS_J, // 18
+               DOT_LESS_J, // 18
                ///
-               lSLASH,
+               lSLASH,
                ///
-               LSLASH
+               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();
        ///
@@ -124,7 +120,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
@@ -132,10 +128,13 @@ private:
        /// add something to descent - underlined char
        bool  plusdesc;
        /// international char
-       char  ic;    
+       mutable char  ic;
+       ///
+       mutable Dimension dim_;
 };
 
-bool InsetLatexAccent::CanDisplay()
+
+bool InsetLatexAccent::canDisplay()
 {
        return candisp;
 }