InsetInfo: enable inset dissolve

[lyx.git] / src / insets / InsetWrap.cpp

diff --git a/src/insets/InsetWrap.cpp b/src/insets/InsetWrap.cpp
index 5b03dfb8512ec0a29bd22c73d29afa6bf07a6f96..b06ea4f700c91eed2712a0994a73789961e6ef86 100644 (file)
--- a/src/insets/InsetWrap.cpp
+++ b/src/insets/InsetWrap.cpp
@@ -27,6 +27,7 @@
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
 #include "output_xhtml.h"
+#include "texstream.h"
 #include "TextClass.h"
 
 #include "support/debug.h"
@@ -35,16 +36,17 @@
 
 #include "frontends/Application.h"
 
+#include <climits>
+
 using namespace std;
 
 
 namespace lyx {
 
 InsetWrap::InsetWrap(Buffer * buf, string const & type)
-       : InsetCollapsable(buf)
+       : InsetCaptionable(buf)
 {
-       setLabel(_("wrap: ") + floatName(type));
-       params_.type = type;
+       setCaptionType(type);
        params_.lines = 0;
        params_.placement = "o";
        params_.overhang = Length(0, Length::PCW);
@@ -58,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);
 }
@@ -66,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;
@@ -93,7 +106,7 @@ void InsetWrap::doDispatch(Cursor & cur, FuncRequest & cmd)
                break;
 
        default:
-               InsetCollapsable::doDispatch(cur, cmd);
+               InsetCaptionable::doDispatch(cur, cmd);
                break;
        }
 }
@@ -102,38 +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::updateBuffer(ParIterator const & it, UpdateType utype)
 {
-       setLabel(_("wrap: ") + floatName(params_.type));
-       Counters & cnts =
-               buffer().masterBuffer()->params().documentClass().counters();
-       if (utype == OutputUpdate) {
-               // counters are local to the wrap
-               cnts.saveLastCounter();
-       }
-       string const saveflt = cnts.current_float();
-
-       // Tell to captions what the current float is
-       cnts.current_float(params().type);
-
-       InsetCollapsable::updateBuffer(it, utype);
-
-       // reset afterwards
-       cnts.current_float(saveflt);
-       if (utype == OutputUpdate)
-               cnts.restoreLastCounter();
+       InsetCaptionable::updateBuffer(it, utype);
 }
 
 
@@ -160,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);
 }
 
 
@@ -175,12 +171,12 @@ void InsetWrap::validate(LaTeXFeatures & features) const
 {
        features.require("wrapfig");
        features.inFloat(true);
-       InsetCollapsable::validate(features);
+       InsetCaptionable::validate(features);
        features.inFloat(false);
 }
 
 
-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;
@@ -194,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) << ":\n";
-       InsetText::plaintext(os, runparams);
+       InsetText::plaintext(os, runparams, max_length);
        os << "\n]";
 
        return PLAINTEXT_NEWLINE + 1; // one char on a separate line
@@ -225,12 +221,13 @@ docstring InsetWrap::xhtml(XHTMLStream & xs, OutputParams const & rp) const
 {
        string const len = params_.width.asHTMLString();
        string const width = len.empty() ? "50%" : len;
-       string const attr = "class='wrap' style='width: " + len + ";'";
-       xs << html::StartTag("div", attr);
-       docstring const deferred = 
+       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);
-       if (!len.empty())
-               xs << html::EndTag("div");
+       xs << html::EndTag(tag);
        return deferred;
 }
 
@@ -243,7 +240,7 @@ bool InsetWrap::insetAllowed(InsetCode code) const
        case MARGIN_CODE:
                return false;
        default:
-               return InsetCollapsable::insetAllowed(code);
+               return InsetCaptionable::insetAllowed(code);
        }
 }