*
* 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 namespace lyx::support;
+
using std::ostream;
using std::endl;
+using std::auto_ptr;
+
// 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
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_)
{}
dispatch_result InsetFloat::localDispatch(FuncRequest const & cmd)
{
- Inset::RESULT result = UNDISPATCHED;
+ InsetOld::RESULT result = UNDISPATCHED;
switch (cmd.action) {
case LFUN_INSET_MODIFY: {
params_.placement = params.placement;
params_.wide = params.wide;
+ wide(params_.wide, cmd.view()->buffer()->params);
cmd.view()->updateInset(this);
result = DISPATCHED;
}
}
-Inset * InsetFloat::clone(Buffer const &, bool same_id) const
+auto_ptr<InsetBase> InsetFloat::clone() const
{
- return new InsetFloat(*const_cast<InsetFloat *>(this), same_id);
+ return auto_ptr<InsetBase>(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.
}
+int InsetFloat::linuxdoc(Buffer const * buf, ostream & os) const
+{
+ FloatList const & floats = buf->params.getLyXTextClass().floats();
+ string const tmptype = params_.type;
+ // Figure out the float placement to use.
+ // From lowest to highest:
+ // - float default placement
+ // - document wide default placement
+ // - specific float placement
+ // This is the same as latex, as linuxdoc is modeled after latex.
+
+ string placement;
+ string const buf_placement = buf->params.float_placement;
+ string const def_placement = floats.defaultPlacement(params_.type);
+ if (!params_.placement.empty()
+ && params_.placement != def_placement) {
+ placement = params_.placement;
+ } else if (params_.placement.empty()
+ && !buf_placement.empty()
+ && buf_placement != def_placement) {
+ placement = buf_placement;
+ }
+
+ os << "\n<" << tmptype ;
+ // We only output placement if different from the def_placement.
+ if (!placement.empty()) {
+ os << " loc=\"" << placement << '"';
+ }
+ os << ">";
+
+ int const i = inset.linuxdoc(buf, os);
+ os << "</" << tmptype << ">\n";
+
+ return i;
+}
+
+
int InsetFloat::docbook(Buffer const * buf, ostream & os, bool mixcont) const
{
os << '<' << params_.type << '>';
}
-bool InsetFloat::insetAllowed(Inset::Code code) const
+bool InsetFloat::insetAllowed(InsetOld::Code code) const
{
- if (code == Inset::FLOAT_CODE)
+ if (code == InsetOld::FLOAT_CODE)
return false;
if (inset.getLockingInset() != const_cast<InsetFloat *>(this))
return inset.insetAllowed(code);
- if ((code == Inset::FOOT_CODE) || (code == Inset::MARGIN_CODE))
+ if ((code == InsetOld::FOOT_CODE) || (code == InsetOld::MARGIN_CODE))
return false;
return true;
}
}
-string const & InsetFloat::type() const
-{
- return params_.type;
-}
-
-
void InsetFloat::wide(bool w, BufferParams const & bp)
{
params_.wide = w;
- string lab(_("float:"));
+ string lab(_("float: "));
lab += floatname(params_.type, bp);
if (params_.wide)
}
-void InsetFloat::addToToc(toc::TocList & toclist, Buffer const * buf) const
+void InsetFloat::addToToc(lyx::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);
+ lyx::toc::TocItem const item(pit->id(), 0 , str);
toclist[name].push_back(item);
}
}
{}
-string const InsetFloatMailer::inset2string() const
+string const InsetFloatMailer::inset2string(Buffer const &) const
{
return params2string(inset_.params());
}
{
params = InsetFloatParams();
- istringstream data(in);
+ if (in.empty())
+ return;
+
+ istringstream data(STRCONV(in));
LyXLex lex(0,0);
lex.setStream(data);
}
-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());
}