X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFloating.h;h=8cf5c505a2cb80ef92c68a83542753f86c13dc2f;hb=5c97c15e0334bdbe1ca5b2f2d6e43725c8431e34;hp=d53c2dc15690b4b98fbfd510f206cbd566919321;hpb=cbed4c3cc55ffba60c4feceda886deb8b235fc6c;p=lyx.git

diff --git a/src/Floating.h b/src/Floating.h
index d53c2dc156..8cf5c505a2 100644
--- a/src/Floating.h
+++ b/src/Floating.h
@@ -12,8 +12,6 @@
 #ifndef FLOATING_H
 #define FLOATING_H
 
-#include "support/strfwd.h"
-
 #include <string>
 
 
@@ -28,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 & htmlType,
-		 std::string const & htmlClass, std::string const & htmlStyle,
-		 bool builtin = false);
+		 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,
+		 bool allowswide, bool allowssideways);
 	///
 	std::string const & floattype() const { return floattype_; }
 	///
@@ -50,13 +51,23 @@ public:
 	std::string const & name() const { return name_; }
 	/// the title of a list of this kind of float
 	std::string const & listName() const { return listname_; }
-	/// the command used to generate that list, in LaTeX
-	/// if needsFloatPkg() is true, then this is
-	///   \listof{floattype()}
-	/// otherwise it is hardcoded, at present.
-	docstring const & listCommand(std::string const & lang) const;
+	/// the command used to generate that list. this has to be given
+	/// 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 isPredefined() const { return ispredefined_; }
 	///
-	bool needsFloatPkg() const { return needsfloatpkg_; }
+	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()
@@ -81,9 +92,19 @@ private:
 	///
 	std::string listname_;
 	///
-	mutable docstring listcommand_;
+	std::string listcommand_;
+	///
+	std::string refprefix_;
+	///
+	std::string allowedplacement_;
+	///
+	bool usesfloatpkg_;
+	///
+	bool ispredefined_;
+	///
+	bool  allowswide_;
 	///
-	bool needsfloatpkg_;
+	bool  allowssideways_;
 	/// 
 	mutable std::string html_tag_;
 	///