X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFloating.cpp;h=e499692a6e4c3b01cf9964152ea570a776f94d15;hb=2098f1d8c20d51e63e670bcdc9da8996068975bf;hp=9da1f1a3899ba899dd3d1438db48aee7fa6e1303;hpb=3e3955c4f3ee3302d2e1aae643be37ee3b758512;p=lyx.git

diff --git a/src/Floating.cpp b/src/Floating.cpp
index 9da1f1a389..e499692a6e 100644
--- a/src/Floating.cpp
+++ b/src/Floating.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Jean-Marc Lasgouttes
  * \author Angus Leeming
  *
@@ -14,7 +14,9 @@
 
 #include "Floating.h"
 
-using std::string;
+#include "support/lstrings.h"
+
+using namespace std;
 
 
 namespace lyx {
@@ -27,9 +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, bool builtin)
+		   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), builtin_(builtin)
+	  style_(style), name_(name), listName_(listName), html_tag_(htmlTag),
+	  html_attrib_(htmlAttrib), html_style_(htmlStyle), builtin_(builtin)
 {}
 
 
@@ -75,6 +80,50 @@ string const & Floating::listName() const
 }
 
 
+string const & Floating::htmlStyle() const
+{
+	return html_style_;
+}
+
+
+string const & Floating::htmlAttrib() const
+{
+	if (html_attrib_.empty())
+		html_attrib_ = "class='float " + defaultCSSClass() + "'";
+	return html_attrib_;
+}
+
+
+string const & Floating::htmlTag() const
+{
+	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_;
+}
+
+
 bool Floating::builtin() const
 {
 	return builtin_;