Merge branch 'master' into biblatex2

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

diff --git a/src/insets/InsetSpace.h b/src/insets/InsetSpace.h
index 7607b0932484663e8a33119932b9d908b865fe6f..a4fd6151f90a458c9a8429573e6d0cdc735f03a1 100644 (file)
--- a/src/insets/InsetSpace.h
+++ b/src/insets/InsetSpace.h
@@ -6,8 +6,8 @@
  *
  * \author Asger Alstrup Nielsen
  * \author Jean-Marc Lasgouttes
- * \author Lars Gullik Bjønnes
- * \author Jürgen Spitzmüller
+ * \author Lars Gullik Bjønnes
+ * \author Jürgen Spitzmüller
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -23,26 +23,35 @@ namespace lyx {
 
 class LaTeXFeatures;
 
-class InsetSpaceParams {
-public:
+struct InsetSpaceParams {
        /// The different kinds of spaces we support
        enum Kind {
                /// Normal space ('\ ')
                NORMAL,
                /// Protected (no break) space ('~')
                PROTECTED,
+               /// Visible ("open box") space ('\textvisiblespace')
+               VISIBLE,
                /// Thin space ('\,')
                THIN,
+               /// Medium space ('\:')
+               MEDIUM,
+               /// Thick space ('\;')
+               THICK,
                /// \quad (1em)
                QUAD,
                /// \qquad (2em)
                QQUAD,
-               /// \enspace (0.5em unbreakable)
+               /// \enskip (0.5em unbreakable)
                ENSPACE,
                /// \enspace (0.5em breakable)
                ENSKIP,
                /// Negative thin space ('\negthinspace')
                NEGTHIN,
+               /// Negative medium space ('\negmedspace')
+               NEGMEDIUM,
+               /// Negative thick space ('\negthickspace')
+               NEGTHICK,
                /// rubber length
                HFILL,
                /// \hspace*{\fill}
@@ -65,7 +74,7 @@ public:
                CUSTOM_PROTECTED
        };
        ///
-       InsetSpaceParams() : kind(NORMAL), length(Length()) {}
+       InsetSpaceParams(bool m = false) : kind(NORMAL), math(m) {}
        ///
        void write(std::ostream & os) const;
        ///
@@ -73,7 +82,12 @@ public:
        ///
        Kind kind;
        ///
-       Length length;
+       GlueLength length;
+       /**
+        * Whether these params are to be used in mathed.
+        * This determines the set of valid kinds.
+        */
+       bool math;
 };
 
 
@@ -82,24 +96,21 @@ class InsetSpace : public Inset
 {
 public:
        ///
-       InsetSpace() {}
+       InsetSpace() : Inset(0) {}
        ///
        explicit InsetSpace(InsetSpaceParams const & par);
        ///
-       InsetSpaceParams params() const { return params_; }
+       InsetSpaceParams const & 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;
+       GlueLength length() const;
 
-private:
        ///
        docstring toolTip(BufferView const & bv, int x, int y) const;
        ///
@@ -111,24 +122,29 @@ private:
        /// Will not be used when lyxf3
        void read(Lexer & lex);
        ///
-       int latex(odocstream &, OutputParams const &) const;
+       void latex(otexstream &, OutputParams const &) const;
        ///
-       int plaintext(odocstream &, OutputParams const &) const;
+       int plaintext(odocstringstream & ods, OutputParams const & op,
+                     size_t max_length = INT_MAX) const;
        ///
        int docbook(odocstream &, OutputParams const &) const;
-       /// the string that is passed to the TOC
-       void tocString(odocstream &) const;
        ///
-       void edit(Cursor & cur, bool front,
-               EntryDirection entry_from = ENTRY_DIRECTION_IGNORE);
+       docstring xhtml(XHTMLStream &, OutputParams const &) const;
+       ///
+       void validate(LaTeXFeatures & features) const;
+       ///
+       void toString(odocstream &) const;
        ///
-       EDITABLE editable() const { return IS_EDITABLE; }
+       void forOutliner(docstring &, size_t const, bool const) const;
+       ///
+       bool hasSettings() const { return true; }
+       ///
+       bool clickable(BufferView const &, int, int) const { return true; }
        ///
        InsetCode lyxCode() const { return SPACE_CODE; }
-       /// is this an expandible space (rubber length)?
-       bool isStretchableSpace() const;
-
-       // should this inset be handled like a normal charater
+       /// does this inset try to use all available space (like \\hfill does)?
+       bool isHfill() const;
+       /// should this inset be handled like a normal character?
        bool isChar() const { return true; }
        /// is this equivalent to a letter?
        bool isLetter() const { return false; }
@@ -136,14 +152,17 @@ private:
        // a line separator)?
        bool isSpace() const { return true; }
        ///
-       docstring contextMenu(BufferView const & bv, int x, int y) const;
+       std::string contextMenuName() const;
+protected:
        ///
        Inset * clone() const { return new InsetSpace(*this); }
        ///
        void doDispatch(Cursor & cur, FuncRequest & cmd);
+public:
        ///
        bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const;
 
+private:
        ///
        InsetSpaceParams params_;
 };