#include <config.h>
#include "insetwrap.h"
-#include "insettext.h"
#include "buffer.h"
+#include "bufferparams.h"
#include "BufferView.h"
+#include "cursor.h"
#include "debug.h"
-#include "funcrequest.h"
+#include "dispatchresult.h"
+#include "Floating.h"
#include "FloatList.h"
+#include "funcrequest.h"
+#include "FuncStatus.h"
#include "gettext.h"
#include "LaTeXFeatures.h"
-#include "Lsstream.h"
-#include "lyxfont.h"
+#include "LColor.h"
#include "lyxlex.h"
-#include "lyxtext.h"
-#include "Lsstream.h"
+#include "outputparams.h"
+#include "paragraph.h"
+#include "pariterator.h"
-#include "frontends/LyXView.h"
-#include "frontends/Dialogs.h"
+#include "support/convert.h"
-#include "support/LOstream.h"
-#include "support/tostr.h"
+#include <sstream>
-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");
+namespace {
string floatname(string const & type, BufferParams const & bp)
{
FloatList const & floats = bp.getLyXTextClass().floats();
FloatList::const_iterator it = floats[type];
- if (it == floats.end())
- return type;
-
- return _(it->second.name());
+ return (it == floats.end()) ? type : _(it->second.name());
}
} // namespace anon
InsetWrap::InsetWrap(BufferParams const & bp, string const & type)
: InsetCollapsable(bp)
{
- string lab(_("wrap: "));
- lab += floatname(type, bp);
- setLabel(lab);
+ setLabel(_("wrap: ") + floatname(type, bp));
LyXFont font(LyXFont::ALL_SANE);
font.decSize();
font.decSize();
params_.type = type;
params_.width = LyXLength(50, LyXLength::PCW);
setInsetName(type);
- LyXTextClass const & tclass = bp.getLyXTextClass();
- if (tclass.hasLayout(caplayout))
- inset.paragraphs.begin()->layout(tclass[caplayout]);
}
}
-dispatch_result InsetWrap::localDispatch(FuncRequest const & cmd)
+void InsetWrap::doDispatch(LCursor & cur, FuncRequest & cmd)
{
switch (cmd.action) {
case LFUN_INSET_MODIFY: {
InsetWrapParams params;
InsetWrapMailer::string2params(cmd.argument, params);
-
params_.placement = params.placement;
params_.width = params.width;
+ break;
+ }
+
+ case LFUN_INSET_DIALOG_UPDATE:
+ InsetWrapMailer(*this).updateDialog(&cur.bv());
+ break;
- cmd.view()->updateInset();
- return DISPATCHED;
+ case LFUN_MOUSE_RELEASE: {
+ if (cmd.button() == mouse_button::button3 && hitButton(cmd)) {
+ InsetWrapMailer(*this).showDialog(&cur.bv());
+ break;
+ }
+ InsetCollapsable::doDispatch(cur, cmd);
+ break;
+ }
+
+ default:
+ InsetCollapsable::doDispatch(cur, cmd);
+ break;
}
+}
+
+bool InsetWrap::getStatus(LCursor & cur, FuncRequest const & cmd,
+ FuncStatus & flag) const
+{
+ switch (cmd.action) {
+ case LFUN_INSET_MODIFY:
case LFUN_INSET_DIALOG_UPDATE:
- InsetWrapMailer(*this).updateDialog(cmd.view());
- return DISPATCHED;
+ flag.enabled(true);
+ return true;
default:
- return InsetCollapsable::localDispatch(cmd);
+ return InsetCollapsable::getStatus(cur, cmd, flag);
}
}
void InsetWrapParams::read(LyXLex & lex)
{
- if (lex.isOK()) {
- lex.next();
- string token = lex.getString();
- if (token == "placement") {
- lex.next();
- placement = lex.getString();
- } else {
- // take countermeasures
- lex.pushToken(token);
- }
+ string token;
+ lex >> token;
+ if (token == "placement")
+ lex >> placement;
+ else {
+ // take countermeasures
+ lex.pushToken(token);
}
- if (lex.isOK()) {
+ if (!lex)
+ return;
+ lex >> token;
+ if (token == "width") {
lex.next();
- string token = lex.getString();
- if (token == "width") {
- lex.next();
- width = LyXLength(lex.getString());
- } else {
- lyxerr << "InsetWrap::Read:: Missing 'width'-tag!"
- << endl;
- // take countermeasures
- lex.pushToken(token);
- }
+ width = LyXLength(lex.getString());
+ } else {
+ lyxerr << "InsetWrap::Read:: Missing 'width'-tag!"
+ << endl;
+ // take countermeasures
+ lex.pushToken(token);
}
}
-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);
}
-auto_ptr<InsetBase> InsetWrap::clone() const
+auto_ptr<InsetBase> InsetWrap::doClone() const
{
return auto_ptr<InsetBase>(new InsetWrap(*this));
}
}
-int InsetWrap::latex(Buffer const * buf, ostream & os,
- LatexRunParams const & runparams) const
+int InsetWrap::latex(Buffer const & buf, ostream & os,
+ OutputParams const & runparams) const
{
os << "\\begin{floating" << params_.type << '}';
- if (!params_.placement.empty()) {
+ if (!params_.placement.empty())
os << '[' << params_.placement << ']';
- }
- os << '{' << params_.width.asLatexString() << "}%\n";
-
- int const i = inset.latex(buf, os, runparams);
-
+ os << '{' << params_.width.asLatexString() << "}%\n";
+ int const i = InsetText::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,
+ OutputParams const & runparams) const
{
os << '<' << params_.type << '>';
- int const i = inset.docbook(buf, os, mixcont);
+ int const i = InsetText::docbook(buf, os, runparams);
os << "</" << params_.type << '>';
-
return i;
}
-bool InsetWrap::insetAllowed(InsetOld::Code code) const
+bool InsetWrap::insetAllowed(InsetBase::Code code) const
{
switch(code) {
case FLOAT_CODE:
}
-int InsetWrap::latexTextWidth(BufferView * bv) const
-{
- return params_.width.inPixels(InsetCollapsable::latexTextWidth(bv));
-}
-
-
bool InsetWrap::showInsetDialog(BufferView * bv) const
{
- if (!inset.showInsetDialog(bv)) {
- InsetWrap * tmp = const_cast<InsetWrap *>(this);
- InsetWrapMailer(*tmp).showDialog(bv);
- }
+ if (!InsetText::showInsetDialog(bv))
+ InsetWrapMailer(const_cast<InsetWrap &>(*this)).showDialog(bv);
return true;
}
-void InsetWrap::addToToc(lyx::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...
- ParagraphList::iterator tmp = inset.paragraphs.begin();
- ParagraphList::iterator end = inset.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);
}
}
}
}
-void InsetWrapMailer::string2params(string const & in,
- InsetWrapParams & params)
+void InsetWrapMailer::string2params(string const & in, InsetWrapParams & params)
{
params = InsetWrapParams();
-
if (in.empty())
return;
- istringstream data(STRCONV(in));
+ istringstream data(in);
LyXLex lex(0,0);
lex.setStream(data);
- if (lex.isOK()) {
- lex.next();
- string const token = lex.getString();
- if (token != name_)
- return;
- }
+ string name;
+ lex >> name;
+ if (!lex || name != name_)
+ return print_mailer_error("InsetWrapMailer", in, 1, name_);
// 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);
- }
+ // by LyXText::readInset
+ string id;
+ lex >> id;
+ if (!lex || id != "Wrap")
+ return print_mailer_error("InsetBoxMailer", in, 2, "Wrap");
+
+ // We have to read the type here!
+ lex >> params.type;
+ params.read(lex);
}
ostringstream data;
data << name_ << ' ';
params.write(data);
- return STRCONV(data.str());
+ return data.str();
}
projects / lyx.git / blobdiff