Fix a few warnings in Floating.

diff --git a/src/Floating.cpp b/src/Floating.cpp
index ecd325f3d3793061316bd734c5107b17d7cc2732..d396e8a2c7a0c81bd1f98f9b811a7a06a9d0052c 100644 (file)
--- a/src/Floating.cpp
+++ b/src/Floating.cpp
@@ -85,6 +85,10 @@ Floating::Floating(string const & type, string const & placement,
                // Specific floats for achemso.
                else if (docbook_float_type_ == "figure" && achemso.find(floattype_) != achemso.end())
                        docbook_attr_ += " type='" + floattype_ + "'";
+
+               // Finally, merge in the attributes given in argument.
+               if (!docbookAttr.empty())
+                       docbook_attr_ += " " + docbookAttr;
        }
 }
 

diff --git a/src/Floating.h b/src/Floating.h
index 7461e961921f37989d39120357b92869d9843c1f..7af2334148fdba2d6c72bd6b9e5750f25eee9b42 100644 (file)
--- a/src/Floating.h
+++ b/src/Floating.h
@@ -143,7 +143,7 @@ private:
        /// DocBook tag type (block, paragraph, inline)
        mutable std::string docbook_tag_type_;
        /// DocBook float type, to override float_type_ (figure, table, algorithm, video)
-       mutable std::string docbook_float_type_;
+       std::string docbook_float_type_;
 };