X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFloating.cpp;h=8309e79caa1297f47c313b4597f30dc3262e3e62;hb=0a603c5d0e370c8b9c9e0f5dfa024b6e500b2dd4;hp=e499692a6e4c3b01cf9964152ea570a776f94d15;hpb=ebfb4c09ad519401f476052996f1a2fb32fdcdae;p=lyx.git

diff --git a/src/Floating.cpp b/src/Floating.cpp
index e499692a6e..8309e79caa 100644
--- a/src/Floating.cpp
+++ b/src/Floating.cpp
@@ -14,7 +14,9 @@
 
 #include "Floating.h"
 
+#include "support/debug.h"
 #include "support/lstrings.h"
+#include "support/textutils.h"
 
 using namespace std;
 
@@ -22,74 +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, string const & htmlTag,
-		   string const & htmlAttrib, string const & htmlStyle,
-		   bool builtin)
-	: type_(type), placement_(placement), ext_(ext), within_(within),
-	  style_(style), name_(name), listName_(listName), html_tag_(htmlTag),
-	  html_attrib_(htmlAttrib), html_style_(htmlStyle), builtin_(builtin)
+		   string const & listName, std::string const & listCmd,
+		   string const & refPrefix, std::string const & allowedplacement,
+		   string const & htmlTag, string const & htmlAttrib,
+		   string 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), allowedplacement_(allowedplacement),
+	  usesfloatpkg_(usesfloat), ispredefined_(ispredefined),
+	  allowswide_(allowswide), allowssideways_(allowssideways),
+	  html_tag_(htmlTag), html_attrib_(htmlAttrib), html_style_(htmlStyle)
 {}
 
 
-string const & Floating::type() const
-{
-	return type_;
-}
-
-
-string const & Floating::placement() const
-{
-	return placement_;
-}
-
-
-string const & Floating::ext() const
-{
-	return ext_;
-}
-
-
-string const & Floating::within() const
-{
-	return within_;
-}
-
-
-string const & Floating::style() const
-{
-	return style_;
-}
-
-
-string const & Floating::name() const
-{
-	return name_;
-}
-
-
-string const & Floating::listName() const
-{
-	return listName_;
-}
-
-
-string const & Floating::htmlStyle() const
-{
-	return html_style_;
-}
-
-
 string const & Floating::htmlAttrib() const
 {
 	if (html_attrib_.empty())
-		html_attrib_ = "class='float " + defaultCSSClass() + "'";
+		html_attrib_ = "class='" + defaultCSSClass() + "'";
 	return html_attrib_;
 }
 
@@ -107,13 +62,13 @@ string Floating::defaultCSSClass() const
 	if (!defaultcssclass_.empty())
 		return defaultcssclass_;
 	string d;
-	string n = type_;
+	string n = floattype_;
 	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);
@@ -124,10 +79,4 @@ string Floating::defaultCSSClass() const
 }
 
 
-bool Floating::builtin() const
-{
-	return builtin_;
-}
-
-
 } // namespace lyx