X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFloating.h;h=b677f0ca7dcefba2b7bc36d632b08c04c4d474e4;hb=ec84cbfb445413e51472845c3c1a2b5da930492f;hp=c90220c84f1c565fbd6e919aa68f27a97406188b;hpb=b64e2d41036b04638bbc0094711346fb98bda6a9;p=lyx.git

diff --git a/src/Floating.h b/src/Floating.h
index c90220c84f..b677f0ca7d 100644
--- a/src/Floating.h
+++ b/src/Floating.h
@@ -16,7 +16,7 @@
 
 
 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,14 +26,15 @@ namespace lyx {
 class Floating {
 public:
 	///
-	Floating();
+	Floating() {}
 	///
 	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 & htmlType, std::string const & htmlClass, 
+		 std::string const & htmlStyle, bool usesfloat, bool isprefined);
 	///
 	std::string const & floattype() const { return floattype_; }
 	///
@@ -46,10 +47,19 @@ public:
 	std::string const & style() const { return style_; }
 	///
 	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. 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_; }
+	///
+	bool usesFloatPkg() const { return usesfloatpkg_; }
 	///
-	bool needsFloatPkg() const { return needsfloatpkg_; }
+	bool isPredefined() const { return ispredefined_; }
 	/// style information, for preamble
 	std::string const & htmlStyle() const { return html_style_; }
 	/// class, for css, defaults to "float-" + type()
@@ -74,7 +84,13 @@ private:
 	///
 	std::string listname_;
 	///
-	bool needsfloatpkg_;
+	std::string listcommand_;
+	///
+	std::string refprefix_;
+	///
+	bool usesfloatpkg_;
+	///
+	bool ispredefined_;
 	/// 
 	mutable std::string html_tag_;
 	///