X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFloating.h;h=4672d9ac753b6f6cad0fef0b15b8ca17fe067628;hb=19f5aa58aa55fe210c689052967ade0f943f82fb;hp=3de7d450fce8ac88862af073383b7787282dca14;hpb=1f945177b9628b213c60872df88f2d155c3d6c54;p=lyx.git

diff --git a/src/Floating.h b/src/Floating.h
index 3de7d450fc..4672d9ac75 100644
--- a/src/Floating.h
+++ b/src/Floating.h
@@ -36,12 +36,16 @@ public:
 		 std::string const & style, std::string const & name,
 		 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,
+		 std::string const & htmlTag, std::string const & htmlAttrib,
+		 docstring const & htmlStyle,
+		 std::string const & docbookAttr, std::string const & docbookTagType,
+		 std::string const & required, bool usesfloat, bool ispredefined,
 		 bool allowswide, bool allowssideways);
 	///
 	std::string const & floattype() const { return floattype_; }
 	///
+	std::string docbookFloatType() const;
+	///
 	std::string const & placement() const { return placement_; }
 	///
 	std::string const & ext() const {return ext_; }
@@ -64,6 +68,8 @@ public:
 	std::string const & allowedPlacement() const { return allowedplacement_; }
 	///
 	bool usesFloatPkg() const { return usesfloatpkg_; }
+	/// allowed placement options
+	std::string const & required() const { return required_; }
 	///
 	bool isPredefined() const { return ispredefined_; }
 	///
@@ -76,6 +82,14 @@ public:
 	std::string const & htmlAttrib() const;
 	/// tag type, defaults to "div"
 	std::string const & htmlTag() const;
+	///
+	std::string docbookTag(bool hasTitle = false) const;
+	///
+	std::string docbookAttr() const;
+	///
+	std::string const & docbookTagType() const;
+	///
+	std::string const & docbookCaption() const;
 private:
 	///
 	std::string defaultCSSClass() const;
@@ -100,21 +114,31 @@ private:
 	///
 	std::string allowedplacement_;
 	///
+	std::string required_;
+	///
 	bool usesfloatpkg_;
 	///
 	bool ispredefined_;
 	///
-	bool  allowswide_;
+	bool allowswide_;
+	///
+	bool allowssideways_;
 	///
-	bool  allowssideways_;
-	/// 
 	mutable std::string html_tag_;
-	/// 
+	///
 	mutable std::string html_attrib_;
 	///
 	mutable std::string defaultcssclass_;
-	/// 
+	///
 	docstring html_style_;
+	// There is no way to override the DocBook tag based on the layouts: half of it is determined by whether the float
+	// has a title or not, an information that is not available in the layouts.
+	/// attribute (mostly, role)
+	mutable std::string docbook_caption_;
+	/// caption tag (mostly, either caption or title)
+	std::string docbook_attr_;
+	/// DocBook tag type (block, paragraph, inline)
+	mutable std::string docbook_tag_type_;
 };