X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetWrap.cpp;h=fe56091a75501992e30281450a58cb7a1c2254f1;hb=23abb5aaa36af07aadfa5e565869104778ba0d6d;hp=8c72fc8571dee743455cec2c6e336601457d8f33;hpb=ed858d73e57ce7aa89e38c1bc4d799362edb0227;p=lyx.git diff --git a/src/insets/InsetWrap.cpp b/src/insets/InsetWrap.cpp index 8c72fc8571..fe56091a75 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,83 +12,101 @@ #include #include "InsetWrap.h" +#include "InsetCaption.h" #include "Buffer.h" #include "BufferParams.h" #include "BufferView.h" #include "Counters.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 "LaTeXFeatures.h" -#include "Color.h" #include "Lexer.h" -#include "OutputParams.h" -#include "TocBackend.h" +#include "output_xhtml.h" +#include "texstream.h" +#include "TextClass.h" -#include "support/convert.h" +#include "support/debug.h" +#include "support/docstream.h" +#include "support/gettext.h" +#include "frontends/Application.h" -namespace lyx { +#include + +using namespace std; -using std::string; -using std::endl; -using std::istringstream; -using std::ostream; -using std::ostringstream; +namespace lyx { -InsetWrap::InsetWrap(BufferParams const & bp, string const & type) - : InsetCollapsable(bp), name_(from_utf8(type)) +InsetWrap::InsetWrap(Buffer * buf, string const & type) + : InsetCaptionable(buf) { - setLabel(_("wrap: ") + floatName(type, bp)); - Font font(Font::ALL_SANE); - font.decSize(); - font.decSize(); - font.setColor(Color::collapsable); - setLabelFont(font); - params_.type = type; + setCaptionType(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); +} + + +// Enforce equality of float type and caption type. +void InsetWrap::setCaptionType(std::string const & type) +{ + InsetCaptionable::setCaptionType(type); + params_.type = captionType(); + setLabel(_("wrap: ") + floatName(type)); +} + + +docstring InsetWrap::layoutName() const +{ + return "Wrap:" + from_utf8(params_.type); +} + + +docstring InsetWrap::toolTip(BufferView const & bv, int x, int y) const +{ + if (isOpen(bv)) + return InsetCaptionable::toolTip(bv, x, y); + OutputParams rp(&buffer().params().encoding()); + docstring caption_tip = getCaptionText(rp); + if (!caption_tip.empty()) + caption_tip += from_ascii("\n"); + return toolTipText(caption_tip); } void InsetWrap::doDispatch(Cursor & cur, FuncRequest & cmd) { - switch (cmd.action) { + switch (cmd.action()) { case LFUN_INSET_MODIFY: { + cur.recordUndoInset(this); 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()); + cur.bv().updateDialog("wrap", params2string(params())); break; - case LFUN_MOUSE_RELEASE: { - if (cmd.button() == mouse_button::button3 && hitButton(cmd)) { - InsetWrapMailer(*this).showDialog(&cur.bv()); - break; - } - InsetCollapsable::doDispatch(cur, cmd); - break; - } - default: - InsetCollapsable::doDispatch(cur, cmd); + InsetCaptionable::doDispatch(cur, cmd); break; } } @@ -96,146 +115,132 @@ void InsetWrap::doDispatch(Cursor & cur, FuncRequest & cmd) bool InsetWrap::getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus & flag) const { - switch (cmd.action) { + switch (cmd.action()) { case LFUN_INSET_MODIFY: case LFUN_INSET_DIALOG_UPDATE: - flag.enabled(true); + flag.setEnabled(true); return true; default: - return InsetCollapsable::getStatus(cur, cmd, flag); + return InsetCaptionable::getStatus(cur, cmd, flag); } } -void InsetWrap::updateLabels(Buffer const & buf, ParIterator const & it) +void InsetWrap::updateBuffer(ParIterator const & it, UpdateType utype, bool const deleted) { - Counters & cnts = buf.params().getTextClass().counters(); - string const saveflt = cnts.current_float(); - - // Tell to captions what the current float is - cnts.current_float(params().type); - - InsetCollapsable::updateLabels(buf, it); - - //reset afterwards - cnts.current_float(saveflt); + InsetCaptionable::updateBuffer(it, utype, deleted); } void InsetWrapParams::write(ostream & os) const { os << "Wrap " << type << '\n'; - - if (!placement.empty()) - os << "placement " << placement << "\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 = Length(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); + InsetCaptionable::write(os); } -void InsetWrap::read(Buffer const & buf, Lexer & lex) +void InsetWrap::read(Lexer & lex) { params_.read(lex); - InsetCollapsable::read(buf, lex); + InsetCaptionable::read(lex); } void InsetWrap::validate(LaTeXFeatures & features) const { - features.require("floatflt"); - InsetCollapsable::validate(features); -} - - -Inset * InsetWrap::clone() const -{ - return new InsetWrap(*this); -} - - -docstring const InsetWrap::editMessage() const -{ - return _("Opened Wrap Inset"); + features.require("wrapfig"); + features.inFloat(true); + InsetCaptionable::validate(features); + features.inFloat(false); } -int InsetWrap::latex(Buffer const & buf, odocstream & os, - OutputParams const & runparams) const +void InsetWrap::latex(otexstream & os, OutputParams const & runparams_in) const { - os << "\\begin{floating" << from_ascii(params_.type) << '}'; - if (!params_.placement.empty()) - os << '[' << from_ascii(params_.placement) << ']'; + OutputParams runparams(runparams_in); + runparams.inFloat = OutputParams::MAINFLOAT; + 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"; - return i + 2; + InsetText::latex(os, runparams); + os << "\\end{wrap" << from_ascii(params_.type) << "}%\n"; } -int InsetWrap::plaintext(Buffer const & buf, odocstream & os, - OutputParams const & runparams) const +int InsetWrap::plaintext(odocstringstream & os, + OutputParams const & runparams, size_t max_length) const { - os << '[' << buf.B_("wrap") << ' ' << floatName(params_.type, buf.params()) << ":\n"; - InsetText::plaintext(buf, os, runparams); + os << '[' << buffer().B_("wrap") << ' ' + << floatName(params_.type) << ":\n"; + InsetText::plaintext(os, runparams, max_length); 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); + int const i = InsetText::docbook(os, runparams); os << "'; return i; } -bool InsetWrap::insetAllowed(Inset::Code code) const +docstring InsetWrap::xhtml(XHTMLStream & xs, OutputParams const & rp) const +{ + string const len = params_.width.asHTMLString(); + string const width = len.empty() ? "50%" : len; + InsetLayout const & il = getLayout(); + string const & tag = il.htmltag(); + string const attr = il.htmlattr() + " style='width:" + width + ";'"; + xs << html::StartTag(tag, attr); + docstring const deferred = + InsetText::insetAsXHTML(xs, rp, InsetText::WriteInnerTag); + xs << html::EndTag(tag); + return deferred; +} + + +bool InsetWrap::insetAllowed(InsetCode code) const { switch(code) { - case FLOAT_CODE: + case WRAP_CODE: case FOOT_CODE: case MARGIN_CODE: return false; default: - return InsetCollapsable::insetAllowed(code); + return InsetCaptionable::insetAllowed(code); } } @@ -243,56 +248,30 @@ bool InsetWrap::insetAllowed(Inset::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; } -string const InsetWrapMailer::name_("wrap"); - -InsetWrapMailer::InsetWrapMailer(InsetWrap & inset) - : inset_(inset) -{} - - -string const InsetWrapMailer::inset2string(Buffer const &) const -{ - return params2string(inset_.params()); -} - - -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 Text::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(); }