X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FFloating.h;h=8cf5c505a2cb80ef92c68a83542753f86c13dc2f;hb=57b69a5efddf9f3c148007322f00dad6c253a2ed;hp=d1b81c87ea4290a728cc7233873a55842891d91e;hpb=6c300f72a217722652dc27db9108e1050028979c;p=lyx.git

diff --git a/src/Floating.h b/src/Floating.h
index d1b81c87ea..8cf5c505a2 100644
--- a/src/Floating.h
+++ b/src/Floating.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -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,31 +26,59 @@ 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, 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_; }
+	///
+	std::string const & placement() const { return placement_; }
 	///
-	std::string const & type() const;
+	std::string const & ext() const {return ext_; }
 	///
-	std::string const & placement() const;
+	std::string const & within() const { return within_; }
 	///
-	std::string const & ext() const;
+	std::string const & style() const { return style_; }
 	///
-	std::string const & within() 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_; }
+	/// allowed placement options
+	std::string const & allowedPlacement() const { return allowedplacement_; }
 	///
-	std::string const & style() const;
+	bool usesFloatPkg() const { return usesfloatpkg_; }
 	///
-	std::string const & name() const;
+	bool isPredefined() const { return ispredefined_; }
 	///
-	std::string const & listName() const;
+	bool allowsWide() const { return allowswide_; }
 	///
-	bool builtin() const;
+	bool allowsSideways() const { return allowssideways_; }
+	/// style information, for preamble
+	std::string const & htmlStyle() const { return html_style_; }
+	/// class, for css, defaults to "float-" + type()
+	std::string const & htmlAttrib() const;
+	/// tag type, defaults to "div"
+	std::string const & htmlTag() const;
 private:
 	///
-	std::string type_;
+	std::string defaultCSSClass() const;
+	///
+	std::string floattype_;
 	///
 	std::string placement_;
 	///
@@ -62,9 +90,29 @@ private:
 	///
 	std::string name_;
 	///
-	std::string listName_;
+	std::string listname_;
+	///
+	std::string listcommand_;
+	///
+	std::string refprefix_;
+	///
+	std::string allowedplacement_;
+	///
+	bool usesfloatpkg_;
+	///
+	bool ispredefined_;
+	///
+	bool  allowswide_;
+	///
+	bool  allowssideways_;
+	/// 
+	mutable std::string html_tag_;
+	/// 
+	mutable std::string html_attrib_;
 	///
-	bool builtin_;
+	mutable std::string defaultcssclass_;
+	/// 
+	std::string html_style_;
 };