Merge branch 'master' into biblatex2

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

diff --git a/src/insets/Inset.h b/src/insets/Inset.h
index bb6323a45447a999fc0e2a0b43ffd829cb4df1e0..0783ec1ffbb0c1dea4d130b1a39358d072e9036f 100644 (file)
--- a/src/insets/Inset.h
+++ b/src/insets/Inset.h
@@ -108,6 +108,8 @@ public:
 
        /// change associated Buffer
        virtual void setBuffer(Buffer & buffer);
+       /// reset associated Buffer to null value
+       virtual void resetBuffer();
        /// retrieve associated Buffer
        virtual Buffer & buffer();
        virtual Buffer const & buffer() const;
@@ -190,33 +192,34 @@ public:
        virtual void drawSelection(PainterInfo &, int, int) const {}
        /// draw inset background if the inset has an own background and a
        /// selection is drawn by drawSelection.
-       virtual void drawBackground(PainterInfo &, int, int) const {}
+       virtual void drawBackground(PainterInfo &, int, int) const;
        ///
        virtual bool editing(BufferView const * bv) const;
        ///
        virtual bool showInsetDialog(BufferView *) const;
 
-       /// draw inset decoration if necessary.
-       /// This can use \c drawMarkers() for example.
-       virtual void drawDecoration(PainterInfo &, int, int) const {}
-       /// draw four angular markers
-       void drawMarkers(PainterInfo & pi, int x, int y) const;
+       // The possible marker types for insets
+       enum marker_type { NO_MARKER, MARKER2, MARKER };
        /// draw two angular markers
+       void drawMarkers(PainterInfo & pi, int x, int y) const;
+       /// draw four angular markers
        void drawMarkers2(PainterInfo & pi, int x, int y) const;
        /// add space for markers
        void metricsMarkers(Dimension & dim, int framesize = 1) const;
        /// add space for markers
        void metricsMarkers2(Dimension & dim, int framesize = 1) const;
+       /// draw inset decoration if necessary.
+       /// This can use \c drawMarkers() for example.
+       virtual void drawDecoration(PainterInfo &, int, int) const {}
+
+       /// last metrics computed for the inset
+       Dimension const dimension(BufferView const &) const;
        /// last drawn position for 'important' insets
        int xo(BufferView const & bv) const;
        /// last drawn position for 'important' insets
        int yo(BufferView const & bv) const;
-       /// set x/y drawing position cache if available
-       virtual void setPosCache(PainterInfo const &, int, int) const;
-       ///
-       void setDimCache(MetricsInfo const &, Dimension const &) const;
        /// do we cover screen position x/y?
-       virtual bool covers(BufferView const & bv, int x, int y) const;
+       bool covers(BufferView const & bv, int x, int y) const;
        /// get the screen positions of the cursor (see note in Cursor.cpp)
        virtual void cursorPos(BufferView const & bv,
                CursorSlice const & sl, bool boundary, int & x, int & y) const;
@@ -410,6 +413,8 @@ public:
 
        /// Is the content of this inset part of the output document?
        virtual bool producesOutput() const { return true; }
+       /// Is the content of this inset part of the immediate (visible) text sequence?
+       virtual bool isPartOfTextSequence() const { return producesOutput(); }
 
        /// \return Tool tip for this inset.
        /// This default implementation returns an empty string. This can be
@@ -524,7 +529,7 @@ public:
        /// returns LyX code associated with the inset. Used for TOC, ...)
        virtual InsetCode lyxCode() const { return NO_CODE; }
 
-       /// -1: text mode, 1: math mode, 0 undecided
+       ///
        enum mode_type {UNDECIDED_MODE, TEXT_MODE, MATH_MODE};
        /// return text or mathmode if that is possible to determine
        virtual mode_type currentMode() const { return UNDECIDED_MODE; }
@@ -567,8 +572,6 @@ public:
        /// reject the changes within the inset
        virtual void rejectChanges() {}
 
-       ///
-       virtual Dimension const dimension(BufferView const &) const;
        ///
        virtual ColorCode backgroundColor(PainterInfo const &) const;
        ///