Merge branch 'master' into biblatex2

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

diff --git a/src/insets/InsetSpace.h b/src/insets/InsetSpace.h
index 5496e3c8489b30a2e269c00ecff84b513a7877fa..a4fd6151f90a458c9a8429573e6d0cdc735f03a1 100644 (file)
--- a/src/insets/InsetSpace.h
+++ b/src/insets/InsetSpace.h
@@ -30,6 +30,8 @@ struct InsetSpaceParams {
                NORMAL,
                /// Protected (no break) space ('~')
                PROTECTED,
+               /// Visible ("open box") space ('\textvisiblespace')
+               VISIBLE,
                /// Thin space ('\,')
                THIN,
                /// Medium space ('\:')
@@ -122,7 +124,8 @@ public:
        ///
        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;
        ///
@@ -132,14 +135,15 @@ public:
        ///
        void toString(odocstream &) const;
        ///
-       void forToc(docstring &, size_t) const;
+       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;
-
+       /// 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?
@@ -148,9 +152,7 @@ public:
        // a line separator)?
        bool isSpace() const { return true; }
        ///
-       docstring contextMenuName() const;
-       ///
-       bool clickable(int /* x */, int /* y */) const { return true; }
+       std::string contextMenuName() const;
 protected:
        ///
        Inset * clone() const { return new InsetSpace(*this); }