X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetfloat.C;h=41da3b33a9aaf25a36e5c03b10cb248381ac3239;hb=5603df4a5b7e511b31026c9a4f8f55b2b10fde57;hp=e5610ea8c80ce8962c93c3adf2f5b37ba916e20d;hpb=59565140713f9c08e17fcc94cd4b2375974e2b62;p=lyx.git diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C index e5610ea8c8..41da3b33a9 100644 --- a/src/insets/insetfloat.C +++ b/src/insets/insetfloat.C @@ -6,34 +6,43 @@ * \author Jürgen Vigna * \author Lars Gullik Bjønnes * - * Full author contact details are available in file CREDITS + * Full author contact details are available in file CREDITS. */ -#include -#ifdef __GNUG__ -#pragma implementation -#endif +#include #include "insetfloat.h" -#include "gettext.h" -#include "lyxfont.h" + +#include "buffer.h" +#include "bufferparams.h" #include "BufferView.h" -#include "lyxtext.h" -#include "insets/insettext.h" -#include "support/LOstream.h" -#include "support/lstrings.h" -#include "FloatList.h" -#include "LaTeXFeatures.h" +#include "cursor.h" #include "debug.h" +#include "dispatchresult.h" #include "Floating.h" -#include "buffer.h" -#include "frontends/LyXView.h" -#include "frontends/Dialogs.h" +#include "FloatList.h" +#include "funcrequest.h" +#include "gettext.h" +#include "LaTeXFeatures.h" +#include "LColor.h" #include "lyxlex.h" -#include "iterators.h" +#include "outputparams.h" +#include "paragraph.h" +#include "pariterator.h" + +#include "support/lstrings.h" +#include "support/tostr.h" +#include "support/std_sstream.h" + +using lyx::support::contains; -using std::ostream; using std::endl; +using std::string; +using std::auto_ptr; +using std::istringstream; +using std::ostream; +using std::ostringstream; + // 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 @@ -122,100 +131,148 @@ 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); - setLabel(lab); + setLabel(_("float: ") + floatname(type, bp)); LyXFont font(LyXFont::ALL_SANE); font.decSize(); 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]); + 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_) -{} - - InsetFloat::~InsetFloat() { - hideDialog(); + InsetFloatMailer(*this).hideDialog(); } -void InsetFloat::write(Buffer const * buf, ostream & os) const +void InsetFloat::priv_dispatch(LCursor & cur, FuncRequest & cmd) { - os << "Float " // getInsetName() - << floatType_ << '\n'; + switch (cmd.action) { + + case LFUN_INSET_MODIFY: { + InsetFloatParams params; + InsetFloatMailer::string2params(cmd.argument, params); + params_.placement = params.placement; + params_.wide = params.wide; + params_.sideways = params.sideways; + wide(params_.wide, cur.buffer().params()); + sideways(params_.sideways, cur.buffer().params()); + cur.bv().update(); + break; + } + + case LFUN_INSET_DIALOG_UPDATE: { + InsetFloatMailer(*this).updateDialog(&cur.bv()); + break; + } + + case LFUN_MOUSE_RELEASE: { + if (cmd.button() == mouse_button::button3 && hitButton(cmd)) { + InsetFloatMailer(*this).showDialog(&cur.bv()); + break; + } + InsetCollapsable::priv_dispatch(cur, cmd); + break; + } - if (!floatPlacement_.empty()) { - os << "placement " << floatPlacement_ << "\n"; + default: + InsetCollapsable::priv_dispatch(cur, cmd); + break; } - if (wide_) { +} + + +void InsetFloatParams::write(ostream & os) const +{ + os << "Float " << type << '\n'; + + if (!placement.empty()) + os << "placement " << placement << "\n"; + + if (wide) os << "wide true\n"; - } else { + else os << "wide false\n"; + + if (sideways) + os << "sideways true\n"; + else + os << "sideways false\n"; +} + + +void InsetFloatParams::read(LyXLex & lex) +{ + string token; + lex >> token; + if (token == "placement") { + lex >> placement; + } else { + // take countermeasures + lex.pushToken(token); + } + lex >> token; + if (token == "wide") { + lex >> wide; + } else { + lyxerr << "InsetFloat::Read:: Missing wide!" + << endl; + // take countermeasures + lex.pushToken(token); } + lex >> token; + if (token == "sideways") { + lex >> sideways; + } else { + lyxerr << "InsetFloat::Read:: Missing sideways!" + << endl; + // take countermeasures + 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) +void InsetFloat::read(Buffer const & buf, LyXLex & lex) { - if (lex.isOK()) { - lex.next(); - string token = lex.getString(); - if (token == "placement") { - lex.next(); - floatPlacement_ = lex.getString(); - } else { - // take countermeasures - lex.pushToken(token); - } - lex.next(); - token = lex.getString(); - if (token == "wide") { - lex.next(); - string const tmptoken = lex.getString(); - if (tmptoken == "true") - wide(true, buf->params); - else - wide(false, buf->params); - } else { - lyxerr << "InsetFloat::Read:: Missing wide!" - << endl; - // take countermeasures - lex.pushToken(token); - } - } + params_.read(lex); + wide(params_.wide, buf.params()); + sideways(params_.sideways, 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_); + if (params_.sideways) + features.require("rotating"); + + features.useFloat(params_.type); InsetCollapsable::validate(features); } -Inset * InsetFloat::clone(Buffer const &, bool same_id) const +auto_ptr InsetFloat::clone() const { - return new InsetFloat(*const_cast(this), same_id); + return auto_ptr(new InsetFloat(*this)); } @@ -225,23 +282,29 @@ string const InsetFloat::editMessage() const } -int InsetFloat::latex(Buffer const * buf, - ostream & os, bool fragile, bool fp) const +int InsetFloat::latex(Buffer const & buf, ostream & os, + OutputParams const & runparams) const { - FloatList const & floats = buf->params.getLyXTextClass().floats(); - string const tmptype = (wide_ ? floatType_ + "*" : floatType_); + FloatList const & floats = buf.params().getLyXTextClass().floats(); + string tmptype = (params_.wide ? params_.type + "*" : params_.type); + if (params_.sideways) { + if (params_.type == "table") + tmptype = "sidewaystable"; + else if (params_.type == "figure") + tmptype = "sidewaysfigure"; + } // Figure out the float placement to use. // From lowest to highest: // - float default placement // - document wide default placement // - 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 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; @@ -252,12 +315,13 @@ int InsetFloat::latex(Buffer const * buf, // when the current output line is empty. os << "%\n\\begin{" << tmptype << '}'; // We only output placement if different from the def_placement. - if (!placement.empty()) { + // sidewaysfloats always use their own page + if (!placement.empty() && !params_.sideways) { os << '[' << placement << ']'; } os << '\n'; - int const i = inset.latex(buf, os, fragile, fp); + int const i = InsetText::latex(buf, os, runparams); // The \n is used to force \end{} to appear in a new line. // In this case, we do not case if the current output line is empty. @@ -267,93 +331,156 @@ int InsetFloat::latex(Buffer const * buf, } -int InsetFloat::docbook(Buffer const * buf, ostream & os, bool mixcont) const +int InsetFloat::linuxdoc(Buffer const & buf, ostream & os, + OutputParams const & runparams) const { - os << '<' << floatType_ << '>'; - int const i = inset.docbook(buf, os, mixcont); - os << "'; - - return i; -} + 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; + } -bool InsetFloat::insetAllowed(Inset::Code code) const -{ - if (code == Inset::FLOAT_CODE) - return false; - if (inset.getLockingInset() != const_cast(this)) - return inset.insetAllowed(code); - if ((code == Inset::FOOT_CODE) || (code == Inset::MARGIN_CODE)) - return false; - return true; -} + os << "\n<" << tmptype ; + // We only output placement if different from the def_placement. + if (!placement.empty()) { + os << " loc=\"" << placement << '"'; + } + os << ">"; + int const i = InsetText::linuxdoc(buf, os, runparams); + os << "\n"; -bool InsetFloat::showInsetDialog(BufferView * bv) const -{ - if (!inset.showInsetDialog(bv)) { - bv->owner()->getDialogs().showFloat(const_cast(this)); - } - return true; + return i; } -string const & InsetFloat::type() const +int InsetFloat::docbook(Buffer const & buf, ostream & os, + OutputParams const & runparams) const { - return floatType_; + os << '<' << params_.type << '>'; + int const i = InsetText::docbook(buf, os, runparams); + os << "'; + + return i; } -void InsetFloat::placement(string const & p) +bool InsetFloat::insetAllowed(InsetOld::Code code) const { - // FIX: Here we should only allow the placement to be set - // if a valid value. - floatPlacement_ = p; + return code != InsetOld::FLOAT_CODE + && code != InsetOld::FOOT_CODE + && code != InsetOld::MARGIN_CODE; } -string const & InsetFloat::placement() const +bool InsetFloat::showInsetDialog(BufferView * bv) const { - return floatPlacement_; + if (!InsetText::showInsetDialog(bv)) + InsetFloatMailer(const_cast(*this)).showDialog(bv); + return true; } void InsetFloat::wide(bool w, BufferParams const & bp) { - wide_ = w; - - string lab(_("float:")); - lab += floatname(floatType_, bp); - - if (wide_) + params_.wide = w; + string lab = _("float: ") + floatname(params_.type, bp); + if (params_.wide) lab += '*'; - setLabel(lab); } -bool InsetFloat::wide() const +void InsetFloat::sideways(bool s, BufferParams const & bp) { - return wide_; + params_.sideways = s; + string lab = _("float: ") + floatname(params_.type, bp); + if (params_.sideways) + lab += _(" (sideways)"); + setLabel(lab); } -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; + ParConstIterator pit = par_const_iterator_begin(*this); + ParConstIterator end = par_const_iterator_end(*this); // 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, 0 , str); + + ". " + pit->asString(buf, false); + lyx::toc::TocItem const item(pit->id(), 0 , str); toclist[name].push_back(item); } } } + + +string const InsetFloatMailer::name_("float"); + +InsetFloatMailer::InsetFloatMailer(InsetFloat & inset) + : inset_(inset) +{} + + +string const InsetFloatMailer::inset2string(Buffer const &) const +{ + return params2string(inset_.params()); +} + + +void InsetFloatMailer::string2params(string const & in, + InsetFloatParams & params) +{ + params = InsetFloatParams(); + if (in.empty()) + return; + + istringstream data(in); + LyXLex lex(0,0); + lex.setStream(data); + + string name; + lex >> name; + if (!lex || name != name_) + return print_mailer_error("InsetFloatMailer", in, 1, name_); + + // This is part of the inset proper that is usually swallowed + // by LyXText::readInset + string id; + lex >> id; + if (!lex || id != "Float") + return print_mailer_error("InsetBoxMailer", in, 2, "Float"); + + // We have to read the type here! + lex >> params.type; + params.read(lex); +} + + +string const InsetFloatMailer::params2string(InsetFloatParams const & params) +{ + ostringstream data; + data << name_ << ' '; + params.write(data); + return data.str(); +}