X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFloating.h;h=3de7d450fce8ac88862af073383b7787282dca14;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=6cd518bf386e82487f2d59fa0f69cb9f9a797c1a;hpb=4ad536375f7c38c121cb5a0f7c40e6e4891ec1f5;p=lyx.git

diff --git a/src/Floating.h b/src/Floating.h
index 6cd518bf38..3de7d450fc 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,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, 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, bool usesfloat, bool isprefined,
+		 bool allowswide, bool allowssideways);
 	///
-	std::string const & type() const;
+	std::string const & floattype() const { return floattype_; }
 	///
-	std::string const & placement() const;
+	std::string const & placement() const { return placement_; }
 	///
-	std::string const & ext() const;
+	std::string const & ext() const {return ext_; }
 	///
-	std::string const & within() const;
+	std::string const & within() const { return within_; }
 	///
-	std::string const & style() const;
+	std::string const & style() const { return style_; }
 	///
-	std::string const & name() 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 & listName() const;
-	/// 
-	std::string const & htmlStyle() const;
+	bool usesFloatPkg() const { return usesfloatpkg_; }
 	///
-	std::string const & htmlClass() const;
+	bool isPredefined() const { return ispredefined_; }
 	///
-	std::string const & htmlType() const;
+	bool allowsWide() const { return allowswide_; }
 	///
-	bool builtin() const;
+	bool allowsSideways() const { return allowssideways_; }
+	/// style information, for preamble
+	docstring 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_;
 	///
@@ -70,15 +92,29 @@ private:
 	///
 	std::string name_;
 	///
-	std::string listName_;
-	/// HTML Element type, usually div
-	std::string htmlType_;
-	/// class attribute, e.g., float-table, for CSS
-	std::string htmlClass_;
-	/// CSS information for this element
-	std::string htmlStyle_;
+	std::string listname_;
+	///
+	std::string listcommand_;
+	///
+	std::string refprefix_;
+	///
+	std::string allowedplacement_;
+	///
+	bool usesfloatpkg_;
 	///
-	bool builtin_;
+	bool ispredefined_;
+	///
+	bool  allowswide_;
+	///
+	bool  allowssideways_;
+	/// 
+	mutable std::string html_tag_;
+	/// 
+	mutable std::string html_attrib_;
+	///
+	mutable std::string defaultcssclass_;
+	/// 
+	docstring html_style_;
 };