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 0295d89f1c69dd818d7d990550a0e1f123d68166..9d7cbe436233f3b4bcaccaf6883c735df9861493 100644 (file)
--- a/src/insets/insetlatexaccent.h
+++ b/src/insets/insetlatexaccent.h
@@ -1,15 +1,15 @@
 // -*- 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
+#ifndef INSET_LATEX_ACCENT_H
+#define INSET_LATEX_ACCENT_H
 
 #ifdef __GNUG__
 #pragma interface
@@ -27,52 +27,51 @@
   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(); 
+       InsetLatexAccent();
        ///
+       explicit
        InsetLatexAccent(string const & string);
        ///
-       InsetLatexAccent(InsetLatexAccent const&);
+       int ascent(BufferView *, LyXFont const &) const;
        ///
-       ~InsetLatexAccent();
+       int descent(BufferView *, LyXFont const &) const;
        ///
-       int Ascent(LyXFont const &font) const;
+       int width(BufferView *, LyXFont const &) const;
        ///
-       int Descent(LyXFont const &font) const;
+       void draw(BufferView *, LyXFont const &, int, float &, bool) 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(BufferView *, LyXFont const & font,
+                             int baseline, float & x) const;
        ///
-       void Write(FILE *file);
+       void Write(Buffer const *, std::ostream &) const;
        ///
-       void Read(LyXLex &lex);
+       void Read(Buffer const *, LyXLex & lex);
        ///
-       int Latex(FILE *file, signed char fragile);
+       int Latex(Buffer const *, std::ostream &,
+                 bool fragile, bool free_spc) const;
        ///
-       int Latex(string &file, signed char fragile);
+       int Ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
-       int Linuxdoc(string &file);
+       int Linuxdoc(Buffer const *, std::ostream &) const;
        ///
-       int DocBook(string &file);
+       int DocBook(Buffer const *, std::ostream &) const;
        ///
        bool Deletable() const;
        ///
        bool DirectWrite() const;
        ///
-       Inset* Clone();
+       Inset * Clone(Buffer const &) const;
        ///
        Inset::Code LyxCode()const;
        ///
-       bool IsEqual(Inset* other);
-       ///
        inline bool CanDisplay();
-private:
        /// all the accent types
        enum ACCENT_TYPES{
                ///
@@ -118,7 +117,8 @@ private:
                ///
                LSLASH
        };
-       
+private:
+       friend std::ostream & operator<<(std::ostream &, ACCENT_TYPES);
        /// Check if we know the modifier and can display it ok on screen.
        void checkContents();
        ///
@@ -128,20 +128,20 @@ 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()
 {
        return candisp;
 }
 
 #endif
-