IU for validate(). I guess that's in the 'don't ask' category...

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

diff --git a/src/insets/inset.h b/src/insets/inset.h
index b306b35f2b795ecbc5bc52ed55f522866df801c7..1bdf56775157170739978a5e6959c686c9bb8d05 100644 (file)
--- a/src/insets/inset.h
+++ b/src/insets/inset.h
@@ -18,7 +18,6 @@
 #include "LString.h"
 #include "LColor.h"
 #include "insetbase.h"
-#include "frontends/mouse_state.h"
 #include "support/types.h"
 
 #include <vector>
@@ -26,15 +25,14 @@
 class LyXFont;
 class Buffer;
 class Painter;
+class LatexRunParams;
 class LyXText;
 class LyXLex;
 class Paragraph;
-class ParagraphList;
 class LyXCursor;
 class FuncRequest;
 class WordLangTuple;
-
-struct LaTeXFeatures;
+class ParagraphList;
 
 namespace grfx {
        class PreviewLoader;
@@ -82,8 +80,6 @@ public:
                ///
                GRAPHICS_CODE,
                ///
-               PARENT_CODE,
-               ///
                BIBITEM_CODE,
                ///
                BIBTEX_CODE,
@@ -102,6 +98,8 @@ public:
                ///
                MINIPAGE_CODE,
                ///
+               SPACE_CODE,
+               ///
                SPECIALCHAR_CODE, // 25
                ///
                TABULAR_CODE,
@@ -155,15 +153,13 @@ public:
        ///
        Inset();
        ///
-       Inset(Inset const & in, bool same_id = false);
-       ///
-       virtual int ascent(BufferView *, LyXFont const &) const = 0;
+       Inset(Inset const & in);
        ///
-       virtual int descent(BufferView *, LyXFont const &) const = 0;
+       int ascent(BufferView *, LyXFont const &) const;
        ///
-       virtual int width(BufferView *, LyXFont const &) const = 0;
+       int descent(BufferView *, LyXFont const &) const;
        ///
-       virtual void draw(BufferView *, LyXFont const &, int baseline, float & x) const = 0;
+       int width(BufferView *, LyXFont const &) const;
        /// update the inset representation
        virtual void update(BufferView *, bool = false)
                {}
@@ -183,14 +179,9 @@ public:
        virtual void write(Buffer const *, std::ostream &) const = 0;
        ///
        virtual void read(Buffer const *, LyXLex & lex) = 0;
-       /** returns the number of rows (\n's) of generated tex code.
-           fragile == true means, that the inset should take care about
-           fragile commands by adding a \protect before.
-           If the free_spc (freespacing) variable is set, then this inset
-           is in a free-spacing paragraph.
-       */
-       virtual int latex(Buffer const *, std::ostream &, bool fragile,
-                         bool free_spc) const = 0;
+       /// returns the number of rows (\n's) of generated tex code.
+       virtual int latex(Buffer const *, std::ostream &,
+                         LatexRunParams const &) const = 0;
        ///
        virtual int ascii(Buffer const *,
                          std::ostream &, int linelen = 0) const = 0;
@@ -198,8 +189,6 @@ public:
        virtual int linuxdoc(Buffer const *, std::ostream &) const = 0;
        ///
        virtual int docbook(Buffer const *, std::ostream &, bool) const = 0;
-       /// Updates needed features for this inset.
-       virtual void validate(LaTeXFeatures & features) const;
 
        /// returns LyX code associated with the inset. Used for TOC, ...)
        virtual Inset::Code lyxCode() const { return NO_CODE; }
@@ -209,7 +198,7 @@ public:
        }
 
        ///
-       virtual Inset * clone(Buffer const &, bool same_ids = false) const = 0;
+       virtual Inset * clone(Buffer const &) const = 0;
 
        /// returns true to override begin and end inset in file
        virtual bool directWrite() const;