#include "Floating.h"
#include "FloatList.h"
#include "funcrequest.h"
+#include "FuncStatus.h"
#include "gettext.h"
#include "LaTeXFeatures.h"
#include "LColor.h"
#include "lyxlex.h"
#include "outputparams.h"
#include "paragraph.h"
+#include "pariterator.h"
-#include "support/tostr.h"
+#include "support/convert.h"
#include <sstream>
namespace {
-// this should not be hardcoded, but be part of the definition
-// of the float (JMarc)
-string const caplayout("Caption");
-
string floatname(string const & type, BufferParams const & bp)
{
FloatList const & floats = bp.getLyXTextClass().floats();
params_.type = type;
params_.width = LyXLength(50, LyXLength::PCW);
setInsetName(type);
- LyXTextClass const & tclass = bp.getLyXTextClass();
- if (tclass.hasLayout(caplayout))
- paragraphs().begin()->layout(tclass[caplayout]);
}
InsetWrapMailer::string2params(cmd.argument, params);
params_.placement = params.placement;
params_.width = params.width;
- cur.bv().update();
break;
}
}
+bool InsetWrap::getStatus(LCursor & cur, FuncRequest const & cmd,
+ FuncStatus & flag) const
+{
+ switch (cmd.action) {
+ case LFUN_INSET_MODIFY:
+ case LFUN_INSET_DIALOG_UPDATE:
+ flag.enabled(true);
+ return true;
+
+ default:
+ return InsetCollapsable::getStatus(cur, cmd, flag);
+ }
+}
+
+
void InsetWrapParams::write(ostream & os) const
{
os << "Wrap " << type << '\n';
}
-bool InsetWrap::insetAllowed(InsetOld::Code code) const
+bool InsetWrap::insetAllowed(InsetBase::Code code) const
{
switch(code) {
case FLOAT_CODE:
void InsetWrap::addToToc(lyx::toc::TocList & toclist, Buffer const & buf) const
{
- // Now find the caption in the float...
- ParagraphList::const_iterator tmp = paragraphs().begin();
- ParagraphList::const_iterator end = paragraphs().end();
+ ParConstIterator pit = par_const_iterator_begin(*this);
+ ParConstIterator end = par_const_iterator_end(*this);
- for (; tmp != end; ++tmp) {
- if (tmp->layout()->name() == caplayout) {
- string const name = floatname(params_.type, buf.params());
+ // Find a caption layout in one of the (child inset's) pars
+ for (; pit != end; ++pit) {
+ if (pit->layout()->labeltype == LABEL_SENSITIVE) {
+ string const type = params_.type;
string const str =
- tostr(toclist[name].size() + 1)
- + ". " + tmp->asString(buf, false);
- lyx::toc::TocItem const item(tmp->id(), 0 , str);
- toclist[name].push_back(item);
+ convert<string>(toclist[type].size() + 1)
+ + ". " + pit->asString(buf, false);
+ lyx::toc::TocItem const item(pit->id(), 0 , str);
+ toclist[type].push_back(item);
}
}
}