X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFloating.cpp;h=513c4fac3432df9ab7d5187eac400f9c0069be51;hb=1d6573a330791fb34541f4092cd49e4559972489;hp=b3c99d4232314ad063a61e7e149d46e5dcfec849;hpb=d88e9655be4a8b390ed0b4b90bd22c77ae1755d3;p=lyx.git

diff --git a/src/Floating.cpp b/src/Floating.cpp
index b3c99d4232..513c4fac34 100644
--- a/src/Floating.cpp
+++ b/src/Floating.cpp
@@ -14,6 +14,10 @@
 
 #include "Floating.h"
 
+#include "support/debug.h"
+#include "support/lstrings.h"
+#include "support/textutils.h"
+
 using namespace std;
 
 
@@ -27,82 +31,53 @@ 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 & htmlClass, string const & htmlStyle,
-		   bool builtin)
-	: type_(type), placement_(placement), ext_(ext), within_(within),
-	  style_(style), name_(name), listName_(listName), htmlTag_(htmlTag),
-	  htmlClass_(htmlClass), htmlStyle_(htmlStyle), builtin_(builtin)
+		   string const & listName, std::string const & listCmd, 
+		   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)
 {}
 
 
-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
+string const & Floating::htmlAttrib() const
 {
-	return style_;
-}
-
-
-string const & Floating::name() const
-{
-	return name_;
-}
-
-
-string const & Floating::listName() const
-{
-	return listName_;
-}
-
-
-string const & Floating::htmlStyle() const
-{
-	return htmlStyle_;
-}
-
-
-string const & Floating::htmlClass() const
-{
-	if (htmlClass_.empty())
-		htmlClass_ = "float-" + type_;
-	return htmlClass_;
+	if (html_attrib_.empty())
+		html_attrib_ = "class='float " + defaultCSSClass() + "'";
+	return html_attrib_;
 }
 
 
 string const & Floating::htmlTag() const
 {
-	if (htmlTag_.empty())
-		htmlTag_ = "div";
-	return htmlTag_;
+	if (html_tag_.empty())
+		html_tag_ = "div";
+	return html_tag_;
 }
 
 
-bool Floating::builtin() const
-{
-	return builtin_;
+string Floating::defaultCSSClass() const
+{ 
+	if (!defaultcssclass_.empty())
+		return defaultcssclass_;
+	string d;
+	string n = floattype_;
+	string::const_iterator it = n.begin();
+	string::const_iterator en = n.end();
+	for (; it != en; ++it) {
+		if (!isAlphaASCII(*it))
+			d += "_";
+		else if (isLower(*it))
+			d += *it;
+		else
+			d += support::lowercase(*it);
+	}
+	// are there other characters we need to remove?
+	defaultcssclass_ = "float-" + d;
+	return defaultcssclass_;
 }