X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFloating.cpp;h=92a2799684a4bc7dda00700f4ac710bbd9d2d25f;hb=c0a1893008bd13650d470afff16f56720b65c87c;hp=61b3b15f9086fff71e0f22d92ccefc8106c02297;hpb=065db6806771190d12d37d64c4c86f9c5ebaf225;p=lyx.git diff --git a/src/Floating.cpp b/src/Floating.cpp index 61b3b15f90..92a2799684 100644 --- a/src/Floating.cpp +++ b/src/Floating.cpp @@ -27,22 +27,24 @@ 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, 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), + usesfloatpkg_(usesfloat), ispredefined_(ispredefined), + allowswide_(allowswide), allowssideways_(allowssideways), + html_tag_(htmlTag), html_attrib_(htmlAttrib), html_style_(htmlStyle) {} string const & Floating::htmlAttrib() const { if (html_attrib_.empty()) - html_attrib_ = "class='float " + defaultCSSClass() + "'"; + html_attrib_ = "class='" + defaultCSSClass() + "'"; return html_attrib_; } @@ -56,7 +58,7 @@ string const & Floating::htmlTag() const string Floating::defaultCSSClass() const -{ +{ if (!defaultcssclass_.empty()) return defaultcssclass_; string d;