The last commit was, uhh, not what I intended.

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

diff --git a/src/insets/InsetSpace.h b/src/insets/InsetSpace.h
index e6f5bce98640d6524f236300b92c446859719764..98074f18efca0ee435bf527992609873106fbe0c 100644 (file)
--- a/src/insets/InsetSpace.h
+++ b/src/insets/InsetSpace.h
@@ -15,10 +15,8 @@
 #ifndef INSET_SPACE_H
 #define INSET_SPACE_H
 
-
 #include "Inset.h"
 #include "Length.h"
-#include "MailInset.h"
 
 
 namespace lyx {
@@ -53,6 +51,14 @@ public:
                DOTFILL,
                /// rubber length, filled with a rule
                HRULEFILL,
+               /// rubber length, filled with a left arrow
+               LEFTARROWFILL,
+               /// rubber length, filled with a right arrow
+               RIGHTARROWFILL,
+               // rubber length, filled with an up brace
+               UPBRACEFILL,
+               // rubber length, filled with a down brace
+               DOWNBRACEFILL,
                /// \hspace{length}
                CUSTOM,
                /// \hspace*{length}
@@ -70,23 +76,30 @@ public:
        Length length;
 };
 
+
 ///  Used to insert different kinds of spaces
-class InsetSpace : public Inset {
+class InsetSpace : public Inset
+{
 public:
        ///
-       InsetSpace();
-       ///
-       ~InsetSpace();
-
+       InsetSpace() {}
        ///
-       explicit
-       InsetSpace(InsetSpaceParams par);
+       explicit InsetSpace(InsetSpaceParams const & par);
        ///
        InsetSpaceParams params() const { return params_; }
        ///
        InsetSpaceParams::Kind kind() const;
        ///
+       ~InsetSpace();
+
+       ///
+       static void string2params(std::string const &, InsetSpaceParams &);
+       ///
+       static std::string params2string(InsetSpaceParams const &);
+       ///
        Length length() const;
+
+private:
        ///
        docstring toolTip(BufferView const & bv, int x, int y) const;
        ///
@@ -123,36 +136,16 @@ public:
        // a line separator)?
        bool isSpace() const { return true; }
        ///
-       virtual docstring contextMenu(BufferView const & bv, int x, int y) const;
-private:
-       virtual Inset * clone() const { return new InsetSpace(*this); }
+       docstring contextMenu(BufferView const & bv, int x, int y) const;
+       ///
+       Inset * clone() const { return new InsetSpace(*this); }
        ///
        void doDispatch(Cursor & cur, FuncRequest & cmd);
-
        ///
-       InsetSpaceParams params_;
-};
-
+       bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const;
 
-class InsetSpaceMailer : public MailInset {
-public:
-       ///
-       InsetSpaceMailer(InsetSpace & inset);
-       ///
-       virtual Inset & inset() const { return inset_; }
-       ///
-       virtual std::string const & name() const { return name_; }
        ///
-       virtual std::string const inset2string(Buffer const &) const;
-       ///
-       static void string2params(std::string const &, InsetSpaceParams &);
-       ///
-       static std::string const params2string(InsetSpaceParams const &);
-private:
-       ///
-       static std::string const name_;
-       ///
-       InsetSpace & inset_;
+       InsetSpaceParams params_;
 };