X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FFloating.cpp;h=92a2799684a4bc7dda00700f4ac710bbd9d2d25f;hb=279e656d6a7c4ee3647752cba8b9aa7d6ec6e0c2;hp=91f87a519ecf936b442f14579894d78e61c4d5ae;hpb=f630be890494c849981e4fb52ea4740506e92bed;p=lyx.git

diff --git a/src/Floating.cpp b/src/Floating.cpp
index 91f87a519e..92a2799684 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,70 +14,68 @@
 
 #include "Floating.h"
 
+#include "support/debug.h"
+#include "support/lstrings.h"
+#include "support/textutils.h"
 
-namespace lyx {
-
-using std::string;
+using namespace std;
 
 
-Floating::Floating()
-{}
+namespace lyx {
 
 
 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)
-	: type_(type), placement_(placement), ext_(ext), within_(within),
-	  style_(style), name_(name), listName_(listName), builtin_(builtin)
+		   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), 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
+string const & Floating::htmlAttrib() const
 {
-	return name_;
+	if (html_attrib_.empty())
+		html_attrib_ = "class='" + defaultCSSClass() + "'";
+	return html_attrib_;
 }
 
 
-string const & Floating::listName() const
+string const & Floating::htmlTag() const
 {
-	return listName_;
+	if (html_tag_.empty())
+		html_tag_ = "div";
+	return html_tag_;
 }
 
 
-bool Floating::builtin() const
+string Floating::defaultCSSClass() const
 {
-	return builtin_;
+	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_;
 }