X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFloating.h;h=8cf5c505a2cb80ef92c68a83542753f86c13dc2f;hb=fb90076e9065018ee0ef9e16bae2a5d9dcc9436d;hp=358bedf0bd76674db9c929f762853a9d7d063f4f;hpb=abc81b5c0734c7a913d615a044f1954e4a8119d8;p=lyx.git

diff --git a/src/Floating.h b/src/Floating.h
index 358bedf0bd..8cf5c505a2 100644
--- a/src/Floating.h
+++ b/src/Floating.h
@@ -26,14 +26,17 @@ namespace lyx {
 class Floating {
 public:
 	///
-	Floating();
+	Floating() : usesfloatpkg_(false), ispredefined_(false),
+	    allowswide_(true), allowssideways_(true) {}
 	///
 	Floating(std::string const & type, std::string const & placement,
 		 std::string const & ext, std::string const & within,
 		 std::string const & style, std::string const & name,
 		 std::string const & listName, std::string const & listCmd,
-		 std::string const & htmlType, std::string const & htmlClass, 
-		 std::string const & htmlStyle, bool builtin = false);
+		 std::string const & refPrefix, std::string const & allowedplacement,
+		 std::string const & htmlType, std::string const & htmlClass,
+		 std::string const & htmlStyle, bool usesfloat, bool isprefined,
+		 bool allowswide, bool allowssideways);
 	///
 	std::string const & floattype() const { return floattype_; }
 	///
@@ -49,11 +52,22 @@ public:
 	/// the title of a list of this kind of float
 	std::string const & listName() const { return listname_; }
 	/// the command used to generate that list. this has to be given
-	/// if needsFloatPkg() is false. note that this should not contain
+	/// if usesFloatPkg() is false, unless this float uses the same
+	/// auxfile as another defined previously. this should not contain
 	/// the leading "\".
 	std::string const & listCommand() const { return listcommand_; }
+	/// prefix to use for formatted references to such floats
+	std::string const & refPrefix() const { return refprefix_; }
+	/// allowed placement options
+	std::string const & allowedPlacement() const { return allowedplacement_; }
 	///
-	bool needsFloatPkg() const { return needsfloatpkg_; }
+	bool usesFloatPkg() const { return usesfloatpkg_; }
+	///
+	bool isPredefined() const { return ispredefined_; }
+	///
+	bool allowsWide() const { return allowswide_; }
+	///
+	bool allowsSideways() const { return allowssideways_; }
 	/// style information, for preamble
 	std::string const & htmlStyle() const { return html_style_; }
 	/// class, for css, defaults to "float-" + type()
@@ -80,7 +94,17 @@ private:
 	///
 	std::string listcommand_;
 	///
-	bool needsfloatpkg_;
+	std::string refprefix_;
+	///
+	std::string allowedplacement_;
+	///
+	bool usesfloatpkg_;
+	///
+	bool ispredefined_;
+	///
+	bool  allowswide_;
+	///
+	bool  allowssideways_;
 	/// 
 	mutable std::string html_tag_;
 	///