* Lazy MathData to avoid unneeded interpretation of macro definitions

[features.git] / src / insets / InsetCollapsable.h

diff --git a/src/insets/InsetCollapsable.h b/src/insets/InsetCollapsable.h
index b97ce32ca10fb8996779a43e4481f9fd9dfa3e8a..1b6cbc3c45edf1ea30dba459d737ba19781795ef 100644 (file)
--- a/src/insets/InsetCollapsable.h
+++ b/src/insets/InsetCollapsable.h
@@ -15,8 +15,8 @@
 #define INSETCOLLAPSABLE_H
 
 #include "Inset.h"
+#include "InsetLayout.h"
 #include "InsetText.h"
-#include "TextClass.h"
 
 #include "Box.h"
 
@@ -38,15 +38,23 @@ namespace frontend { class Painter; }
 class InsetCollapsable : public InsetText {
 public:
        ///
-       InsetCollapsable(BufferParams const &, CollapseStatus status = Inset::Open);
+       InsetCollapsable(
+               BufferParams const &,
+               CollapseStatus status = Inset::Open,
+               InsetLayout const * il = 0
+               );
        ///
        InsetCollapsable(InsetCollapsable const & rhs);
        
        InsetCollapsable * asInsetCollapsable() { return this; }
        InsetCollapsable const * asInsetCollapsable() const { return this; }
        docstring name() const { return from_ascii("Collapsable"); }
+       InsetLayout const & getLayout(BufferParams const &) const
+       { return *layout_; } 
        ///
        void setLayout(BufferParams const &);
+       /// (Re-)set the character style parameters from \p il
+       void setLayout(InsetLayout const & il);
        ///
        void read(Buffer const &, Lexer &);
        ///
@@ -68,6 +76,8 @@ public:
        /// can we go further down on mouse click?
        bool descendable() const;
        ///
+       bool isMacroScope(Buffer const & buf) const;
+       ///
        void setLabel(docstring const & l);
        ///
        virtual void setButtonLabel() {}
@@ -139,15 +149,13 @@ public:
        virtual bool isFreeSpacing() const { return layout_->freespacing; }
        /// Don't eliminate empty paragraphs
        virtual bool allowEmpty() const { return layout_->keepempty; }
+       /// Force inset into LTR environment if surroundings are RTL?
+       virtual bool forceLTR() const { return layout_->forceltr; }
 
 protected:
        ///
        virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
        ///
-       Dimension dimensionCollapsed() const;
-       ///
-       Box const & buttonDim() const;
-       ///
        void edit(Cursor & cur, bool left);
        ///
        Inset * editXY(Cursor & cur, int x, int y);
@@ -157,20 +165,16 @@ protected:
        virtual void resetParagraphsFont();
 
 protected:
-       ///
-       mutable Box button_dim;
-       ///
-       mutable int topx;
-       ///
-       mutable int topbaseline;
        ///
        InsetLayout const * layout_;
-       ///
-       CollapseStatus internalStatus() const { return status_; }
 private:
+       ///
+       Dimension dimensionCollapsed() const;
        ///
        docstring labelstring_;
        ///
+       mutable Box button_dim;
+       ///
        mutable CollapseStatus status_;
        /// a substatus of the Open status, determined automatically in metrics
        mutable bool openinlined_;
@@ -180,9 +184,6 @@ private:
        bool mouse_hover_;
 };
 
-// A helper function that pushes the cursor out of the inset.
-void leaveInset(Cursor & cur, Inset const & in);
-
 } // namespace lyx
 
 #endif