X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFloating.h;h=f013ed2270cf9129cac4965178ec6e8c0f854225;hb=38c2cde0d8695ac5287bae218c4a33a2acf18ef8;hp=50c94af53ad684763db02a400d2a36e9bea61f27;hpb=9fbb35bb892fe5406ec9fbbf2846f983499d8d7b;p=lyx.git

diff --git a/src/Floating.h b/src/Floating.h
index 50c94af53a..f013ed2270 100644
--- a/src/Floating.h
+++ b/src/Floating.h
@@ -12,6 +12,8 @@
 #ifndef FLOATING_H
 #define FLOATING_H
 
+#include "support/strfwd.h"
+
 #include <string>
 
 
@@ -26,39 +28,62 @@ 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,
+		 docstring const & htmlStyle, std::string const & required,
+		 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_; }
+	/// allowed placement options
+	std::string const & required() const { return required_; }
 	///
-	std::string const & name() const;
+	bool isPredefined() const { return ispredefined_; }
 	///
-	std::string const & listName() const;
+	bool allowsWide() const { return allowswide_; }
+	///
+	bool allowsSideways() const { return allowssideways_; }
 	/// style information, for preamble
-	std::string const & htmlStyle() const;
+	docstring 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 +95,31 @@ private:
 	///
 	std::string name_;
 	///
-	std::string listName_;
-	/// 
+	std::string listname_;
+	///
+	std::string listcommand_;
+	///
+	std::string refprefix_;
+	///
+	std::string allowedplacement_;
+	///
+	std::string required_;
+	///
+	bool usesfloatpkg_;
+	///
+	bool ispredefined_;
+	///
+	bool  allowswide_;
+	///
+	bool  allowssideways_;
+	///
 	mutable std::string html_tag_;
-	/// 
-	mutable std::string html_class_;
-	/// 
-	std::string html_style_;
 	///
-	bool builtin_;
+	mutable std::string html_attrib_;
+	///
+	mutable std::string defaultcssclass_;
+	///
+	docstring html_style_;
 };