Improve handling of top and bottom margin

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

diff --git a/src/insets/InsetFloat.h b/src/insets/InsetFloat.h
index 9c202678fc5557a8a16fc56ba25f0b7e1e09e779..bdf68089a9a49a085ca7e4bc24052b98cad77190 100644 (file)
--- a/src/insets/InsetFloat.h
+++ b/src/insets/InsetFloat.h
@@ -18,11 +18,15 @@
 
 namespace lyx {
 
+struct TexString;
+
+
 class InsetFloatParams
 {
 public:
        ///
-       InsetFloatParams() : type("senseless"), wide(false), sideways(false), subfloat(false) {}
+       InsetFloatParams() : type("senseless"), placement("document"), alignment("document"),
+               wide(false), sideways(false), subfloat(false) {}
        ///
        void write(std::ostream & os) const;
        ///
@@ -31,6 +35,8 @@ public:
        std::string type;
        ///
        std::string placement;
+       ///
+       std::string alignment;
        /// span columns
        bool wide;
        ///
@@ -51,7 +57,7 @@ public:
 class InsetFloat : public InsetCaptionable
 {
 public:
-       InsetFloat(Buffer * buffer, std::string params_str);
+       InsetFloat(Buffer * buffer, std::string const & params_str);
        ///
        static void string2params(std::string const &, InsetFloatParams &);
        ///
@@ -68,6 +74,10 @@ public:
        InsetFloatParams const & params() const { return params_; }
        ///
        bool allowsCaptionVariation(std::string const &) const;
+       ///
+       LyXAlignment contentAlignment() const;
+       ///
+       bool forceParDirectionSwitch() const { return true; }
 private:
        ///
        void setCaptionType(std::string const & type);
@@ -89,12 +99,12 @@ private:
        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;
        ///
        bool insetAllowed(InsetCode) const;
-       /** returns false if, when outputing LaTeX, font changes should
+       /** returns false if, when outputting LaTeX, font changes should
            be closed before generating this inset. This is needed for
            insets that may contain several paragraphs */
        bool inheritFont() const { return false; }
@@ -106,10 +116,14 @@ private:
        void doDispatch(Cursor & cur, FuncRequest & cmd);
        ///
        Inset * clone() const { return new InsetFloat(*this); }
+       /// Is the content of this inset part of the immediate (visible) text sequence?
+       bool isPartOfTextSequence() const { return false; }
+       ///
+       TexString getCaption(OutputParams const &) const;
        ///
-       docstring getCaption(OutputParams const &) const;
+       std::string getAlignment() const;
        ///
-       void getCaption(otexstream & os, OutputParams const & runparams) const;
+       OutputParams::CtObject CtObject(OutputParams const &) const { return OutputParams::CT_OMITOBJECT; }
 
        InsetFloatParams params_;
 };