DocBook: fix for nomenclature xml:id and glossary paragraphs.

[lyx.git] / src / Floating.h

diff --git a/src/Floating.h b/src/Floating.h
index e4c9e130f9da6e16227b89b97afe8b49250d1b20..4672d9ac753b6f6cad0fef0b15b8ca17fe067628 100644 (file)
--- a/src/Floating.h
+++ b/src/Floating.h
@@ -36,13 +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, std::string const & requires,
-                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_; }
@@ -66,7 +69,7 @@ public:
        ///
        bool usesFloatPkg() const { return usesfloatpkg_; }
        /// allowed placement options
-       std::string const & requires() const { return requires_; }
+       std::string const & required() const { return required_; }
        ///
        bool isPredefined() const { return ispredefined_; }
        ///
@@ -79,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;
@@ -103,15 +114,15 @@ private:
        ///
        std::string allowedplacement_;
        ///
-       std::string requires_;
+       std::string required_;
        ///
        bool usesfloatpkg_;
        ///
        bool ispredefined_;
        ///
-       bool  allowswide_;
+       bool allowswide_;
        ///
-       bool  allowssideways_;
+       bool allowssideways_;
        ///
        mutable std::string html_tag_;
        ///
@@ -120,6 +131,14 @@ private:
        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_;
 };