DocBook: properly escape PI in InsetMarginal.

[lyx.git] / src / Floating.cpp

diff --git a/src/Floating.cpp b/src/Floating.cpp
index 61b3b15f9086fff71e0f22d92ccefc8106c02297..ebd1e41c09812f7f89ed6770451d1aa65326b953 100644 (file)
--- a/src/Floating.cpp
+++ b/src/Floating.cpp
@@ -27,22 +27,27 @@ namespace lyx {
 Floating::Floating(string const & type, string const & placement,
                   string const & ext, string const & within,
                   string const & style, string const & name,
-                  string const & listName, std::string const & listCmd, 
-                  string const & refPrefix,
-                  string const & htmlTag, string const & htmlAttrib, 
-                  string const & htmlStyle, bool usesfloat, bool ispredefined)
+                  string const & listName, std::string const & listCmd,
+                  string const & refPrefix, std::string const & allowedplacement,
+                  string const & htmlTag, string const & htmlAttrib,
+                  docstring const & htmlStyle, string const & docbookTag,
+                  string const & docbookAttr, string const & required,
+                  bool usesfloat, bool ispredefined,
+                  bool allowswide, bool allowssideways)
        : floattype_(type), placement_(placement), ext_(ext), within_(within),
          style_(style), name_(name), listname_(listName), listcommand_(listCmd),
-         refprefix_(refPrefix), usesfloatpkg_(usesfloat),
-         ispredefined_(ispredefined), html_tag_(htmlTag),
-         html_attrib_(htmlAttrib), html_style_(htmlStyle)
+         refprefix_(refPrefix), allowedplacement_(allowedplacement), required_(required),
+         usesfloatpkg_(usesfloat), ispredefined_(ispredefined),
+         allowswide_(allowswide), allowssideways_(allowssideways),
+         html_tag_(htmlTag), html_attrib_(htmlAttrib), html_style_(htmlStyle),
+         docbook_tag_(docbookTag), docbook_attr_(docbookAttr)
 {}
 
 
 string const & Floating::htmlAttrib() const
 {
        if (html_attrib_.empty())
-               html_attrib_ = "class='float " + defaultCSSClass() + "'";
+               html_attrib_ = "class='" + defaultCSSClass() + "'";
        return html_attrib_;
 }
 
@@ -56,7 +61,7 @@ string const & Floating::htmlTag() const
 
 
 string Floating::defaultCSSClass() const
-{ 
+{
        if (!defaultcssclass_.empty())
                return defaultcssclass_;
        string d;
@@ -77,4 +82,42 @@ string Floating::defaultCSSClass() const
 }
 
 
+string const & Floating::docbookAttr() const
+{
+       return docbook_attr_;
+}
+
+
+string const & Floating::docbookTag(bool hasTitle) const
+{
+       docbook_tag_ = "";
+       if (floattype_ == "figure") {
+               docbook_tag_ = hasTitle ? "figure" : "informalfigure";
+       } else if (floattype_ == "table") {
+               docbook_tag_ = hasTitle ? "table" : "informaltable";
+       } else if (floattype_ == "algorithm") {
+               // TODO: no good translation for now! Figures are the closest match, as they can contain text.
+               // Solvable as soon as https://github.com/docbook/docbook/issues/157 has a definitive answer.
+               docbook_tag_ = "figure";
+       }
+       return docbook_tag_;
+}
+
+
+string const & Floating::docbookCaption() const
+{
+       docbook_caption_ = "";
+       if (floattype_ == "figure") {
+               docbook_caption_ = "title";
+       } else if (floattype_ == "table") {
+               docbook_caption_ = "caption";
+       } else if (floattype_ == "algorithm") {
+               // TODO: no good translation for now! Figures are the closest match, as they can contain text.
+               // Solvable as soon as https://github.com/docbook/docbook/issues/157 has a definitive answer.
+               docbook_caption_ = "title";
+       }
+       return docbook_caption_;
+}
+
+
 } // namespace lyx