X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFloating.cpp;h=61b3b15f9086fff71e0f22d92ccefc8106c02297;hb=364e0f72c41b1eebe34036c774189bf01465a715;hp=42924205611382951ba3313b3b925c03c70e3439;hpb=4c9523862656fd0ab5140f742f011e1d73ec14ec;p=lyx.git diff --git a/src/Floating.cpp b/src/Floating.cpp index 4292420561..61b3b15f90 100644 --- a/src/Floating.cpp +++ b/src/Floating.cpp @@ -16,6 +16,7 @@ #include "support/debug.h" #include "support/lstrings.h" +#include "support/textutils.h" using namespace std; @@ -23,22 +24,18 @@ 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 & refPrefix, + string const & htmlTag, string const & htmlAttrib, + string const & htmlStyle, bool usesfloat, bool ispredefined) : 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) + ispredefined_(ispredefined), html_tag_(htmlTag), + html_attrib_(htmlAttrib), html_style_(htmlStyle) {} @@ -67,9 +64,9 @@ string Floating::defaultCSSClass() const string::const_iterator it = n.begin(); string::const_iterator en = n.end(); for (; it != en; ++it) { - if (!isalpha(*it)) + if (!isAlphaASCII(*it)) d += "_"; - else if (islower(*it)) + else if (isLower(*it)) d += *it; else d += support::lowercase(*it);