InsetGraphics: use totalheight for height output

[lyx.git] / src / Floating.h

diff --git a/src/Floating.h b/src/Floating.h
index 8cf5c505a2cb80ef92c68a83542753f86c13dc2f..e4c9e130f9da6e16227b89b97afe8b49250d1b20 100644 (file)
--- a/src/Floating.h
+++ b/src/Floating.h
@@ -12,11 +12,13 @@
 #ifndef FLOATING_H
 #define FLOATING_H
 
+#include "support/strfwd.h"
+
 #include <string>
 
 
 namespace lyx {
-       
+
 /** This is a "float layout" object. It contains the parameters for how to
  *  handle the different kinds of floats, default ones and user created ones.
  *  Objects of this class is stored in a container in FloatList. The different
@@ -35,7 +37,8 @@ public:
                 std::string const & listName, std::string const & listCmd,
                 std::string const & refPrefix, std::string const & allowedplacement,
                 std::string const & htmlType, std::string const & htmlClass,
-                std::string const & htmlStyle, bool usesfloat, bool isprefined,
+                docstring const & htmlStyle, std::string const & requires,
+                bool usesfloat, bool isprefined,
                 bool allowswide, bool allowssideways);
        ///
        std::string const & floattype() const { return floattype_; }
@@ -62,6 +65,8 @@ public:
        std::string const & allowedPlacement() const { return allowedplacement_; }
        ///
        bool usesFloatPkg() const { return usesfloatpkg_; }
+       /// allowed placement options
+       std::string const & requires() const { return requires_; }
        ///
        bool isPredefined() const { return ispredefined_; }
        ///
@@ -69,7 +74,7 @@ public:
        ///
        bool allowsSideways() const { return allowssideways_; }
        /// style information, for preamble
-       std::string const & htmlStyle() const { return html_style_; }
+       docstring const & htmlStyle() const { return html_style_; }
        /// class, for css, defaults to "float-" + type()
        std::string const & htmlAttrib() const;
        /// tag type, defaults to "div"
@@ -98,6 +103,8 @@ private:
        ///
        std::string allowedplacement_;
        ///
+       std::string requires_;
+       ///
        bool usesfloatpkg_;
        ///
        bool ispredefined_;
@@ -105,14 +112,14 @@ private:
        bool  allowswide_;
        ///
        bool  allowssideways_;
-       /// 
+       ///
        mutable std::string html_tag_;
-       /// 
+       ///
        mutable std::string html_attrib_;
        ///
        mutable std::string defaultcssclass_;
-       /// 
-       std::string html_style_;
+       ///
+       docstring html_style_;
 };