*
* \author Dekel Tsur
*
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "insetwrap.h"
-#include "insettext.h"
#include "buffer.h"
+#include "bufferparams.h"
#include "BufferView.h"
#include "debug.h"
-#include "funcrequest.h"
+#include "Floating.h"
#include "FloatList.h"
+#include "funcrequest.h"
#include "gettext.h"
#include "LaTeXFeatures.h"
-#include "lyxfont.h"
+#include "LColor.h"
#include "lyxlex.h"
-#include "lyxtext.h"
+#include "paragraph.h"
-#include "frontends/LyXView.h"
-#include "frontends/Dialogs.h"
+#include "support/tostr.h"
-#include "support/LOstream.h"
-#include "support/lstrings.h"
+#include "support/std_sstream.h"
-using std::ostream;
+
+using std::string;
using std::endl;
+using std::auto_ptr;
+using std::istringstream;
+using std::ostream;
+using std::ostringstream;
+
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();
setInsetName(type);
LyXTextClass const & tclass = bp.getLyXTextClass();
if (tclass.hasLayout(caplayout))
- inset.paragraph()->layout(tclass[caplayout]);
+ inset.paragraphs.begin()->layout(tclass[caplayout]);
}
-InsetWrap::InsetWrap(InsetWrap const & in, bool same_id)
- : InsetCollapsable(in, same_id), params_(in.params_)
-{}
-
-
InsetWrap::~InsetWrap()
{
- InsetWrapMailer mailer(*this);
- mailer.hideDialog();
+ InsetWrapMailer(*this).hideDialog();
}
dispatch_result InsetWrap::localDispatch(FuncRequest const & cmd)
{
- Inset::RESULT result = UNDISPATCHED;
-
switch (cmd.action) {
case LFUN_INSET_MODIFY: {
InsetWrapParams params;
params_.placement = params.placement;
params_.width = params.width;
- cmd.view()->updateInset(this, true);
- result = DISPATCHED;
+ cmd.view()->updateInset(this);
+ return DISPATCHED;
}
- break;
+
+ case LFUN_INSET_DIALOG_UPDATE:
+ InsetWrapMailer(*this).updateDialog(cmd.view());
+ return DISPATCHED;
+
default:
- result = InsetCollapsable::localDispatch(cmd);
+ return InsetCollapsable::localDispatch(cmd);
}
-
- return result;
}
void InsetWrapParams::write(ostream & os) const
{
- os << "Wrap " // getInsetName()
- << type << '\n';
+ os << "Wrap " << type << '\n';
- if (!placement.empty()) {
+ if (!placement.empty())
os << "placement " << placement << "\n";
- }
+
os << "width \"" << width.asString() << "\"\n";
}
}
-void InsetWrap::write(Buffer const * buf, ostream & os) const
+void InsetWrap::write(Buffer const & buf, ostream & os) const
{
params_.write(os);
InsetCollapsable::write(buf, os);
}
-void InsetWrap::read(Buffer const * buf, LyXLex & lex)
+void InsetWrap::read(Buffer const & buf, LyXLex & lex)
{
params_.read(lex);
InsetCollapsable::read(buf, lex);
}
-Inset * InsetWrap::clone(Buffer const &, bool same_id) const
+auto_ptr<InsetBase> InsetWrap::clone() const
{
- return new InsetWrap(*const_cast<InsetWrap *>(this), same_id);
+ return auto_ptr<InsetBase>(new InsetWrap(*this));
}
}
-int InsetWrap::latex(Buffer const * buf,
- ostream & os, bool fragile, bool fp) const
+int InsetWrap::latex(Buffer const & buf, ostream & os,
+ LatexRunParams const & runparams) const
{
os << "\\begin{floating" << params_.type << '}';
if (!params_.placement.empty()) {
}
os << '{' << params_.width.asLatexString() << "}%\n";
- int const i = inset.latex(buf, os, fragile, fp);
+ int const i = inset.latex(buf, os, runparams);
os << "\\end{floating" << params_.type << "}%\n";
return i + 2;
}
-int InsetWrap::docbook(Buffer const * buf, ostream & os, bool mixcont) const
+int InsetWrap::docbook(Buffer const & buf, ostream & os, bool mixcont) const
{
os << '<' << params_.type << '>';
int const i = inset.docbook(buf, os, mixcont);
}
-bool InsetWrap::insetAllowed(Inset::Code code) const
+bool InsetWrap::insetAllowed(InsetOld::Code code) const
{
switch(code) {
case FLOAT_CODE:
}
-int InsetWrap::getMaxWidth(BufferView * bv, UpdatableInset const * inset)
- const
-{
- if (owner() &&
- static_cast<UpdatableInset*>(owner())->getMaxWidth(bv, inset) < 0) {
- return -1;
- }
- if (!params_.width.zero()) {
- int const ww1 = latexTextWidth(bv);
- int const ww2 = InsetCollapsable::getMaxWidth(bv, inset);
- if (ww2 > 0 && ww2 < ww1) {
- return ww2;
- }
- return ww1;
- }
- // this should not happen!
- return InsetCollapsable::getMaxWidth(bv, inset);
-}
-
-
int InsetWrap::latexTextWidth(BufferView * bv) const
{
return params_.width.inPixels(InsetCollapsable::latexTextWidth(bv));
}
-string const & InsetWrap::type() const
-{
- return params_.type;
-}
-
-
-LyXLength const & InsetWrap::pageWidth() const
-{
- return params_.width;
-}
-
-
-void InsetWrap::pageWidth(LyXLength const & ll)
-{
- if (ll != params_.width) {
- params_.width = ll;
- need_update = FULL;
- }
-}
-
-
-void InsetWrap::placement(string const & p)
-{
- params_.placement = p;
-}
-
-
-string const & InsetWrap::placement() const
-{
- return params_.placement;
-}
-
-
bool InsetWrap::showInsetDialog(BufferView * bv) const
{
if (!inset.showInsetDialog(bv)) {
InsetWrap * tmp = const_cast<InsetWrap *>(this);
- InsetWrapMailer mailer(*tmp);
- mailer.showDialog();
+ InsetWrapMailer(*tmp).showDialog(bv);
}
return true;
}
-void InsetWrap::addToToc(toc::TocList & toclist, Buffer const * buf) const
+void InsetWrap::addToToc(lyx::toc::TocList & toclist, Buffer const & buf) const
{
// Now find the caption in the float...
- // We now tranverse the paragraphs of
- // the inset...
- Paragraph * tmp = inset.paragraph();
- while (tmp) {
+ ParagraphList::iterator tmp = inset.paragraphs.begin();
+ ParagraphList::iterator end = inset.paragraphs.end();
+
+ for (; tmp != end; ++tmp) {
if (tmp->layout()->name() == caplayout) {
- string const name = floatname(type(), buf->params);
+ 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);
+ lyx::toc::TocItem const item(tmp->id(), 0 , str);
toclist[name].push_back(item);
}
- tmp = tmp->next();
}
}
+string const InsetWrapMailer::name_("wrap");
+
InsetWrapMailer::InsetWrapMailer(InsetWrap & inset)
- : name_("wrap"), inset_(inset)
+ : inset_(inset)
{}
-string const InsetWrapMailer::inset2string() const
+string const InsetWrapMailer::inset2string(Buffer const &) const
{
- return params2string(name(), inset_.params());
+ return params2string(inset_.params());
}
{
params = InsetWrapParams();
- string name;
- string body = split(in, name, ' ');
-
- if (name != "wrap" || body.empty())
- return;
-
- // This is part of the inset proper that is usually swallowed
- // by Buffer::readInset
- body = split(body, name, '\n');
- if (!prefixIs(name, "Wrap "))
+ if (in.empty())
return;
- istringstream data(body);
+ istringstream data(in);
LyXLex lex(0,0);
lex.setStream(data);
- params.read(lex);
+ if (lex.isOK()) {
+ lex.next();
+ string const token = lex.getString();
+ if (token != name_)
+ return;
+ }
+
+ // This is part of the inset proper that is usually swallowed
+ // by Buffer::readInset
+ if (lex.isOK()) {
+ lex.next();
+ string const token = lex.getString();
+ if (token != "Wrap" || !lex.eatLine())
+ return;
+ }
+
+ if (lex.isOK()) {
+ params.read(lex);
+ }
}
-string const
-InsetWrapMailer::params2string(string const & name,
- InsetWrapParams const & params)
+string const InsetWrapMailer::params2string(InsetWrapParams const & params)
{
ostringstream data;
- data << name << ' ';
+ data << name_ << ' ';
params.write(data);
-
return data.str();
}
projects / lyx.git / blobdiff