#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;
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, std::string const & allowedplacement,
+ string const & htmlTag, string const & htmlAttrib,
+ docstring const & htmlStyle, string const & required,
+ bool usesfloat, bool ispredefined,
+ bool allowswide, bool allowssideways)
: 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), allowedplacement_(allowedplacement), required_(required),
+ usesfloatpkg_(usesfloat), ispredefined_(ispredefined),
+ allowswide_(allowswide), allowssideways_(allowssideways),
+ 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())
- html_attrib_ = "class='float " + defaultCSSClass() + "'";
+ html_attrib_ = "class='" + defaultCSSClass() + "'";
return html_attrib_;
}
string Floating::defaultCSSClass() const
-{
+{
if (!defaultcssclass_.empty())
return defaultcssclass_;
string d;
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);