X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFloating.cpp;h=92a2799684a4bc7dda00700f4ac710bbd9d2d25f;hb=639aa354448188f45e69d6bd1e0ef3dfcc938c5f;hp=42924205611382951ba3313b3b925c03c70e3439;hpb=4c9523862656fd0ab5140f742f011e1d73ec14ec;p=lyx.git

diff --git a/src/Floating.cpp b/src/Floating.cpp
index 4292420561..92a2799684 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,29 +24,27 @@ 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, 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_;
 }
 
@@ -59,7 +58,7 @@ string const & Floating::htmlTag() const
 
 
 string Floating::defaultCSSClass() const
-{ 
+{
 	if (!defaultcssclass_.empty())
 		return defaultcssclass_;
 	string d;
@@ -67,9 +66,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);