This patch introduces an optional argument to Buffer::updateLabels(), so

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

diff --git a/src/insets/InsetWrap.cpp b/src/insets/InsetWrap.cpp
index c07f39c9af637989d2e5bde9a03b3459901740c7..e92fdb76cd8eab8f1d8fa002334282ed9eb65a44 100644 (file)
--- a/src/insets/InsetWrap.cpp
+++ b/src/insets/InsetWrap.cpp
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Dekel Tsur
- * \author Uwe Stöhr
+ * \author Uwe Stöhr
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -24,13 +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 "TextClass.h"
-#include "TocBackend.h"
 
-#include "support/convert.h"
 #include "support/debug.h"
 #include "support/docstream.h"
 #include "support/gettext.h"
@@ -42,10 +40,10 @@ using namespace std;
 
 namespace lyx {
 
-InsetWrap::InsetWrap(Buffer const & buf, string const & type)
+InsetWrap::InsetWrap(Buffer * buf, string const & type)
        : InsetCollapsable(buf)
 {
-       setLabel(_("wrap: ") + floatName(type, buf.params()));
+       setLabel(_("wrap: ") + floatName(type));
        params_.type = type;
        params_.lines = 0;
        params_.placement = "o";
@@ -62,7 +60,7 @@ InsetWrap::~InsetWrap()
 
 docstring InsetWrap::name() const
 {
-       return from_utf8(params_.type);
+       return "Wrap:" + from_utf8(params_.type);
 }
 
 
@@ -71,7 +69,7 @@ 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())
+       if (!isOpen(bv) && !caption_tip.empty())
                return caption_tip + '\n' + default_tip;
        return default_tip;
 }
@@ -116,9 +114,9 @@ bool InsetWrap::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-void InsetWrap::updateLabels(ParIterator const & it)
+void InsetWrap::updateLabels(ParIterator const & it, bool out)
 {
-       setLabel(_("wrap: ") + floatName(params_.type, buffer().params()));
+       setLabel(_("wrap: ") + floatName(params_.type));
        Counters & cnts =
                buffer().masterBuffer()->params().documentClass().counters();
        string const saveflt = cnts.current_float();
@@ -126,7 +124,7 @@ void InsetWrap::updateLabels(ParIterator const & it)
        // Tell to captions what the current float is
        cnts.current_float(params().type);
 
-       InsetCollapsable::updateLabels(it);
+       InsetCollapsable::updateLabels(it, out);
 
        // reset afterwards
        cnts.current_float(saveflt);
@@ -170,18 +168,16 @@ void InsetWrap::read(Lexer & lex)
 void InsetWrap::validate(LaTeXFeatures & features) const
 {
        features.require("wrapfig");
+       features.inFloat(true);
        InsetCollapsable::validate(features);
+       features.inFloat(false);
 }
 
 
-docstring InsetWrap::editMessage() const
-{
-       return _("Opened Wrap Inset");
-}
-
-
-int InsetWrap::latex(odocstream & os, OutputParams const & runparams) const
+int InsetWrap::latex(odocstream & os, OutputParams const & runparams_in) const
 {
+       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)
@@ -201,7 +197,7 @@ int InsetWrap::latex(odocstream & os, OutputParams const & runparams) const
 int InsetWrap::plaintext(odocstream & os, OutputParams const & runparams) const
 {
        os << '[' << buffer().B_("wrap") << ' '
-               << floatName(params_.type, buffer().params()) << ":\n";
+               << floatName(params_.type) << ":\n";
        InsetText::plaintext(os, runparams);
        os << "\n]";
 
@@ -219,6 +215,20 @@ int InsetWrap::docbook(odocstream & os, OutputParams const & runparams) const
 }
 
 
+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 << StartTag("div", attr);
+       docstring const deferred = 
+               InsetText::insetAsXHTML(xs, rp, InsetText::WriteInnerTag);
+       if (!len.empty())
+               xs << EndTag("div");
+       return deferred;
+}
+
+
 bool InsetWrap::insetAllowed(InsetCode code) const
 {
        switch(code) {
@@ -241,29 +251,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<InsetCaption *>(it->inset);
-                               ins->getCaptionText(ods, runparams);
-                               return ods.str();
-                       }
-               }
-       }
-       return docstring();
-}
-
-
 void InsetWrap::string2params(string const & in, InsetWrapParams & params)
 {
        params = InsetWrapParams();