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 8cf5c505a2cb80ef92c68a83542753f86c13dc2f..4672d9ac753b6f6cad0fef0b15b8ca17fe067628 100644 (file)
--- a/src/Floating.h
+++ b/src/Floating.h
@@ -12,11 +12,13 @@
 #ifndef FLOATING_H
 #define FLOATING_H
 
+#include "support/strfwd.h"
+
 #include <string>
 
 
 namespace lyx {
-       
+
 /** This is a "float layout" object. It contains the parameters for how to
  *  handle the different kinds of floats, default ones and user created ones.
  *  Objects of this class is stored in a container in FloatList. The different
@@ -34,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,
-                std::string 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_; }
@@ -62,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_; }
        ///
@@ -69,11 +77,19 @@ public:
        ///
        bool allowsSideways() const { return allowssideways_; }
        /// style information, for preamble
-       std::string const & htmlStyle() const { return html_style_; }
+       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;
+       ///
+       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;
@@ -98,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_;
-       /// 
-       std::string html_style_;
+       ///
+       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_;
 };