Merge branch 'master' into biblatex2

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

diff --git a/src/insets/Inset.h b/src/insets/Inset.h
index 1b3f85ebc7ae08cb71a1f29f1db73c0a5cd39bf2..0783ec1ffbb0c1dea4d130b1a39358d072e9036f 100644 (file)
--- a/src/insets/Inset.h
+++ b/src/insets/Inset.h
@@ -198,17 +198,19 @@ public:
        ///
        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;
@@ -216,8 +218,6 @@ public:
        int xo(BufferView const & bv) const;
        /// last drawn position for 'important' insets
        int yo(BufferView const & bv) const;
-       ///
-       void setDimCache(MetricsInfo const &, Dimension const &) const;
        /// do we cover screen position x/y?
        bool covers(BufferView const & bv, int x, int y) const;
        /// get the screen positions of the cursor (see note in Cursor.cpp)
@@ -413,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
@@ -527,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; }