X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFloating.cpp;h=ebd1e41c09812f7f89ed6770451d1aa65326b953;hb=d0748cd69ccaf025ec3ebe376811ed29c5580b2b;hp=f0a4d93ffcdbb879e223136830293b52688fc0a3;hpb=a144ccd92ccd3b3ada07b51b18fafa5d1cacee47;p=lyx.git

diff --git a/src/Floating.cpp b/src/Floating.cpp
index f0a4d93ffc..ebd1e41c09 100644
--- a/src/Floating.cpp
+++ b/src/Floating.cpp
@@ -14,95 +14,109 @@
 
 #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, string const & docbookTag,
+		   string const & docbookAttr, 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), 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),
+	  docbook_tag_(docbookTag), docbook_attr_(docbookAttr)
 {}
 
 
-string const & Floating::type() const
-{
-	return type_;
-}
-
-
-string const & Floating::placement() const
-{
-	return placement_;
-}
-
-
-string const & Floating::ext() const
-{
-	return ext_;
-}
-
-
-string const & Floating::within() const
+string const & Floating::htmlAttrib() const
 {
-	return within_;
+	if (html_attrib_.empty())
+		html_attrib_ = "class='" + defaultCSSClass() + "'";
+	return html_attrib_;
 }
 
 
-string const & Floating::style() const
-{
-	return style_;
-}
-
-
-string const & Floating::name() const
-{
-	return name_;
-}
-
-
-string const & Floating::listName() const
+string const & Floating::htmlTag() const
 {
-	return listName_;
+	if (html_tag_.empty())
+		html_tag_ = "div";
+	return html_tag_;
 }
 
 
-string const & Floating::htmlStyle() const
+string Floating::defaultCSSClass() const
 {
-	return html_style_;
+	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_;
 }
 
 
-string const & Floating::htmlClass() const
+string const & Floating::docbookAttr() const
 {
-	if (html_class_.empty())
-		html_class_ = "float-" + type_;
-	return html_class_;
+	return docbook_attr_;
 }
 
 
-string const & Floating::htmlTag() const
+string const & Floating::docbookTag(bool hasTitle) const
 {
-	if (html_tag_.empty())
-		html_tag_ = "div";
-	return html_tag_;
+	docbook_tag_ = "";
+	if (floattype_ == "figure") {
+		docbook_tag_ = hasTitle ? "figure" : "informalfigure";
+	} else if (floattype_ == "table") {
+		docbook_tag_ = hasTitle ? "table" : "informaltable";
+	} else if (floattype_ == "algorithm") {
+		// TODO: no good translation for now! Figures are the closest match, as they can contain text.
+		// Solvable as soon as https://github.com/docbook/docbook/issues/157 has a definitive answer.
+		docbook_tag_ = "figure";
+	}
+	return docbook_tag_;
 }
 
 
-bool Floating::builtin() const
+string const & Floating::docbookCaption() const
 {
-	return builtin_;
+	docbook_caption_ = "";
+	if (floattype_ == "figure") {
+		docbook_caption_ = "title";
+	} else if (floattype_ == "table") {
+		docbook_caption_ = "caption";
+	} else if (floattype_ == "algorithm") {
+		// TODO: no good translation for now! Figures are the closest match, as they can contain text.
+		// Solvable as soon as https://github.com/docbook/docbook/issues/157 has a definitive answer.
+		docbook_caption_ = "title";
+	}
+	return docbook_caption_;
 }