X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetfloat.C;h=523602e99361a87d2c99d5aaa6e250bb88961eca;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=ed173ac63bf2b7e4f44d4698fbe7a33cac6b306e;hpb=0d43ba149a41e8860dde316ccbd4336d6b0bbdfa;p=lyx.git diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C index ed173ac63b..523602e993 100644 --- a/src/insets/insetfloat.C +++ b/src/insets/insetfloat.C @@ -22,19 +22,22 @@ #include "Floating.h" #include "FloatList.h" #include "funcrequest.h" +#include "FuncStatus.h" #include "gettext.h" -#include "iterators.h" #include "LaTeXFeatures.h" #include "LColor.h" #include "lyxlex.h" #include "outputparams.h" #include "paragraph.h" +#include "TocBackend.h" #include "support/lstrings.h" -#include "support/tostr.h" -#include "support/std_sstream.h" +#include "support/convert.h" -using lyx::support::contains; + +namespace lyx { + +using support::contains; using std::endl; using std::string; @@ -111,39 +114,18 @@ using std::ostringstream; // // 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) { - setLabel(_("float: ") + floatname(type, bp)); + 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)) - paragraphs().begin()->layout(tclass[caplayout]); + setInsetName(from_utf8(type)); } @@ -153,17 +135,18 @@ InsetFloat::~InsetFloat() } -void InsetFloat::priv_dispatch(LCursor & cur, FuncRequest & cmd) +void InsetFloat::doDispatch(LCursor & cur, FuncRequest & cmd) { 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, cur.bv().buffer()->params()); - cur.bv().update(); + params_.sideways = params.sideways; + wide(params_.wide, cur.buffer().params()); + sideways(params_.sideways, cur.buffer().params()); break; } @@ -172,17 +155,41 @@ void InsetFloat::priv_dispatch(LCursor & cur, FuncRequest & cmd) break; } + case LFUN_MOUSE_RELEASE: { + if (cmd.button() == mouse_button::button3 && hitButton(cmd)) { + InsetFloatMailer(*this).showDialog(&cur.bv()); + break; + } + InsetCollapsable::doDispatch(cur, cmd); + break; + } + default: - InsetCollapsable::priv_dispatch(cur, cmd); + InsetCollapsable::doDispatch(cur, cmd); break; } } +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()) os << "placement " << placement << "\n"; @@ -191,33 +198,41 @@ void InsetFloatParams::write(ostream & os) const os << "wide true\n"; 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); } } @@ -233,6 +248,7 @@ void InsetFloat::read(Buffer const & buf, LyXLex & lex) { params_.read(lex); wide(params_.wide, buf.params()); + sideways(params_.sideways, buf.params()); InsetCollapsable::read(buf, lex); } @@ -243,28 +259,37 @@ void InsetFloat::validate(LaTeXFeatures & features) const 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, +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); + 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 @@ -285,10 +310,11 @@ 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'; @@ -296,66 +322,29 @@ int InsetFloat::latex(Buffer const & buf, ostream & os, // 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, - 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 = InsetText::linuxdoc(buf, os, runparams); - os << "\n"; - - return i; -} - - -int InsetFloat::docbook(Buffer const & buf, ostream & os, +int InsetFloat::docbook(Buffer const & buf, odocstream & os, OutputParams const & runparams) const { - os << '<' << params_.type << '>'; + // FIXME UNICODE + os << '<' << from_ascii(params_.type) << '>'; int const i = InsetText::docbook(buf, os, runparams); - os << "'; + os << "'; return i; } -bool InsetFloat::insetAllowed(InsetOld::Code code) const +bool InsetFloat::insetAllowed(InsetBase::Code code) const { - return code != InsetOld::FLOAT_CODE - && code != InsetOld::FOOT_CODE - && code != InsetOld::MARGIN_CODE; + return code != InsetBase::FLOAT_CODE + && code != InsetBase::FOOT_CODE + && code != InsetBase::MARGIN_CODE; } @@ -370,27 +359,37 @@ bool InsetFloat::showInsetDialog(BufferView * bv) const void InsetFloat::wide(bool w, BufferParams const & bp) { params_.wide = w; - string lab = _("float: ") + floatname(params_.type, bp); + docstring lab = _("float: ") + floatName(params_.type, bp); if (params_.wide) lab += '*'; setLabel(lab); } -void InsetFloat::addToToc(lyx::toc::TocList & toclist, Buffer const & buf) const +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(TocList & toclist, Buffer const & buf) const { - ParIterator pit(0, paragraphs()); - ParIterator end(paragraphs().size(), 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); - lyx::toc::TocItem const item(pit->id(), 0 , str); - toclist[name].push_back(item); + toc.push_back(TocItem(pit, 0, str)); + return; } } } @@ -432,6 +431,8 @@ void InsetFloatMailer::string2params(string const & in, 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); } @@ -443,3 +444,6 @@ string const InsetFloatMailer::params2string(InsetFloatParams const & params) params.write(data); return data.str(); } + + +} // namespace lyx