fix compilation pb ; update eu.po

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

diff --git a/src/insets/insetlatexaccent.h b/src/insets/insetlatexaccent.h
index 47aa293175ab48c0d5d94ab2b3a7371f5b7505b9..9d7cbe436233f3b4bcaccaf6883c735df9861493 100644 (file)
--- 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
  *
  * ====================================================== */
 
@@ -30,49 +30,48 @@
 class InsetLatexAccent : public Inset {
 public:
        ///
-       InsetLatexAccent(); 
+       InsetLatexAccent();
        ///
+       explicit
        InsetLatexAccent(string const & string);
        ///
-       InsetLatexAccent(InsetLatexAccent const &);
+       int ascent(BufferView *, LyXFont const &) const;
        ///
-       int Ascent(LyXFont const & font) const;
+       int descent(BufferView *, LyXFont const &) const;
        ///
-       int Descent(LyXFont const & font) const;
+       int width(BufferView *, LyXFont const &) const;
        ///
-       int Width(LyXFont const & font) const;
+       void draw(BufferView *, LyXFont const &, int, float &, bool) 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(BufferView *, LyXFont const & font,
+                             int baseline, float & x) const;
        ///
-       void Draw(LyXFont font, LyXScreen & scr, int baseline, float & x);
+       void Write(Buffer const *, std::ostream &) const;
        ///
-       void Write(ostream &);
+       void Read(Buffer const *, LyXLex & lex);
        ///
-       void Read(LyXLex & lex);
+       int Latex(Buffer const *, std::ostream &,
+                 bool fragile, bool free_spc) const;
        ///
-       int Latex(ostream &, 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(string & file);
+       int DocBook(Buffer const *, std::ostream &) const;
        ///
        bool Deletable() const;
        ///
        bool DirectWrite() const;
        ///
-       Inset * Clone() const;
+       Inset * Clone(Buffer const &) const;
        ///
        Inset::Code LyxCode()const;
        ///
        inline bool CanDisplay();
-private:
        /// all the accent types
        enum ACCENT_TYPES{
                ///
@@ -118,8 +117,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,9 +135,10 @@ private:
        /// add something to descent - underlined char
        bool  plusdesc;
        /// international char
-       char  ic;    
+       mutable char  ic;    
 };
 
+
 bool InsetLatexAccent::CanDisplay()
 {
        return candisp;