tex2lyx: support for multiple indices and subindices

[lyx.git] / src / Floating.cpp

diff --git a/src/Floating.cpp b/src/Floating.cpp
index cf48630f69bac3ee80794f60bcbe0c58a4068231..513c4fac3432df9ab7d5187eac400f9c0069be51 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;
 
@@ -31,13 +32,14 @@ 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 & refPrefix,
-                        string const & htmlTag, string const & htmlAttrib, 
-                        string const & htmlStyle, bool needsfloat)
+                  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), listcommand_(listCmd),
-         refprefix_(refPrefix), needsfloatpkg_(needsfloat), html_tag_(htmlTag), 
-               html_attrib_(htmlAttrib), html_style_(htmlStyle)
+         refprefix_(refPrefix), usesfloatpkg_(usesfloat),
+         ispredefined_(ispredefined), html_tag_(htmlTag),
+         html_attrib_(htmlAttrib), html_style_(htmlStyle)
 {}
 
 
@@ -66,9 +68,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);