X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetWrap.cpp;h=f1b49923e3742b58986f86fd3c43a9f34ec36c32;hb=d6f1915684328c6e3fe61c6eef8846b5cabec334;hp=d4ba9f018f94de40268f84ef4368e96d99aa800e;hpb=39e79d8602920eefe36e898c9f415afb979521b2;p=lyx.git diff --git a/src/insets/InsetWrap.cpp b/src/insets/InsetWrap.cpp index d4ba9f018f..f1b49923e3 100644 --- a/src/insets/InsetWrap.cpp +++ b/src/insets/InsetWrap.cpp @@ -4,6 +4,7 @@ * Licence details can be found in the file COPYING. * * \author Dekel Tsur + * \author Uwe Stöhr * * Full author contact details are available in file CREDITS. */ @@ -11,82 +12,87 @@ #include #include "InsetWrap.h" +#include "InsetCaption.h" #include "Buffer.h" #include "BufferParams.h" #include "BufferView.h" -#include "LCursor.h" -#include "debug.h" +#include "Counters.h" +#include "Cursor.h" #include "DispatchResult.h" #include "Floating.h" #include "FloatList.h" #include "FuncRequest.h" #include "FuncStatus.h" -#include "gettext.h" +#include "InsetList.h" #include "LaTeXFeatures.h" -#include "LColor.h" #include "Lexer.h" -#include "OutputParams.h" -#include "Paragraph.h" +#include "TextClass.h" #include "TocBackend.h" #include "support/convert.h" +#include "support/debug.h" +#include "support/docstream.h" +#include "support/gettext.h" +#include "frontends/Application.h" -namespace lyx { +using namespace std; -using std::string; -using std::endl; -using std::auto_ptr; -using std::istringstream; -using std::ostream; -using std::ostringstream; +namespace lyx { -InsetWrap::InsetWrap(BufferParams const & bp, string const & type) - : InsetCollapsable(bp) +InsetWrap::InsetWrap(Buffer const & buf, string const & type) + : InsetCollapsable(buf) { - setLabel(_("wrap: ") + floatName(type, bp)); - LyXFont font(LyXFont::ALL_SANE); - font.decSize(); - font.decSize(); - font.setColor(LColor::collapsable); - setLabelFont(font); + setLabel(_("wrap: ") + floatName(type, buf.params())); params_.type = type; - params_.width = LyXLength(50, LyXLength::PCW); - setInsetName(from_utf8(type)); + params_.lines = 0; + params_.placement = "o"; + params_.overhang = Length(0, Length::PCW); + params_.width = Length(50, Length::PCW); } InsetWrap::~InsetWrap() { - InsetWrapMailer(*this).hideDialog(); + hideDialogs("wrap", this); +} + + +docstring InsetWrap::name() const +{ + return from_utf8(params_.type); } -void InsetWrap::doDispatch(LCursor & cur, FuncRequest & cmd) +docstring InsetWrap::toolTip(BufferView const & bv, int x, int y) const +{ + OutputParams rp(&buffer().params().encoding()); + docstring default_tip = InsetCollapsable::toolTip(bv, x, y); + docstring caption_tip = getCaptionText(rp); + if (!isOpen() && !caption_tip.empty()) + return caption_tip + '\n' + default_tip; + return default_tip; +} + + +void InsetWrap::doDispatch(Cursor & cur, FuncRequest & cmd) { switch (cmd.action) { case LFUN_INSET_MODIFY: { InsetWrapParams params; - InsetWrapMailer::string2params(to_utf8(cmd.argument()), params); + InsetWrap::string2params(to_utf8(cmd.argument()), params); + params_.lines = params.lines; params_.placement = params.placement; - params_.width = params.width; + params_.overhang = params.overhang; + params_.width = params.width; break; } case LFUN_INSET_DIALOG_UPDATE: - InsetWrapMailer(*this).updateDialog(&cur.bv()); - break; - - case LFUN_MOUSE_RELEASE: { - if (cmd.button() == mouse_button::button3 && hitButton(cmd)) { - InsetWrapMailer(*this).showDialog(&cur.bv()); - break; - } - InsetCollapsable::doDispatch(cur, cmd); + cur.bv().updateDialog("wrap", params2string(params())); break; - } default: InsetCollapsable::doDispatch(cur, cmd); @@ -95,13 +101,13 @@ void InsetWrap::doDispatch(LCursor & cur, FuncRequest & cmd) } -bool InsetWrap::getStatus(LCursor & cur, FuncRequest const & cmd, +bool InsetWrap::getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus & flag) const { switch (cmd.action) { case LFUN_INSET_MODIFY: case LFUN_INSET_DIALOG_UPDATE: - flag.enabled(true); + flag.setEnabled(true); return true; default: @@ -110,114 +116,112 @@ bool InsetWrap::getStatus(LCursor & cur, FuncRequest const & cmd, } -void InsetWrapParams::write(ostream & os) const +void InsetWrap::updateLabels(ParIterator const & it) { - os << "Wrap " << type << '\n'; + setLabel(_("wrap: ") + floatName(params_.type, buffer().params())); + Counters & cnts = buffer().params().documentClass().counters(); + string const saveflt = cnts.current_float(); - if (!placement.empty()) - os << "placement " << placement << "\n"; + // Tell to captions what the current float is + cnts.current_float(params().type); + InsetCollapsable::updateLabels(it); + + // reset afterwards + cnts.current_float(saveflt); +} + + +void InsetWrapParams::write(ostream & os) const +{ + os << "Wrap " << type << '\n'; + os << "lines " << lines << '\n'; + os << "placement " << placement << '\n'; + os << "overhang " << overhang.asString() << '\n'; os << "width \"" << width.asString() << "\"\n"; } void InsetWrapParams::read(Lexer & lex) { - string token; - lex >> token; - if (token == "placement") - lex >> placement; - else { - // take countermeasures - lex.pushToken(token); - } - if (!lex) - return; - lex >> token; - if (token == "width") { - lex.next(); - width = LyXLength(lex.getString()); - } else { - lyxerr << "InsetWrap::Read:: Missing 'width'-tag!" - << endl; - // take countermeasures - lex.pushToken(token); - } + lex.setContext("InsetWrapParams::read"); + lex >> "lines" >> lines; + lex >> "placement" >> placement; + lex >> "overhang" >> overhang; + lex >> "width" >> width; } -void InsetWrap::write(Buffer const & buf, ostream & os) const +void InsetWrap::write(ostream & os) const { params_.write(os); - InsetCollapsable::write(buf, os); + InsetCollapsable::write(os); } -void InsetWrap::read(Buffer const & buf, Lexer & lex) +void InsetWrap::read(Lexer & lex) { params_.read(lex); - InsetCollapsable::read(buf, lex); + InsetCollapsable::read(lex); } void InsetWrap::validate(LaTeXFeatures & features) const { - features.require("floatflt"); + features.require("wrapfig"); InsetCollapsable::validate(features); } -auto_ptr InsetWrap::doClone() const -{ - return auto_ptr(new InsetWrap(*this)); -} - - -docstring const InsetWrap::editMessage() const +docstring InsetWrap::editMessage() const { return _("Opened Wrap Inset"); } -int InsetWrap::latex(Buffer const & buf, odocstream & os, - OutputParams const & runparams) const +int InsetWrap::latex(odocstream & os, OutputParams const & runparams) const { - os << "\\begin{floating" << from_ascii(params_.type) << '}'; - if (!params_.placement.empty()) - os << '[' << from_ascii(params_.placement) << ']'; + os << "\\begin{wrap" << from_ascii(params_.type) << '}'; + // no optional argument when lines are zero + if (params_.lines != 0) + os << '[' << params_.lines << ']'; + os << '{' << from_ascii(params_.placement) << '}'; + Length over(params_.overhang); + // no optional argument when the value is zero + if (over.value() != 0) + os << '[' << from_ascii(params_.overhang.asLatexString()) << ']'; os << '{' << from_ascii(params_.width.asLatexString()) << "}%\n"; - int const i = InsetText::latex(buf, os, runparams); - os << "\\end{floating" << from_ascii(params_.type) << "}%\n"; + int const i = InsetText::latex(os, runparams); + os << "\\end{wrap" << from_ascii(params_.type) << "}%\n"; return i + 2; } -int InsetWrap::plaintext(Buffer const & buf, odocstream & os, - OutputParams const & runparams) const +int InsetWrap::plaintext(odocstream & os, OutputParams const & runparams) const { - os << '[' << _("wrap") << ' ' << floatName(params_.type, buf.params()) << ":\n"; - InsetText::plaintext(buf, os, runparams); + os << '[' << buffer().B_("wrap") << ' ' + << floatName(params_.type, buffer().params()) << ":\n"; + InsetText::plaintext(os, runparams); os << "\n]"; return PLAINTEXT_NEWLINE + 1; // one char on a separate line } -int InsetWrap::docbook(Buffer const & buf, odocstream & os, - OutputParams const & runparams) const +int InsetWrap::docbook(odocstream & os, OutputParams const & runparams) const { - // FIXME UNICODE - os << '<' << from_ascii(params_.type) << '>'; - int const i = InsetText::docbook(buf, os, runparams); + // FIXME UNICODE + os << '<' << from_ascii(params_.type) << '>'; + int const i = InsetText::docbook(os, runparams); os << "'; return i; } -bool InsetWrap::insetAllowed(InsetBase::Code code) const +bool InsetWrap::insetAllowed(InsetCode code) const { switch(code) { - case FLOAT_CODE: + case WRAP_CODE: case FOOT_CODE: case MARGIN_CODE: return false; @@ -230,63 +234,53 @@ bool InsetWrap::insetAllowed(InsetBase::Code code) const bool InsetWrap::showInsetDialog(BufferView * bv) const { if (!InsetText::showInsetDialog(bv)) - InsetWrapMailer(const_cast(*this)).showDialog(bv); + bv->showDialog("wrap", params2string(params()), + const_cast(this)); return true; } -void InsetWrap::addToToc(TocList & toclist, Buffer const & buf) const +docstring InsetWrap::getCaptionText(OutputParams const & runparams) const { - // Is there a need to provide a list of wrap insets? - return; -} - - -string const InsetWrapMailer::name_("wrap"); - -InsetWrapMailer::InsetWrapMailer(InsetWrap & inset) - : inset_(inset) -{} - - -string const InsetWrapMailer::inset2string(Buffer const &) const -{ - return params2string(inset_.params()); + if (paragraphs().empty()) + return docstring(); + + ParagraphList::const_iterator pit = paragraphs().begin(); + for (; pit != paragraphs().end(); ++pit) { + InsetList::const_iterator it = pit->insetList().begin(); + for (; it != pit->insetList().end(); ++it) { + Inset & inset = *it->inset; + if (inset.lyxCode() == CAPTION_CODE) { + odocstringstream ods; + InsetCaption * ins = + static_cast(it->inset); + ins->getCaptionText(ods, runparams); + return ods.str(); + } + } + } + return docstring(); } -void InsetWrapMailer::string2params(string const & in, InsetWrapParams & params) +void InsetWrap::string2params(string const & in, InsetWrapParams & params) { params = InsetWrapParams(); - if (in.empty()) - return; - istringstream data(in); - Lexer lex(0,0); + Lexer lex; lex.setStream(data); - - 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 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; + lex.setContext("InsetWrap::string2params"); + lex >> "wrap"; + lex >> "Wrap"; // Part of the inset proper, swallowed by Text::readInset + lex >> params.type; // We have to read the type here! params.read(lex); } -string const InsetWrapMailer::params2string(InsetWrapParams const & params) +string InsetWrap::params2string(InsetWrapParams const & params) { ostringstream data; - data << name_ << ' '; + data << "wrap" << ' '; params.write(data); return data.str(); }