X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFloating.h;h=d1bf74c8a5a58e06afce746466705f832c3bd704;hb=a84a98b54561044b5902dfce39bc31082877fec1;hp=acb98f7e8a2c9dcb7ba007b191468288f1c780e9;hpb=d88e9655be4a8b390ed0b4b90bd22c77ae1755d3;p=lyx.git

diff --git a/src/Floating.h b/src/Floating.h
index acb98f7e8a..d1bf74c8a5 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
@@ -31,34 +31,46 @@ public:
 	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_; }
 	///
-	std::string const & type() const;
+	std::string const & placement() const { return placement_; }
 	///
-	std::string const & placement() const;
+	std::string const & ext() const {return ext_; }
 	///
-	std::string const & ext() const;
+	std::string const & within() const { return within_; }
 	///
-	std::string const & within() const;
+	std::string const & style() const { return style_; }
 	///
-	std::string const & style() const;
+	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_; }
 	///
-	std::string const & name() const;
+	bool usesFloatPkg() const { return usesfloatpkg_; }
 	///
-	std::string const & listName() const;
+	bool isPredefined() const { return ispredefined_; }
 	/// style information, for preamble
-	std::string const & htmlStyle() const;
+	std::string const & htmlStyle() const { return html_style_; }
 	/// class, for css, defaults to "float-" + type()
-	std::string const & htmlClass() const;
+	std::string const & htmlAttrib() const;
 	/// tag type, defaults to "div"
 	std::string const & htmlTag() const;
-	///
-	bool builtin() const;
 private:
 	///
-	std::string type_;
+	std::string defaultCSSClass() const;
+	///
+	std::string floattype_;
 	///
 	std::string placement_;
 	///
@@ -70,15 +82,23 @@ private:
 	///
 	std::string name_;
 	///
-	std::string listName_;
-	/// 
-	mutable std::string htmlTag_;
+	std::string listname_;
+	///
+	std::string listcommand_;
+	///
+	std::string refprefix_;
+	///
+	bool usesfloatpkg_;
+	///
+	bool ispredefined_;
 	/// 
-	mutable std::string htmlClass_;
+	mutable std::string html_tag_;
 	/// 
-	std::string htmlStyle_;
+	mutable std::string html_attrib_;
 	///
-	bool builtin_;
+	mutable std::string defaultcssclass_;
+	/// 
+	std::string html_style_;
 };