X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFloating.cpp;h=3dbc0a9f946dd2110c3359774ae62f9066f110b5;hb=bcde3d00165789db1e1ef183fab968c091faab8c;hp=513c4fac3432df9ab7d5187eac400f9c0069be51;hpb=3c0e3c16c8c75524cd25e2fd9f34e2f2e17af150;p=lyx.git diff --git a/src/Floating.cpp b/src/Floating.cpp index 513c4fac34..3dbc0a9f94 100644 --- a/src/Floating.cpp +++ b/src/Floating.cpp @@ -24,29 +24,28 @@ 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 & 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) {} string const & Floating::htmlAttrib() const { if (html_attrib_.empty()) - html_attrib_ = "class='float " + defaultCSSClass() + "'"; + html_attrib_ = "class='" + defaultCSSClass() + "'"; return html_attrib_; } @@ -60,7 +59,7 @@ string const & Floating::htmlTag() const string Floating::defaultCSSClass() const -{ +{ if (!defaultcssclass_.empty()) return defaultcssclass_; string d;