New DocBook support

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

diff --git a/src/insets/InsetSpace.h b/src/insets/InsetSpace.h
index 5aed4d50e7d346886e46f692b43125670a007009..1111aa1e828d7215d56104e429930ad511f1a08f 100644 (file)
--- a/src/insets/InsetSpace.h
+++ b/src/insets/InsetSpace.h
@@ -23,14 +23,15 @@ 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 ('\:')
@@ -41,9 +42,9 @@ public:
                QUAD,
                /// \qquad (2em)
                QQUAD,
-               /// \enskip (0.5em unbreakable)
+               /// \enspace (0.5em unbreakable)
                ENSPACE,
-               /// \enspace (0.5em breakable)
+               /// \enskip (0.5em breakable)
                ENSKIP,
                /// Negative thin space ('\negthinspace')
                NEGTHIN,
@@ -73,7 +74,7 @@ public:
                CUSTOM_PROTECTED
        };
        ///
-       InsetSpaceParams(bool m = false) : kind(NORMAL), math(m) {}
+       explicit InsetSpaceParams(bool m = false) : kind(NORMAL), math(m) {}
        ///
        void write(std::ostream & os) const;
        ///
@@ -99,11 +100,9 @@ public:
        ///
        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 &);
@@ -114,6 +113,8 @@ public:
 
        ///
        docstring toolTip(BufferView const & bv, int x, int y) const;
+       /// unprotected spaces allow line breaking after them
+       RowFlags rowFlags() const;
        ///
        void metrics(MetricsInfo &, Dimension &) const;
        ///
@@ -123,25 +124,29 @@ public:
        /// 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;
+       void docbook(XMLStream &, OutputParams const &) const;
        ///
-       docstring xhtml(XHTMLStream &, OutputParams const &) const;
+       docstring xhtml(XMLStream &, OutputParams const &) const;
        ///
        void validate(LaTeXFeatures & features) const;
-       /// the string that is passed to the TOC
-       void tocString(odocstream &) const;
+       ///
+       void toString(odocstream &) 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;
-
-       // 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; }
@@ -149,7 +154,7 @@ public:
        // 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); }
@@ -160,8 +165,6 @@ public:
        bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const;
 
 private:
-       ///
-       bool showInsetDialog(BufferView * bv) const;
        ///
        InsetSpaceParams params_;
 };