Merge branch 'master' of git.lyx.org:lyx

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

diff --git a/src/insets/InsetWrap.cpp b/src/insets/InsetWrap.cpp
index 03d5ed528f22910b9e6d43b6693b7616ee4906cd..79dd8065bf25a305ff56a86925728ea6fbe7eae3 100644 (file)
--- a/src/insets/InsetWrap.cpp
+++ b/src/insets/InsetWrap.cpp
@@ -58,7 +58,7 @@ InsetWrap::~InsetWrap()
 }
 
 
-docstring InsetWrap::name() const
+docstring InsetWrap::layoutName() const
 {
        return "Wrap:" + from_utf8(params_.type);
 }
@@ -66,19 +66,21 @@ docstring InsetWrap::name() const
 
 docstring InsetWrap::toolTip(BufferView const & bv, int x, int y) const
 {
+       if (isOpen(bv))
+               return InsetCollapsable::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(ATOMIC_UNDO, this);
                InsetWrapParams params;
                InsetWrap::string2params(to_utf8(cmd.argument()), params);
                params_.lines = params.lines;
@@ -102,7 +104,7 @@ 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);
@@ -114,7 +116,7 @@ bool InsetWrap::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-void InsetWrap::updateLabels(ParIterator const & it, UpdateType utype)
+void InsetWrap::updateBuffer(ParIterator const & it, UpdateType utype)
 {
        setLabel(_("wrap: ") + floatName(params_.type));
        Counters & cnts =
@@ -128,7 +130,7 @@ void InsetWrap::updateLabels(ParIterator const & it, UpdateType utype)
        // Tell to captions what the current float is
        cnts.current_float(params().type);
 
-       InsetCollapsable::updateLabels(it, utype);
+       InsetCollapsable::updateBuffer(it, utype);
 
        // reset afterwards
        cnts.current_float(saveflt);
@@ -180,7 +182,7 @@ void InsetWrap::validate(LaTeXFeatures & features) const
 }
 
 
-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,9 +196,8 @@ 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;
 }
 
 
@@ -225,7 +226,7 @@ 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 + ";'";
+       string const attr = "class='wrap' style='width: " + width + ";'";
        xs << html::StartTag("div", attr);
        docstring const deferred = 
                InsetText::insetAsXHTML(xs, rp, InsetText::WriteInnerTag);