X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetfloat.C;h=7c164979a50f4fa3d838fdab20450524cc26a35c;hb=b1fb034c3be30101b06286f74815a708142d52e8;hp=b43540ccdc1ea5d4f3240f2c4dcdecd54529de1f;hpb=99d1627a471b92f403598d03dfc861ddc3c11be0;p=lyx.git diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C index b43540ccdc..7c164979a5 100644 --- a/src/insets/insetfloat.C +++ b/src/insets/insetfloat.C @@ -8,30 +8,38 @@ * * Full author contact details are available in file CREDITS */ -#include +#include #include "insetfloat.h" +#include "insettext.h" + +#include "buffer.h" +#include "BufferView.h" +#include "debug.h" +#include "Floating.h" +#include "FloatList.h" +#include "funcrequest.h" #include "gettext.h" +#include "iterators.h" +#include "LaTeXFeatures.h" +#include "Lsstream.h" #include "lyxfont.h" -#include "BufferView.h" +#include "lyxlex.h" #include "lyxtext.h" -#include "insets/insettext.h" +#include "Lsstream.h" + #include "support/LOstream.h" #include "support/lstrings.h" -#include "FloatList.h" -#include "LaTeXFeatures.h" -#include "debug.h" -#include "Floating.h" -#include "buffer.h" +#include "support/tostr.h" + #include "frontends/LyXView.h" #include "frontends/Dialogs.h" -#include "lyxlex.h" -#include "iterators.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 @@ -119,7 +127,7 @@ string floatname(string const & type, BufferParams const & bp) InsetFloat::InsetFloat(BufferParams const & bp, string const & type) - : InsetCollapsable(bp), wide_(false) + : InsetCollapsable(bp) { string lab(_("float: ")); lab += floatname(type, bp); @@ -129,52 +137,82 @@ InsetFloat::InsetFloat(BufferParams const & bp, string const & type) font.decSize(); font.setColor(LColor::collapsable); setLabelFont(font); - floatType_ = type; + params_.type = type; 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), floatType_(in.floatType_), - floatPlacement_(in.floatPlacement_), wide_(in.wide_) + : InsetCollapsable(in, same_id), params_(in.params_) {} InsetFloat::~InsetFloat() { - hideDialog(); + InsetFloatMailer mailer(*this); + mailer.hideDialog(); } -void InsetFloat::write(Buffer const * buf, ostream & os) const +dispatch_result InsetFloat::localDispatch(FuncRequest const & cmd) +{ + Inset::RESULT result = UNDISPATCHED; + + switch (cmd.action) { + case LFUN_INSET_MODIFY: { + InsetFloatParams params; + InsetFloatMailer::string2params(cmd.argument, params); + + params_.placement = params.placement; + params_.wide = params.wide; + + 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); + } + + return result; +} + + +void InsetFloatParams::write(ostream & os) const { os << "Float " // getInsetName() - << floatType_ << '\n'; + << type << '\n'; - if (!floatPlacement_.empty()) { - os << "placement " << floatPlacement_ << "\n"; + if (!placement.empty()) { + os << "placement " << placement << "\n"; } - if (wide_) { + if (wide) { os << "wide true\n"; } else { os << "wide false\n"; } - - InsetCollapsable::write(buf, os); } -void InsetFloat::read(Buffer const * buf, LyXLex & lex) +void InsetFloatParams::read(LyXLex & lex) { if (lex.isOK()) { lex.next(); string token = lex.getString(); if (token == "placement") { lex.next(); - floatPlacement_ = lex.getString(); + placement = lex.getString(); } else { // take countermeasures lex.pushToken(token); @@ -184,10 +222,7 @@ void InsetFloat::read(Buffer const * buf, LyXLex & lex) if (token == "wide") { lex.next(); string const tmptoken = lex.getString(); - if (tmptoken == "true") - wide(true, buf->params); - else - wide(false, buf->params); + wide = (tmptoken == "true"); } else { lyxerr << "InsetFloat::Read:: Missing wide!" << endl; @@ -195,17 +230,31 @@ void InsetFloat::read(Buffer const * buf, LyXLex & lex) lex.pushToken(token); } } +} + + +void InsetFloat::write(Buffer const * buf, ostream & os) const +{ + params_.write(os); + InsetCollapsable::write(buf, os); +} + + +void InsetFloat::read(Buffer const * buf, LyXLex & lex) +{ + params_.read(lex); + wide(params_.wide, buf->params); InsetCollapsable::read(buf, lex); } void InsetFloat::validate(LaTeXFeatures & features) const { - if (contains(placement(), "H")) { + if (contains(params_.placement, "H")) { features.require("float"); } - features.useFloat(floatType_); + features.useFloat(params_.type); InsetCollapsable::validate(features); } @@ -226,7 +275,7 @@ int InsetFloat::latex(Buffer const * buf, ostream & os, bool fragile, bool fp) const { FloatList const & floats = buf->params.getLyXTextClass().floats(); - string const tmptype = (wide_ ? floatType_ + "*" : floatType_); + string const tmptype = (params_.wide ? params_.type + "*" : params_.type); // Figure out the float placement to use. // From lowest to highest: // - float default placement @@ -234,11 +283,11 @@ int InsetFloat::latex(Buffer const * buf, // - specific float placement string placement; string const buf_placement = buf->params.float_placement; - string const def_placement = floats.defaultPlacement(floatType_); - if (!floatPlacement_.empty() - && floatPlacement_ != def_placement) { - placement = floatPlacement_; - } else if (floatPlacement_.empty() + 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; @@ -266,9 +315,9 @@ int InsetFloat::latex(Buffer const * buf, int InsetFloat::docbook(Buffer const * buf, ostream & os, bool mixcont) const { - os << '<' << floatType_ << '>'; + os << '<' << params_.type << '>'; int const i = inset.docbook(buf, os, mixcont); - os << "'; + os << "'; return i; } @@ -289,68 +338,98 @@ bool InsetFloat::insetAllowed(Inset::Code code) const bool InsetFloat::showInsetDialog(BufferView * bv) const { if (!inset.showInsetDialog(bv)) { - bv->owner()->getDialogs().showFloat(const_cast(this)); + InsetFloat * tmp = const_cast(this); + InsetFloatMailer mailer(*tmp); + mailer.showDialog(bv); } return true; } -string const & InsetFloat::type() const +void InsetFloat::wide(bool w, BufferParams const & bp) { - return floatType_; -} + params_.wide = w; + string lab(_("float:")); + lab += floatname(params_.type, bp); -void InsetFloat::placement(string const & p) -{ - // FIX: Here we should only allow the placement to be set - // if a valid value. - floatPlacement_ = p; + if (params_.wide) + lab += '*'; + + setLabel(lab); } -string const & InsetFloat::placement() const +void InsetFloat::addToToc(toc::TocList & toclist, Buffer const * buf) const { - return floatPlacement_; + ParIterator pit(inset.paragraphs.begin(), inset.paragraphs); + ParIterator end(inset.paragraphs.end(), inset.paragraphs); + +a // Find a caption layout in one of the (child inset's) pars + for (; pit != end; ++pit) { + if (pit->layout()->name() == caplayout) { + string const name = floatname(params_.type, buf->params); + string const str = + tostr(toclist[name].size() + 1) + + ". " + pit->asString(buf, false); + toc::TocItem const item(pit->id(), 0 , str); + toclist[name].push_back(item); + } + } } -void InsetFloat::wide(bool w, BufferParams const & bp) -{ - wide_ = w; +string const InsetFloatMailer::name_("float"); - string lab(_("float:")); - lab += floatname(floatType_, bp); +InsetFloatMailer::InsetFloatMailer(InsetFloat & inset) + : inset_(inset) +{} - if (wide_) - lab += '*'; - setLabel(lab); +string const InsetFloatMailer::inset2string() const +{ + return params2string(inset_.params()); } -bool InsetFloat::wide() const +void InsetFloatMailer::string2params(string const & in, + InsetFloatParams & params) { - return wide_; -} + params = InsetFloatParams(); + if (in.empty()) + return; -void InsetFloat::addToToc(toc::TocList & toclist, Buffer const * buf) const -{ - ParIterator pit(inset.paragraph()); - ParIterator end; + istringstream data(STRCONV(in)); + LyXLex lex(0,0); + lex.setStream(data); - // Find a caption layout in one of the (child inset's) pars - for (; pit != end; ++pit) { - Paragraph * tmp = *pit; + if (lex.isOK()) { + lex.next(); + string const token = lex.getString(); + if (token != name_) + return; + } - if (tmp->layout()->name() == caplayout) { - string const name = floatname(type(), buf->params); - string const str = - tostr(toclist[name].size() + 1) - + ". " + tmp->asString(buf, false); - toc::TocItem const item(tmp, 0 , str); - toclist[name].push_back(item); - } + // 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 != "Float" || !lex.eatLine()) + return; } + + if (lex.isOK()) { + params.read(lex); + } +} + + +string const InsetFloatMailer::params2string(InsetFloatParams const & params) +{ + ostringstream data; + data << name_ << ' '; + params.write(data); + return STRCONV(data.str()); }