Improve handling of top and bottom margin

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

diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index 6c9790b13556edbe0014920162e29b5fc8fde332..d86bfb75d339456def755b311329633fed9f575a 100644 (file)
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -81,9 +81,7 @@ public:
        int plaintext(odocstringstream & ods, OutputParams const & op,
                      size_t max_length = INT_MAX) const;
        ///
-       int docbook(odocstream &, OutputParams const &) const;
-       ///
-       docstring xhtml(XHTMLStream &, OutputParams const &) const;
+       docstring xhtml(XMLStream &, OutputParams const &) const;
        ///
        enum XHTMLOptions {
                JustText = 0,
@@ -93,9 +91,13 @@ public:
                WriteEverything = 7
        };
        ///
-       docstring insetAsXHTML(XHTMLStream &, OutputParams const &,
+       docstring insetAsXHTML(XMLStream &, OutputParams const &,
                               XHTMLOptions) const;
        ///
+       void docbook(XMLStream &, OutputParams const &, XHTMLOptions opts) const;
+       ///
+       void docbook(XMLStream &, OutputParams const &) const;
+       ///
        void validate(LaTeXFeatures & features) const;
 
        /// return the argument(s) only
@@ -161,6 +163,8 @@ public:
        ///
        virtual bool allowMultiPar() const { return getLayout().isMultiPar(); }
        ///
+       bool isInTitle() const { return intitle_context_; }
+       ///
        /// should paragraphs be forced to use the empty layout?
        virtual bool forcePlainLayout(idx_type = 0) const
                { return getLayout().forcePlainLayout(); }
@@ -206,7 +210,7 @@ public:
        ///
        void completionPosAndDim(Cursor const &, int & x, int & y, Dimension & dim) const;
        /// returns the text to be used as tooltip
-       /// \param prefix: a string that will preced the tooltip,
+       /// \param prefix: a string that will precede the tooltip,
        /// e.g., "Index: ".
        /// \param len: length of the resulting string
        /// NOTE This routine is kind of slow. It's fine to use it within the
@@ -252,6 +256,8 @@ private:
        /// true if the inset contains change
        mutable bool is_changed_;
        ///
+       bool intitle_context_;
+       ///
        ColorCode frame_color_;
        ///
        Text text_;