*
* Full author contact details are available in file CREDITS
*/
-#include <config.h>
+#include <config.h>
#include "insetfloat.h"
#include "insettext.h"
#include "gettext.h"
#include "iterators.h"
#include "LaTeXFeatures.h"
+#include "Lsstream.h"
#include "lyxfont.h"
#include "lyxlex.h"
#include "lyxtext.h"
+#include "Lsstream.h"
#include "support/LOstream.h"
#include "support/lstrings.h"
+#include "support/tostr.h"
#include "frontends/LyXView.h"
#include "frontends/Dialogs.h"
using std::ostream;
using std::endl;
+
// With this inset it will be possible to support the latex package
// float.sty, and I am sure that with this and some additional support
// classes we can support similar functionality in other formats
setInsetName(type);
LyXTextClass const & tclass = bp.getLyXTextClass();
if (tclass.hasLayout(caplayout))
- inset.paragraph()->layout(tclass[caplayout]);
+ inset.paragraphs.begin()->layout(tclass[caplayout]);
}
-InsetFloat::InsetFloat(InsetFloat const & in, bool same_id)
- : InsetCollapsable(in, same_id), params_(in.params_)
+InsetFloat::InsetFloat(InsetFloat const & in)
+ : InsetCollapsable(in), params_(in.params_)
{}
params_.placement = params.placement;
params_.wide = params.wide;
- cmd.view()->updateInset(this, true);
+ wide(params_.wide, cmd.view()->buffer()->params);
+ cmd.view()->updateInset(this);
result = DISPATCHED;
}
break;
+
+ case LFUN_INSET_DIALOG_UPDATE: {
+ InsetFloatMailer mailer(*this);
+ mailer.updateDialog(cmd.view());
+ }
+ break;
+
default:
result = InsetCollapsable::localDispatch(cmd);
}
void InsetFloat::validate(LaTeXFeatures & features) const
{
- if (contains(placement(), "H")) {
+ if (contains(params_.placement, "H")) {
features.require("float");
}
}
-Inset * InsetFloat::clone(Buffer const &, bool same_id) const
+Inset * InsetFloat::clone() const
{
- return new InsetFloat(*const_cast<InsetFloat *>(this), same_id);
+ return new InsetFloat(*this);
}
}
-int InsetFloat::latex(Buffer const * buf,
- ostream & os, bool fragile, bool fp) const
+int InsetFloat::latex(Buffer const * buf, ostream & os,
+ LatexRunParams const & runparams) const
{
FloatList const & floats = buf->params.getLyXTextClass().floats();
string const tmptype = (params_.wide ? params_.type + "*" : params_.type);
}
os << '\n';
- int const i = inset.latex(buf, os, fragile, fp);
+ int const i = inset.latex(buf, os, runparams);
// The \n is used to force \end{<floatname>} to appear in a new line.
// In this case, we do not case if the current output line is empty.
if (!inset.showInsetDialog(bv)) {
InsetFloat * tmp = const_cast<InsetFloat *>(this);
InsetFloatMailer mailer(*tmp);
- mailer.showDialog();
+ mailer.showDialog(bv);
}
return true;
}
-string const & InsetFloat::type() const
-{
- return params_.type;
-}
-
-
-void InsetFloat::placement(string const & p)
-{
- // FIX: Here we should only allow the placement to be set
- // if a valid value.
- params_.placement = p;
-}
-
-
-string const & InsetFloat::placement() const
-{
- return params_.placement;
-}
-
-
void InsetFloat::wide(bool w, BufferParams const & bp)
{
params_.wide = w;
}
-bool InsetFloat::wide() const
-{
- return params_.wide;
-}
-
-
void InsetFloat::addToToc(toc::TocList & toclist, Buffer const * buf) const
{
- ParIterator pit(inset.paragraph());
- ParIterator end;
+ ParIterator pit(inset.paragraphs.begin(), inset.paragraphs);
+ ParIterator end(inset.paragraphs.end(), inset.paragraphs);
// Find a caption layout in one of the (child inset's) pars
for (; pit != end; ++pit) {
- Paragraph * tmp = *pit;
-
- if (tmp->layout()->name() == caplayout) {
- string const name = floatname(type(), buf->params);
+ if (pit->layout()->name() == caplayout) {
+ string const name = floatname(params_.type, buf->params);
string const str =
tostr(toclist[name].size() + 1)
- + ". " + tmp->asString(buf, false);
- toc::TocItem const item(tmp->id(), 0 , str);
+ + ". " + pit->asString(buf, false);
+ toc::TocItem const item(pit->id(), 0 , str);
toclist[name].push_back(item);
}
}
{
params = InsetFloatParams();
- istringstream data(in);
+ if (in.empty())
+ return;
+
+ istringstream data(STRCONV(in));
LyXLex lex(0,0);
lex.setStream(data);
return;
}
- params.read(lex);
+ if (lex.isOK()) {
+ params.read(lex);
+ }
}
-string const
-InsetFloatMailer::params2string(InsetFloatParams const & params)
+string const InsetFloatMailer::params2string(InsetFloatParams const & params)
{
ostringstream data;
data << name_ << ' ';
params.write(data);
-
- return data.str();
+ return STRCONV(data.str());
}