#include "FuncStatus.h"
#include "LaTeXFeatures.h"
#include "Lexer.h"
+#include "output_xhtml.h"
#include "ParIterator.h"
#include "TextClass.h"
// Lgb
-InsetFloat::InsetFloat(Buffer const & buf, string const & type)
+InsetFloat::InsetFloat(Buffer * buf, string const & type)
: InsetCollapsable(buf), name_(from_utf8(type))
{
setLabel(_("float: ") + floatName(type));
flag.setEnabled(true);
return true;
+ case LFUN_INSET_SETTINGS:
+ if (InsetCollapsable::getStatus(cur, cmd, flag)) {
+ flag.setEnabled(flag.enabled() && !params_.subfloat);
+ return true;
+ } else
+ return false;
+
default:
return InsetCollapsable::getStatus(cur, cmd, flag);
}
}
-void InsetFloat::updateLabels(ParIterator const & it)
+void InsetFloat::updateLabels(ParIterator const & it, bool out)
{
Counters & cnts =
buffer().masterBuffer()->params().documentClass().counters();
cnts.current_float(params().type);
cnts.isSubfloat(subflt);
- InsetCollapsable::updateLabels(it);
+ InsetCollapsable::updateLabels(it, out);
//reset afterwards
cnts.current_float(saveflt);
}
-docstring InsetFloat::xhtml(odocstream & os, OutputParams const & rp) const
+docstring InsetFloat::xhtml(XHTMLStream & xs, OutputParams const & rp) const
{
FloatList const & floats = buffer().params().documentClass().floats();
Floating const & ftype = floats.getType(params_.type);
- string const htmltype = ftype.htmlType().empty() ?
- "div" : ftype.htmlType();
- string const htmlclass = ftype.htmlClass().empty() ?
- "float-" + params_.type : ftype.htmlClass();
- docstring const otag =
- from_ascii("<" + htmltype + " class='float " + htmlclass + "'>\n");
- docstring const ctag = from_ascii("</" + htmltype + ">\n");
-
- odocstringstream out;
+ string const & htmltype = ftype.htmlTag();
+ string const & attr = ftype.htmlAttrib();
- out << otag;
- docstring def = InsetText::xhtml(out, rp);
- out << ctag;
+ odocstringstream ods;
+ XHTMLStream newxs(ods);
+ newxs << StartTag(htmltype, attr);
+ InsetText::XHTMLOptions const opts =
+ InsetText::WriteLabel | InsetText::WriteInnerTag;
+ docstring deferred = InsetText::insetAsXHTML(newxs, rp, opts);
+ newxs << EndTag(htmltype);
if (rp.inFloat == OutputParams::NONFLOAT)
// In this case, this float needs to be deferred, but we'll put it
// before anything the text itself deferred.
- def = out.str() + '\n' + def;
+ deferred = ods.str() + '\n' + deferred;
else
// In this case, the whole thing is already being deferred, so
// we can write to the stream.
- os << out.str();
- return def;
+ // Note that things will already have been escaped, so we do not
+ // want to escape them again.
+ xs << XHTMLStream::NextRaw() << ods.str();
+ return deferred;
}
bool InsetFloat::insetAllowed(InsetCode code) const
{
- return code != FOOT_CODE
- && code != MARGIN_CODE
- && (code != FLOAT_CODE || !params_.subfloat);
+ // The case that code == FLOAT_CODE is handled in Text3.cpp,
+ // because we need to know what type of float is meant.
+ switch(code) {
+ case WRAP_CODE:
+ case FOOT_CODE:
+ case MARGIN_CODE:
+ return false;
+ default:
+ return InsetCollapsable::insetAllowed(code);
+ }
}