X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetfloat.C;h=523602e99361a87d2c99d5aaa6e250bb88961eca;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=31c34d926b5099c739fdd557d65abc02f7a0bb1d;hpb=6a2f81278dfdd924d6b6b761935d930e325b96d9;p=lyx.git diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C index 31c34d926b..523602e993 100644 --- a/src/insets/insetfloat.C +++ b/src/insets/insetfloat.C @@ -6,41 +6,45 @@ * \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 #include "insetfloat.h" -#include "insettext.h" #include "buffer.h" +#include "bufferparams.h" #include "BufferView.h" +#include "cursor.h" #include "debug.h" +#include "dispatchresult.h" #include "Floating.h" #include "FloatList.h" #include "funcrequest.h" +#include "FuncStatus.h" #include "gettext.h" -#include "iterators.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 "TocBackend.h" -#include "support/LOstream.h" #include "support/lstrings.h" -#include "support/tostr.h" +#include "support/convert.h" -#include "frontends/LyXView.h" -#include "frontends/Dialogs.h" -using namespace lyx::support; +namespace lyx { + +using 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 @@ -110,182 +114,189 @@ using std::auto_ptr; // // Lgb -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(); - FloatList::const_iterator it = floats[type]; - if (it == floats.end()) - return type; - - return _(it->second.name()); -} - -} // namespace anon - InsetFloat::InsetFloat(BufferParams const & bp, string const & type) : 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); params_.type = type; - setInsetName(type); - LyXTextClass const & tclass = bp.getLyXTextClass(); - if (tclass.hasLayout(caplayout)) - inset.paragraphs.begin()->layout(tclass[caplayout]); + setInsetName(from_utf8(type)); } -InsetFloat::InsetFloat(InsetFloat const & in) - : InsetCollapsable(in), params_(in.params_) -{} - - InsetFloat::~InsetFloat() { - InsetFloatMailer mailer(*this); - mailer.hideDialog(); + InsetFloatMailer(*this).hideDialog(); } -dispatch_result InsetFloat::localDispatch(FuncRequest const & cmd) +void InsetFloat::doDispatch(LCursor & cur, FuncRequest & cmd) { - InsetOld::RESULT result = UNDISPATCHED; - switch (cmd.action) { + case LFUN_INSET_MODIFY: { InsetFloatParams params; - InsetFloatMailer::string2params(cmd.argument, params); - + InsetFloatMailer::string2params(to_utf8(cmd.argument()), params); params_.placement = params.placement; params_.wide = params.wide; - - wide(params_.wide, cmd.view()->buffer()->params); - cmd.view()->updateInset(this); - result = DISPATCHED; + params_.sideways = params.sideways; + wide(params_.wide, cur.buffer().params()); + sideways(params_.sideways, cur.buffer().params()); + break; } - break; case LFUN_INSET_DIALOG_UPDATE: { - InsetFloatMailer mailer(*this); - mailer.updateDialog(cmd.view()); + 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::doDispatch(cur, cmd); + break; } - break; default: - result = InsetCollapsable::localDispatch(cmd); + InsetCollapsable::doDispatch(cur, cmd); + break; } +} - return result; + +bool InsetFloat::getStatus(LCursor & cur, FuncRequest const & cmd, + FuncStatus & flag) const +{ + switch (cmd.action) { + + case LFUN_INSET_MODIFY: + case LFUN_INSET_DIALOG_UPDATE: + flag.enabled(true); + return true; + + default: + return InsetCollapsable::getStatus(cur, cmd, flag); + } } void InsetFloatParams::write(ostream & os) const { - os << "Float " // getInsetName() - << type << '\n'; + os << "Float " << type << '\n'; - if (!placement.empty()) { + if (!placement.empty()) os << "placement " << placement << "\n"; - } - if (wide) { + + 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) { - if (lex.isOK()) { - lex.next(); - string token = lex.getString(); - if (token == "placement") { - lex.next(); - placement = lex.getString(); - } else { - // take countermeasures - lex.pushToken(token); - } - lex.next(); - token = lex.getString(); - if (token == "wide") { - lex.next(); - string const tmptoken = lex.getString(); - wide = (tmptoken == "true"); - } else { - lyxerr << "InsetFloat::Read:: Missing wide!" - << endl; - // take countermeasures - lex.pushToken(token); - } + 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 +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) { params_.read(lex); - wide(params_.wide, buf->params); + wide(params_.wide, buf.params()); + sideways(params_.sideways, buf.params()); InsetCollapsable::read(buf, lex); } void InsetFloat::validate(LaTeXFeatures & features) const { - if (contains(params_.placement, "H")) { + if (contains(params_.placement, 'H')) { features.require("float"); } + if (params_.sideways) + features.require("rotating"); + features.useFloat(params_.type); InsetCollapsable::validate(features); } -auto_ptr InsetFloat::clone() const +auto_ptr InsetFloat::doClone() const { return auto_ptr(new InsetFloat(*this)); } -string const InsetFloat::editMessage() const +docstring const InsetFloat::editMessage() const { return _("Opened Float Inset"); } -int InsetFloat::latex(Buffer const * buf, ostream & os, - LatexRunParams const & runparams) const +int InsetFloat::latex(Buffer const & buf, odocstream & os, + OutputParams const & runparams) const { - FloatList const & floats = buf->params.getLyXTextClass().floats(); - string const tmptype = (params_.wide ? params_.type + "*" : params_.type); + 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 buf_placement = buf.params().float_placement; string const def_placement = floats.defaultPlacement(params_.type); if (!params_.placement.empty() && params_.placement != def_placement) { @@ -299,89 +310,48 @@ int InsetFloat::latex(Buffer const * buf, ostream & os, // The \n is used to force \begin{} to appear in a new line. // The % is needed to prevent two consecutive \n chars in the case // when the current output line is empty. - os << "%\n\\begin{" << tmptype << '}'; + os << "%\n\\begin{" << from_ascii(tmptype) << '}'; // We only output placement if different from the def_placement. - if (!placement.empty()) { - os << '[' << placement << ']'; + // sidewaysfloats always use their own page + if (!placement.empty() && !params_.sideways) { + os << '[' << from_ascii(placement) << ']'; } os << '\n'; - int const i = inset.latex(buf, os, runparams); + 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. - os << "\n\\end{" << tmptype << "}\n"; + os << "\n\\end{" << from_ascii(tmptype) << "}\n"; return i + 4; } -int InsetFloat::linuxdoc(Buffer const * buf, ostream & os) const +int InsetFloat::docbook(Buffer const & buf, odocstream & os, + OutputParams const & runparams) 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 << "\n"; + // FIXME UNICODE + os << '<' << from_ascii(params_.type) << '>'; + int const i = InsetText::docbook(buf, os, runparams); + os << "'; return i; } -int InsetFloat::docbook(Buffer const * buf, ostream & os, bool mixcont) const +bool InsetFloat::insetAllowed(InsetBase::Code code) const { - os << '<' << params_.type << '>'; - int const i = inset.docbook(buf, os, mixcont); - os << "'; - - return i; -} - - -bool InsetFloat::insetAllowed(InsetOld::Code code) const -{ - if (code == InsetOld::FLOAT_CODE) - return false; - if (inset.getLockingInset() != const_cast(this)) - return inset.insetAllowed(code); - if ((code == InsetOld::FOOT_CODE) || (code == InsetOld::MARGIN_CODE)) - return false; - return true; + return code != InsetBase::FLOAT_CODE + && code != InsetBase::FOOT_CODE + && code != InsetBase::MARGIN_CODE; } bool InsetFloat::showInsetDialog(BufferView * bv) const { - if (!inset.showInsetDialog(bv)) { - InsetFloat * tmp = const_cast(this); - InsetFloatMailer mailer(*tmp); - mailer.showDialog(bv); - } + if (!InsetText::showInsetDialog(bv)) + InsetFloatMailer(const_cast(*this)).showDialog(bv); return true; } @@ -389,31 +359,37 @@ bool InsetFloat::showInsetDialog(BufferView * bv) const void InsetFloat::wide(bool w, BufferParams const & bp) { params_.wide = w; - - string lab(_("float:")); - lab += floatname(params_.type, bp); - + docstring lab = _("float: ") + floatName(params_.type, bp); if (params_.wide) lab += '*'; + setLabel(lab); +} + +void InsetFloat::sideways(bool s, BufferParams const & bp) +{ + params_.sideways = s; + docstring 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(TocList & toclist, Buffer const & buf) const { - ParIterator pit(inset.paragraphs.begin(), inset.paragraphs); - ParIterator end(inset.paragraphs.end(), inset.paragraphs); + 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) { - if (pit->layout()->name() == caplayout) { - string const name = floatname(params_.type, buf->params); - string const str = - tostr(toclist[name].size() + 1) + if (pit->layout()->labeltype == LABEL_SENSITIVE) { + Toc & toc = toclist[params_.type]; + docstring const str = + convert(toc.size() + 1) + ". " + pit->asString(buf, false); - toc::TocItem const item(pit->id(), 0 , str); - toclist[name].push_back(item); + toc.push_back(TocItem(pit, 0, str)); + return; } } } @@ -436,33 +412,28 @@ void InsetFloatMailer::string2params(string const & in, InsetFloatParams & params) { params = InsetFloatParams(); - 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("InsetFloatMailer", 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 != "Float" || !lex.eatLine()) - return; - } - - if (lex.isOK()) { - params.read(lex); - } + // 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); } @@ -471,5 +442,8 @@ string const InsetFloatMailer::params2string(InsetFloatParams const & params) ostringstream data; data << name_ << ' '; params.write(data); - return STRCONV(data.str()); + return data.str(); } + + +} // namespace lyx