X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFloating.cpp;h=61b3b15f9086fff71e0f22d92ccefc8106c02297;hb=52fee3556e63859f3ba52609e8f025a491767a81;hp=458dfb910384d61e381bcd65026db2c15ee23844;hpb=cbed4c3cc55ffba60c4feceda886deb8b235fc6c;p=lyx.git

diff --git a/src/Floating.cpp b/src/Floating.cpp
index 458dfb9103..61b3b15f90 100644
--- a/src/Floating.cpp
+++ b/src/Floating.cpp
@@ -14,9 +14,9 @@
 
 #include "Floating.h"
 
-#include "support/docstring.h"
+#include "support/debug.h"
 #include "support/lstrings.h"
-#include "support/Messages.h"
+#include "support/textutils.h"
 
 using namespace std;
 
@@ -24,42 +24,21 @@ 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 needsfloat)
+		   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), needsfloatpkg_(needsfloat),
-    html_tag_(htmlTag), html_attrib_(htmlAttrib), html_style_(htmlStyle)
+	  style_(style), name_(name), listname_(listName), listcommand_(listCmd),
+	  refprefix_(refPrefix), usesfloatpkg_(usesfloat),
+	  ispredefined_(ispredefined), html_tag_(htmlTag),
+	  html_attrib_(htmlAttrib), html_style_(htmlStyle)
 {}
 
 
-docstring const & Floating::listCommand(string const & lang) const
-{
-	if (listcommand_.empty()) {
-		if (needsFloatPkg())	
-			listcommand_ = from_ascii("\\listof{" + floattype_ + "}{")
-			   + getMessages(lang).get(listName()) + "}";
-		else {
-			if (floattype_ == "table")
-				listcommand_ = from_ascii("\\listoftables");
-			else if (floattype_ == "figure")
-				listcommand_ = from_ascii("\\listoffigures");
-			else
-				// FIXME We really need a special tag for this.
-				listcommand_ = from_ascii("\\listof" + floattype_ + "s");
-		}
-	}
-	return listcommand_;
-}
-
-
 string const & Floating::htmlAttrib() const
 {
 	if (html_attrib_.empty())
@@ -85,9 +64,9 @@ string Floating::defaultCSSClass() const
 	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);