DocBook: fix file inclusion.

[lyx.git] / src / Floating.cpp

diff --git a/src/Floating.cpp b/src/Floating.cpp
index 531a066b2c8fca7178b5fef98a9fc3aa77769f2d..6ae52b4d2247f2af70e4eb743d320d5d1171689c 100644 (file)
--- a/src/Floating.cpp
+++ b/src/Floating.cpp
@@ -16,6 +16,7 @@
 
 #include "support/debug.h"
 #include "support/lstrings.h"
+#include "support/textutils.h"
 
 using namespace std;
 
@@ -23,29 +24,49 @@ using namespace std;
 namespace lyx {
 
 
-Floating::Floating()
-{}
-
-
 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 & docbookAttr, string const & docbookTagType,
+           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_attr_(docbookAttr), docbook_tag_type_(docbookTagType)
 {}
 
 
+std::string Floating::docbookFloatType() const
+{
+       // TODO: configure this in the layouts?
+       if (floattype_ == "figure") {
+               return "figure";
+       } else if (floattype_ == "table" || floattype_ == "tableau") {
+               return "table";
+       } 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.
+               return "algorithm";
+       } else {
+               // If nothing matches, return something that will not be valid.
+               LYXERR0("Unrecognised float type: " + floattype_);
+               return "unknown";
+       }
+}
+
+
 string const & Floating::htmlAttrib() const
 {
        if (html_attrib_.empty())
-               html_attrib_ = "class='float " + defaultCSSClass() + "'";
+               html_attrib_ = "class='" + defaultCSSClass() + "'";
        return html_attrib_;
 }
 
@@ -59,7 +80,7 @@ string const & Floating::htmlTag() const
 
 
 string Floating::defaultCSSClass() const
-{ 
+{
        if (!defaultcssclass_.empty())
                return defaultcssclass_;
        string d;
@@ -67,9 +88,9 @@ string Floating::defaultCSSClass() const
        string::const_iterator it = n.begin();
        string::const_iterator en = n.end();
        for (; it != en; ++it) {
-               if (!isalpha(*it))
+               if (!isAlphaASCII(*it))
                        d += "_";
-               else if (islower(*it))
+               else if (isLower(*it))
                        d += *it;
                else
                        d += support::lowercase(*it);
@@ -80,4 +101,53 @@ string Floating::defaultCSSClass() const
 }
 
 
+string const & Floating::docbookAttr() const
+{
+       return docbook_attr_;
+}
+
+
+string Floating::docbookTag(bool hasTitle) const
+{
+       // TODO: configure this in the layouts?
+       if (docbookFloatType() == "figure") {
+               return hasTitle ? "figure" : "informalfigure";
+       } else if (docbookFloatType() == "table") {
+               return hasTitle ? "table" : "informaltable";
+       } else if (docbookFloatType() == "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.
+               return "figure";
+       } else {
+               // If nothing matches, return something that will not be valid.
+               LYXERR0("Unrecognised float type: " + floattype());
+               return "float";
+       }
+}
+
+
+string const & Floating::docbookTagType() const
+{
+       if (docbook_tag_type_ != "block" && docbook_tag_type_ != "paragraph" && docbook_tag_type_ != "inline")
+               docbook_tag_type_ = "block";
+       return docbook_tag_type_;
+}
+
+
+string const & Floating::docbookCaption() const
+{
+       docbook_caption_ = "";
+       if (floattype_ == "figure") {
+               docbook_caption_ = "title";
+       } else if (floattype_ == "table" || floattype_ == "tableau") {
+               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