* 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 6ac7ca4bcf60afc70b9174a98495871bca5c5236..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,13 +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 &);
        ///
@@ -66,12 +76,12 @@ 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() {}
        ///
-       void setLabelFont(FontInfo const & f);
-       ///
        bool isOpen() const { return geometry() != ButtonOnly; }
        ///
        CollapseStatus status() const;
@@ -126,7 +136,7 @@ public:
        ///
        bool setMouseHover(bool mouse_hover);
        ///
-       virtual ColorCode backgroundColor() const {return layout_.bgcolor; }
+       virtual ColorCode backgroundColor() const {return layout_->bgcolor; }
 
        int latex(Buffer const &, odocstream &,
                  OutputParams const &) const;
@@ -136,18 +146,16 @@ public:
        virtual InsetCode lyxCode() const { return COLLAPSABLE_CODE; }
 
        /// Allow multiple blanks
-       virtual bool isFreeSpacing() const { return layout_.freespacing; }
+       virtual bool isFreeSpacing() const { return layout_->freespacing; }
        /// Don't eliminate empty paragraphs
-       virtual bool allowEmpty() const { return layout_.keepempty; }
+       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);
@@ -155,21 +163,17 @@ protected:
        docstring floatName(std::string const & type, BufferParams const &) const;
        ///
        virtual void resetParagraphsFont();
-       ///
-       virtual void getDrawFont(FontInfo &) const;
 
 protected:
        ///
-       mutable Box button_dim;
-       ///
-       mutable int topx;
+       InsetLayout const * layout_;
+private:
        ///
-       mutable int topbaseline;
+       Dimension dimensionCollapsed() const;
        ///
-       mutable InsetLayout layout_;
+       docstring labelstring_;
        ///
-       CollapseStatus internalStatus() const { return status_; }
-private:
+       mutable Box button_dim;
        ///
        mutable CollapseStatus status_;
        /// a substatus of the Open status, determined automatically in metrics
@@ -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