X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFloating.h;h=ab57c4dd94b174d891a10b281c601997fd15235b;hb=5be391b274f2cbf4a1da03bc5ee2136cb6c4e660;hp=0a2eb50bc9918ed5adb1dc9c6217fec623a1f779;hpb=968f7e8cacac366fe86466c1ed74a3cd5fe3387c;p=lyx.git diff --git a/src/Floating.h b/src/Floating.h index 0a2eb50bc9..ab57c4dd94 100644 --- a/src/Floating.h +++ b/src/Floating.h @@ -36,10 +36,11 @@ 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, + std::string const & htmlTag, std::string const & htmlAttrib, + docstring const & htmlStyle, std::string const & docbookTag, std::string const & docbookAttr, std::string const & docbookTagType, - std::string const & required, bool usesfloat, bool isprefined, + std::string const & docbookFloatType, std::string const & docbookCaption, + std::string const & required, bool usesfloat, bool ispredefined, bool allowswide, bool allowssideways); /// std::string const & floattype() const { return floattype_; } @@ -85,7 +86,7 @@ public: /// std::string docbookTag(bool hasTitle = false) const; /// - std::string const & docbookAttr() const; + std::string docbookAttr() const; /// std::string const & docbookTagType() const; /// @@ -135,10 +136,14 @@ private: // 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) + /// float tag + std::string docbook_tag_; + /// attributes for the float tag std::string docbook_attr_; /// DocBook tag type (block, paragraph, inline) mutable std::string docbook_tag_type_; + /// DocBook float type, to override float_type_ (figure, table, algorithm, video) + std::string docbook_float_type_; };