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

diff --git a/src/Floating.h b/src/Floating.h
index 3de7d450fc..d10694f92b 100644
--- a/src/Floating.h
+++ b/src/Floating.h
@@ -37,8 +37,9 @@ public:
 		 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);
+		 docstring const & htmlStyle, std::string const & docbookTag,
+		 std::string const & docbookAttr, std::string const & required,
+		 bool usesfloat, bool isprefined, bool allowswide, bool allowssideways);
 	///
 	std::string const & floattype() const { return floattype_; }
 	///
@@ -64,6 +65,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 +79,12 @@ public:
 	std::string const & htmlAttrib() const;
 	/// tag type, defaults to "div"
 	std::string const & htmlTag() const;
+	///
+	std::string const & docbookTag(bool hasTitle = false) const;
+	///
+	std::string const & docbookAttr() const;
+	///
+	std::string const & docbookCaption() const;
 private:
 	///
 	std::string defaultCSSClass() const;
@@ -100,6 +109,8 @@ private:
 	///
 	std::string allowedplacement_;
 	///
+	std::string required_;
+	///
 	bool usesfloatpkg_;
 	///
 	bool ispredefined_;
@@ -107,14 +118,20 @@ private:
 	bool  allowswide_;
 	///
 	bool  allowssideways_;
-	/// 
+	///
 	mutable std::string html_tag_;
-	/// 
+	///
 	mutable std::string html_attrib_;
 	///
 	mutable std::string defaultcssclass_;
-	/// 
+	///
 	docstring html_style_;
+	/// DocBook tag
+	mutable std::string docbook_tag_;
+	/// attribute (mostly, role)
+	mutable std::string docbook_caption_;
+	/// caption tag (mostly, either caption or title)
+	std::string docbook_attr_;
 };