Fix for bug #11974

[features.git] / src / Floating.cpp

diff --git a/src/Floating.cpp b/src/Floating.cpp
index ecd325f3d3793061316bd734c5107b17d7cc2732..6a532aa7c99edbc8a39469c7d7eb38408105792c 100644 (file)
--- a/src/Floating.cpp
+++ b/src/Floating.cpp
@@ -42,8 +42,8 @@ Floating::Floating(string const & type, string const & placement,
          usesfloatpkg_(usesfloat), ispredefined_(ispredefined),
          allowswide_(allowswide), allowssideways_(allowssideways),
          html_tag_(htmlTag), html_attrib_(htmlAttrib), html_style_(htmlStyle),
-         docbook_tag_(docbookTag), docbook_tag_type_(docbookTagType),
-         docbook_caption_(docbookCaption)
+         docbook_caption_(docbookCaption), docbook_tag_(docbookTag),
+         docbook_tag_type_(docbookTagType)
 {
        // Implement some edge cases for DocBook. Both docbook_float_type_ and docbook_attr_ must be computed
        // based on the given value of docbookFloatType; docbook_tag_ can still be guessed without correlation.
@@ -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;
        }
 }