insetcharstyle drawing cosmetics

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

diff --git a/src/insets/insetlatexaccent.h b/src/insets/insetlatexaccent.h
index c209f379158745d887e0dc0cd086d66b6621889b..96228daea66412dc888e996ea37b598d6dfca6a9 100644 (file)
--- a/src/insets/insetlatexaccent.h
+++ b/src/insets/insetlatexaccent.h
@@ -13,8 +13,9 @@
 #define INSET_LATEX_ACCENT_H
 
 #include "inset.h"
-#include "LString.h"
-#include "dimension.h"
+
+class Dimension;
+
 
 /** Insertion of accents
 
@@ -29,8 +30,7 @@ public:
        ///
        InsetLatexAccent();
        ///
-       explicit
-       InsetLatexAccent(string const & string);
+       explicit InsetLatexAccent(std::string const & str);
        ///
        void metrics(MetricsInfo &, Dimension &) const;
        ///
@@ -47,13 +47,16 @@ public:
        void read(Buffer const &, LyXLex & lex);
        ///
        int latex(Buffer const &, std::ostream &,
-                 LatexRunParams const &) const;
+                 OutputParams const &) const;
        ///
-       int ascii(Buffer const &, std::ostream &, int linelen) const;
+       int plaintext(Buffer const &, std::ostream &,
+                 OutputParams const &) const;
        ///
-       int linuxdoc(Buffer const &, std::ostream &) const;
+       int linuxdoc(Buffer const &, std::ostream &,
+                    OutputParams const &) const;
        ///
-       int docbook(Buffer const &, std::ostream &, bool mixcont) const;
+       int docbook(Buffer const &, std::ostream &,
+                   OutputParams const &) const;
        ///
        bool directWrite() const;
        ///
@@ -115,7 +118,9 @@ private:
        /// Check if we know the modifier and can display it ok on screen.
        void checkContents();
        ///
-       string contents;
+       void drawAccent(PainterInfo const & pi, int x, int y, char accent) const;
+       ///
+       std::string contents;
        /// can display as proper char
        bool  candisp;
        /// modifier type