Account for old versions of Pygments

[lyx.git] / src / Floating.cpp

diff --git a/src/Floating.cpp b/src/Floating.cpp
index 8cfdf8d746e94c960a49cdfcddea116b981beadc..72b81190a126f71c2bd3d2e3419d9d5bb4ca676b 100644 (file)
--- a/src/Floating.cpp
+++ b/src/Floating.cpp
@@ -16,6 +16,7 @@
 
 #include "support/debug.h"
 #include "support/lstrings.h"
+#include "support/textutils.h"
 
 using namespace std;
 
@@ -23,27 +24,27 @@ 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, std::string const & listCmd, 
-                        string const & htmlTag, string const & htmlAttrib, 
-                        string const & htmlStyle, bool needsfloat)
+                  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),
-         needsfloatpkg_(needsfloat), html_tag_(htmlTag), html_attrib_(htmlAttrib), 
-         html_style_(htmlStyle)
+         refprefix_(refPrefix), allowedplacement_(allowedplacement),
+         usesfloatpkg_(usesfloat), ispredefined_(ispredefined),
+         allowswide_(allowswide), allowssideways_(allowssideways),
+         html_tag_(htmlTag), html_attrib_(htmlAttrib), html_style_(htmlStyle)
 {}
 
 
 string const & Floating::htmlAttrib() const
 {
        if (html_attrib_.empty())
-               html_attrib_ = "class='float " + defaultCSSClass() + "'";
+               html_attrib_ = "class='" + defaultCSSClass() + "'";
        return html_attrib_;
 }
 
@@ -65,9 +66,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);