Rename LatexRunParams::fragile as moving_arg.

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

diff --git a/src/insets/insettext.h b/src/insets/insettext.h
index 7521131001eb6ba6fe9704e132f5673276b939d8..c42a2d0bae9387b7fa4ac337290d29861aa0bb8e 100644 (file)
--- a/src/insets/insettext.h
+++ b/src/insets/insettext.h
@@ -12,16 +12,18 @@
 #ifndef INSETTEXT_H
 #define INSETTEXT_H
 
-
 #include "updatableinset.h"
 #include "LString.h"
 #include "LColor.h"
 #include "ParagraphList.h"
 #include "RowList.h"
+#include "dimension.h"
+#include "frontends/mouse_state.h"
 
 #include "support/types.h"
 
 #include <boost/shared_ptr.hpp>
+#include <map>
 
 class Painter;
 class BufferView;
@@ -85,11 +87,7 @@ public:
        ///
        void write(Buffer const *, std::ostream &) const;
        ///
-       int ascent(BufferView *, LyXFont const &) const;
-       ///
-       int descent(BufferView *, LyXFont const &) const;
-       ///
-       int width(BufferView *, LyXFont const & f) const;
+       void dimension(BufferView *, LyXFont const &, Dimension &) const;
        ///
        int textWidth(BufferView *, bool fordraw = false) const;
        ///
@@ -101,10 +99,6 @@ public:
        ///
        string const editMessage() const;
        ///
-       void edit(BufferView *, int, int, mouse_button::state);
-       ///
-       void edit(BufferView *, bool front = true);
-       ///
        bool isTextInset() const { return true; }
        ///
        void insetUnlock(BufferView *);
@@ -119,7 +113,7 @@ public:
        RESULT localDispatch(FuncRequest const &);
        ///
        int latex(Buffer const *, std::ostream &,
-                 bool fragile, bool free_spc) const;
+                 LatexRunParams const &) const;
        ///
        int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
@@ -202,8 +196,6 @@ public:
        ///
        LyXCursor const & cursor(BufferView *) const;
        ///
-       void paragraph(Paragraph *);
-       ///
        bool allowSpellcheck() const { return true; }
        ///
        WordLangTuple const
@@ -354,11 +346,7 @@ private:
        ///
        mutable bool locked;
        ///
-       mutable int insetAscent;
-       ///
-       mutable int insetDescent;
-       ///
-       mutable int insetWidth;
+       mutable Dimension dim_;
        ///
        mutable int top_y;
        ///