Account for old versions of Pygments

[lyx.git] / src / Floating.cpp

diff --git a/src/Floating.cpp b/src/Floating.cpp
index f0a4d93ffcdbb879e223136830293b52688fc0a3..72b81190a126f71c2bd3d2e3419d9d5bb4ca676b 100644 (file)
--- a/src/Floating.cpp
+++ b/src/Floating.cpp
@@ -14,81 +14,38 @@
 
 #include "Floating.h"
 
+#include "support/debug.h"
+#include "support/lstrings.h"
+#include "support/textutils.h"
+
 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 & htmlClass, string const & htmlStyle,
-                  bool builtin)
-       : type_(type), placement_(placement), ext_(ext), within_(within),
-         style_(style), name_(name), listName_(listName), html_tag_(htmlTag),
-         html_class_(htmlClass), html_style_(htmlStyle), 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
+string const & Floating::htmlAttrib() 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
-{
-       return name_;
-}
-
-
-string const & Floating::listName() const
-{
-       return listName_;
-}
-
-
-string const & Floating::htmlStyle() const
-{
-       return html_style_;
-}
-
-
-string const & Floating::htmlClass() const
-{
-       if (html_class_.empty())
-               html_class_ = "float-" + type_;
-       return html_class_;
+       if (html_attrib_.empty())
+               html_attrib_ = "class='" + defaultCSSClass() + "'";
+       return html_attrib_;
 }
 
 
@@ -100,9 +57,25 @@ string const & Floating::htmlTag() const
 }
 
 
-bool Floating::builtin() const
-{
-       return builtin_;
+string Floating::defaultCSSClass() const
+{ 
+       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_;
 }