X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFloating.cpp;h=e499692a6e4c3b01cf9964152ea570a776f94d15;hb=2098f1d8c20d51e63e670bcdc9da8996068975bf;hp=0e1730eabfa7d81bb5675e3d7d073299bad69798;hpb=4ad536375f7c38c121cb5a0f7c40e6e4891ec1f5;p=lyx.git

diff --git a/src/Floating.cpp b/src/Floating.cpp
index 0e1730eabf..e499692a6e 100644
--- a/src/Floating.cpp
+++ b/src/Floating.cpp
@@ -14,6 +14,8 @@
 
 #include "Floating.h"
 
+#include "support/lstrings.h"
+
 using namespace std;
 
 
@@ -27,12 +29,12 @@ 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 & htmlType,
-		   string const & htmlClass, string const & htmlStyle,
+		   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), htmlType_(htmlType),
-	  htmlClass_(htmlClass), htmlStyle_(htmlStyle), builtin_(builtin)
+	  style_(style), name_(name), listName_(listName), html_tag_(htmlTag),
+	  html_attrib_(htmlAttrib), html_style_(htmlStyle), builtin_(builtin)
 {}
 
 
@@ -80,19 +82,45 @@ string const & Floating::listName() const
 
 string const & Floating::htmlStyle() const
 {
-	return htmlStyle_;
+	return html_style_;
 }
 
 
-string const & Floating::htmlClass() const
+string const & Floating::htmlAttrib() const
 {
-	return htmlClass_;
+	if (html_attrib_.empty())
+		html_attrib_ = "class='float " + defaultCSSClass() + "'";
+	return html_attrib_;
 }
 
 
-string const & Floating::htmlType() const
+string const & Floating::htmlTag() const
 {
-	return htmlType_;
+	if (html_tag_.empty())
+		html_tag_ = "div";
+	return html_tag_;
+}
+
+
+string Floating::defaultCSSClass() const
+{ 
+	if (!defaultcssclass_.empty())
+		return defaultcssclass_;
+	string d;
+	string n = type_;
+	string::const_iterator it = n.begin();
+	string::const_iterator en = n.end();
+	for (; it != en; ++it) {
+		if (!isalpha(*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_;
 }