Move several common types to support/types.h

[lyx.git] / src / Floating.cpp

diff --git a/src/Floating.cpp b/src/Floating.cpp
index a610c73b29ffdb060a69a5a7a3c9adecdd4fe7a0..fa93b97f44464c4b5d61b5a738dc4aac150b6441 100644 (file)
--- a/src/Floating.cpp
+++ b/src/Floating.cpp
@@ -11,6 +11,7 @@
  */
 
 #include <config.h>
+#include <set>
 
 #include "Floating.h"
 
@@ -30,7 +31,7 @@ Floating::Floating(string const & type, string const & placement,
                   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,
+                  docstring const & htmlStyle,
                   string const & docbookAttr, string const & docbookTagType,
            string const & required, bool usesfloat, bool ispredefined,
                   bool allowswide, bool allowssideways)
@@ -44,6 +45,26 @@ Floating::Floating(string const & type, string const & placement,
 {}
 
 
+std::string Floating::docbookFloatType() const
+{
+       // TODO: configure this in the layouts?
+       if (floattype_ == "figure" || floattype_ == "graph" ||
+                       floattype_ == "chart" || floattype_ == "scheme")  {
+               return "figure";
+       } else if (floattype_ == "table" || floattype_ == "tableau") {
+               return "table";
+       } else if (floattype_ == "algorithm") {
+               return "algorithm";
+       } else if (floattype_ == "video") {
+               return "video";
+       } 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())
@@ -82,25 +103,30 @@ string Floating::defaultCSSClass() const
 }
 
 
-string const & Floating::docbookAttr() const
+string Floating::docbookAttr() const
 {
-       return docbook_attr_;
+       std::set<std::string> achemso = { "chart", "graph", "scheme" };
+       // For algorithms, a type attribute must be mentioned, if not already present in docbook_attr_.
+       if (docbookFloatType() == "algorithm" && docbook_attr_.find("type=") != std::string::npos)
+               return docbook_attr_ + " type='algorithm'";
+       // Specific floats for achemso.
+       else if (docbookFloatType() == "figure" && achemso.find(floattype_) != achemso.end())
+               return docbook_attr_ + " type='" + floattype_ + "'";
+       else
+               return docbook_attr_;
 }
 
 
 string Floating::docbookTag(bool hasTitle) const
 {
-       if (floattype_ == "figure") {
+       // TODO: configure this in the layouts?
+       if (docbookFloatType() == "figure" || docbookFloatType() == "algorithm" || docbookFloatType() == "video") {
                return hasTitle ? "figure" : "informalfigure";
-       } else if (floattype_ == "table") {
+       } else if (docbookFloatType() == "table") {
                return 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.
-               return "figure";
        } else {
                // If nothing matches, return something that will not be valid.
-               LYXERR0("Unrecognised float type: " + floattype_);
+               LYXERR0("Unrecognised float type: " + floattype());
                return "float";
        }
 }
@@ -117,15 +143,10 @@ string const & Floating::docbookTagType() const
 string const & Floating::docbookCaption() const
 {
        docbook_caption_ = "";
-       if (floattype_ == "figure") {
+       if (floattype_ == "figure" || floattype_ == "algorithm")
                docbook_caption_ = "title";
-       } else if (floattype_ == "table") {
+       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_;
 }