Improve handling of top and bottom margin

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

diff --git a/src/insets/InsetGraphics.h b/src/insets/InsetGraphics.h
index 22d70b233b666d6e271cb229f48303d719d761ff..c987ed06159adbcf4b191febb86b23f8577bfbf2 100644 (file)
--- a/src/insets/InsetGraphics.h
+++ b/src/insets/InsetGraphics.h
@@ -61,13 +61,8 @@ public:
        /// 
        InsetGraphics const * asInsetGraphics() const { return this; }
 
-private:
-       ///
-       InsetGraphics(InsetGraphics const &);
-
        ///
        bool isLabeled() const { return true; }
-       void metrics(MetricsInfo &, Dimension &) const;
        ///
        bool hasSettings() const { return true; }
        ///
@@ -83,9 +78,9 @@ 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 & os, OutputParams const &) const;
+       docstring xhtml(XMLStream & os, OutputParams const &) const;
        /** Tell LyX what the latex features you need i.e. what latex packages
            you need to be included.
         */
@@ -96,6 +91,18 @@ private:
        docstring layoutName() const { return from_ascii("Graphics"); }
        /// Get the inset parameters, used by the GUIndependent dialog.
        InsetGraphicsParams const & params() const;
+
+       ///
+       int topOffset(BufferView const *) const { return 0; }
+       ///
+       int bottomOffset(BufferView const *) const { return 0; }
+       ///
+       int leftOffset(BufferView const *) const { return 0; }
+       ///
+       int rightOffset(BufferView const *) const { return 0; }
+
+       ///
+       void metrics(MetricsInfo &, Dimension &) const;
        ///
        void draw(PainterInfo & pi, int x, int y) const;
        ///
@@ -123,7 +130,7 @@ private:
        std::string createLatexOptions(bool const ps) const;
        /// Create length values for docbook export.
        docstring toDocbookLength(Length const & len) const;
-       /// Create the atributes for docbook export.
+       /// Create the attributes for docbook export.
        docstring createDocBookAttributes() const;
        /// Convert the file if needed, and return the location of the file.
        /// This version is for use with LaTeX-style output.
@@ -136,6 +143,10 @@ private:
        ///
        OutputParams::CtObject CtObject(OutputParams const &) const { return OutputParams::CT_OBJECT; }
 
+private:
+       ///
+       InsetGraphics(InsetGraphics const &);
+
        ///
        InsetGraphicsParams params_;
        /// holds the entity name that defines the graphics location (SGML).