X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFloating.h;h=a5f1ddcd9c5e6e0559db1f4f821f6f49b6ff4f06;hb=c7d29be153debac82e3d2e8865fcc849f0a5f40d;hp=d50fa90870e8b86d5a3eb895f243e2f3e53df84e;hpb=4cd5bcefe9e54468df2454a8f6123526adc50aa0;p=lyx.git

diff --git a/src/Floating.h b/src/Floating.h
index d50fa90870..a5f1ddcd9c 100644
--- 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
@@ -26,15 +28,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 & refPrefix,
-		 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,
+		 docstring const & htmlStyle, bool usesfloat, bool isprefined,
+		 bool allowswide, bool allowssideways);
 	///
 	std::string const & floattype() const { return floattype_; }
 	///
@@ -50,15 +54,24 @@ 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 usesFloatPkg() const { return usesfloatpkg_; }
 	///
-	bool needsFloatPkg() const { return needsfloatpkg_; }
+	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_; }
+	docstring const & htmlStyle() const { return html_style_; }
 	/// class, for css, defaults to "float-" + type()
 	std::string const & htmlAttrib() const;
 	/// tag type, defaults to "div"
@@ -85,15 +98,23 @@ private:
 	///
 	std::string refprefix_;
 	///
-	bool needsfloatpkg_;
-	/// 
+	std::string allowedplacement_;
+	///
+	bool usesfloatpkg_;
+	///
+	bool ispredefined_;
+	///
+	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_;
 };