X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetWrap.cpp;h=fe56091a75501992e30281450a58cb7a1c2254f1;hb=23abb5aaa36af07aadfa5e565869104778ba0d6d;hp=4a3e8f7550b7621d3975bd94b8f3fa967d0eced4;hpb=9fcd1a6c6a7fe23d90d506b60eb036479baccdee;p=lyx.git diff --git a/src/insets/InsetWrap.cpp b/src/insets/InsetWrap.cpp index 4a3e8f7550..fe56091a75 100644 --- a/src/insets/InsetWrap.cpp +++ b/src/insets/InsetWrap.cpp @@ -24,11 +24,11 @@ #include "FloatList.h" #include "FuncRequest.h" #include "FuncStatus.h" -#include "InsetList.h" #include "LaTeXFeatures.h" #include "Lexer.h" +#include "output_xhtml.h" +#include "texstream.h" #include "TextClass.h" -#include "TocBackend.h" #include "support/debug.h" #include "support/docstream.h" @@ -36,16 +36,17 @@ #include "frontends/Application.h" +#include + using namespace std; namespace lyx { -InsetWrap::InsetWrap(Buffer const & buf, string const & type) - : InsetCollapsable(buf) +InsetWrap::InsetWrap(Buffer * buf, string const & type) + : InsetCaptionable(buf) { - setLabel(_("wrap: ") + floatName(type, buf.params())); - params_.type = type; + setCaptionType(type); params_.lines = 0; params_.placement = "o"; params_.overhang = Length(0, Length::PCW); @@ -59,7 +60,16 @@ InsetWrap::~InsetWrap() } -docstring InsetWrap::name() const +// 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); } @@ -67,19 +77,21 @@ docstring InsetWrap::name() const 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 default_tip = InsetCollapsable::toolTip(bv, x, y); docstring caption_tip = getCaptionText(rp); - if (!isOpen(bv) && !caption_tip.empty()) - return caption_tip + '\n' + default_tip; - return default_tip; + 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; InsetWrap::string2params(to_utf8(cmd.argument()), params); params_.lines = params.lines; @@ -94,7 +106,7 @@ void InsetWrap::doDispatch(Cursor & cur, FuncRequest & cmd) break; default: - InsetCollapsable::doDispatch(cur, cmd); + InsetCaptionable::doDispatch(cur, cmd); break; } } @@ -103,32 +115,21 @@ 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.setEnabled(true); return true; default: - return InsetCollapsable::getStatus(cur, cmd, flag); + return InsetCaptionable::getStatus(cur, cmd, flag); } } -void InsetWrap::updateLabels(ParIterator const & it) +void InsetWrap::updateBuffer(ParIterator const & it, UpdateType utype, bool const deleted) { - setLabel(_("wrap: ") + floatName(params_.type, buffer().params())); - Counters & cnts = - buffer().masterBuffer()->params().documentClass().counters(); - string const saveflt = cnts.current_float(); - - // Tell to captions what the current float is - cnts.current_float(params().type); - - InsetCollapsable::updateLabels(it); - - // reset afterwards - cnts.current_float(saveflt); + InsetCaptionable::updateBuffer(it, utype, deleted); } @@ -155,14 +156,14 @@ void InsetWrapParams::read(Lexer & lex) void InsetWrap::write(ostream & os) const { params_.write(os); - InsetCollapsable::write(os); + InsetCaptionable::write(os); } void InsetWrap::read(Lexer & lex) { params_.read(lex); - InsetCollapsable::read(lex); + InsetCaptionable::read(lex); } @@ -170,18 +171,12 @@ void InsetWrap::validate(LaTeXFeatures & features) const { features.require("wrapfig"); features.inFloat(true); - InsetCollapsable::validate(features); + InsetCaptionable::validate(features); features.inFloat(false); } -docstring InsetWrap::editMessage() const -{ - return _("Opened Wrap Inset"); -} - - -int InsetWrap::latex(odocstream & os, OutputParams const & runparams_in) const +void InsetWrap::latex(otexstream & os, OutputParams const & runparams_in) const { OutputParams runparams(runparams_in); runparams.inFloat = OutputParams::MAINFLOAT; @@ -195,17 +190,17 @@ int InsetWrap::latex(odocstream & os, OutputParams const & runparams_in) const if (over.value() != 0) os << '[' << from_ascii(params_.overhang.asLatexString()) << ']'; os << '{' << from_ascii(params_.width.asLatexString()) << "}%\n"; - int const i = InsetText::latex(os, runparams); + InsetText::latex(os, runparams); os << "\\end{wrap" << from_ascii(params_.type) << "}%\n"; - return i + 2; } -int InsetWrap::plaintext(odocstream & os, OutputParams const & runparams) const +int InsetWrap::plaintext(odocstringstream & os, + OutputParams const & runparams, size_t max_length) const { os << '[' << buffer().B_("wrap") << ' ' - << floatName(params_.type, buffer().params()) << ":\n"; - InsetText::plaintext(os, runparams); + << floatName(params_.type) << ":\n"; + InsetText::plaintext(os, runparams, max_length); os << "\n]"; return PLAINTEXT_NEWLINE + 1; // one char on a separate line @@ -222,17 +217,18 @@ int InsetWrap::docbook(odocstream & os, OutputParams const & runparams) const } -docstring InsetWrap::xhtml(odocstream &, OutputParams const & rp) const +docstring InsetWrap::xhtml(XHTMLStream & xs, OutputParams const & rp) const { string const len = params_.width.asHTMLString(); - docstring retval = from_ascii("
"); - odocstringstream os; - docstring const deferred = InsetText::xhtml(os, rp); - retval += os.str() + from_ascii("
"); - retval += deferred; + 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; } @@ -244,7 +240,7 @@ bool InsetWrap::insetAllowed(InsetCode code) const case MARGIN_CODE: return false; default: - return InsetCollapsable::insetAllowed(code); + return InsetCaptionable::insetAllowed(code); } } @@ -258,29 +254,6 @@ bool InsetWrap::showInsetDialog(BufferView * bv) const } -docstring InsetWrap::getCaptionText(OutputParams const & runparams) const -{ - 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 InsetWrap::string2params(string const & in, InsetWrapParams & params) { params = InsetWrapParams();