Remove all BufferParam arguments in InsetXXX methods (since insets know about their...

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

diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp
index 37a247af44341588628045ca3064656786b5583b..d70d356e7f30af7e2892ff7d558a4ad7c9051e18 100644 (file)
--- a/src/insets/InsetFloat.cpp
+++ b/src/insets/InsetFloat.cpp
@@ -25,14 +25,11 @@
 #include "FloatList.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "InsetList.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
-#include "OutputParams.h"
 #include "ParIterator.h"
 #include "TextClass.h"
 
-#include "support/convert.h"
 #include "support/debug.h"
 #include "support/docstream.h"
 #include "support/gettext.h"
@@ -116,7 +113,7 @@ namespace lyx {
 InsetFloat::InsetFloat(Buffer const & buf, string const & type)
        : InsetCollapsable(buf), name_(from_utf8(type))
 {
-       setLabel(_("float: ") + floatName(type, buf.params()));
+       setLabel(_("float: ") + floatName(type));
        params_.type = type;
 }
 
@@ -156,11 +153,9 @@ void InsetFloat::doDispatch(Cursor & cur, FuncRequest & cmd)
                        params_.placement = params.placement;
                        params_.wide      = params.wide;
                        params_.sideways  = params.sideways;
-                       setWide(params_.wide, cur.buffer()->params(), false);
-                       setSideways(params_.sideways, cur.buffer()->params(), false);
                }
 
-               setNewLabel(cur.buffer()->params());
+               setNewLabel();
                break;
        }
 
@@ -204,7 +199,7 @@ void InsetFloat::updateLabels(ParIterator const & it)
        // floats can only embed subfloats of their own kind
        if (subflt)
                params_.type = saveflt;
-       setSubfloat(subflt, buffer().params());
+       setSubfloat(subflt);
 
        // Tell to captions what the current float is
        cnts.current_float(params().type);
@@ -285,6 +280,36 @@ docstring InsetFloat::editMessage() const
 }
 
 
+docstring InsetFloat::xhtml(odocstream & os, OutputParams const & rp) const
+{
+       FloatList const & floats = buffer().params().documentClass().floats();
+       Floating const & ftype = floats.getType(params_.type);
+       string const htmltype = ftype.htmlType().empty() ? 
+                       "div" : ftype.htmlType();
+       string const htmlclass = ftype.htmlClass().empty() ?
+                       "float-" + params_.type : ftype.htmlClass();
+       docstring const otag = 
+                       from_ascii("<" + htmltype + " class='float " + htmlclass + "'>\n");
+       docstring const ctag = from_ascii("</" + htmltype + ">\n");
+
+       odocstringstream out;
+
+       out << otag;
+       docstring def = InsetText::xhtml(out, rp);
+       out << ctag;
+
+       if (rp.inFloat == OutputParams::NONFLOAT)
+               // In this case, this float needs to be deferred, but we'll put it
+               // before anything the text itself deferred.
+               def = out.str() + '\n' + def;
+       else 
+               // In this case, the whole thing is already being deferred, so
+               // we can write to the stream.
+               os << out.str();
+       return def;
+}
+
+
 int InsetFloat::latex(odocstream & os, OutputParams const & runparams_in) const
 {
        if (runparams_in.inFloat != OutputParams::NONFLOAT) {
@@ -356,7 +381,7 @@ int InsetFloat::latex(odocstream & os, OutputParams const & runparams_in) const
 int InsetFloat::plaintext(odocstream & os, OutputParams const & runparams) const
 {
        os << '[' << buffer().B_("float") << ' '
-               << floatName(params_.type, buffer().params()) << ":\n";
+               << floatName(params_.type) << ":\n";
        InsetText::plaintext(os, runparams);
        os << "\n]";
 
@@ -393,38 +418,38 @@ bool InsetFloat::showInsetDialog(BufferView * bv) const
 }
 
 
-void InsetFloat::setWide(bool w, BufferParams const & bp, bool update_label)
+void InsetFloat::setWide(bool w, bool update_label)
 {
        params_.wide = w;
        if (update_label)
-               setNewLabel(bp);
+               setNewLabel();
 }
 
 
-void InsetFloat::setSideways(bool s, BufferParams const & bp, bool update_label)
+void InsetFloat::setSideways(bool s, bool update_label)
 {
        params_.sideways = s;
        if (update_label)
-               setNewLabel(bp);
+               setNewLabel();
 }
 
 
-void InsetFloat::setSubfloat(bool s, BufferParams const & bp, bool update_label)
+void InsetFloat::setSubfloat(bool s, bool update_label)
 {
        params_.subfloat = s;
        if (update_label)
-               setNewLabel(bp);
+               setNewLabel();
 }
 
 
-void InsetFloat::setNewLabel(BufferParams const & bp)
+void InsetFloat::setNewLabel()
 {
        docstring lab = _("float: ");
 
        if (params_.subfloat)
                lab = _("subfloat: ");
 
-       lab += floatName(params_.type, bp);
+       lab += floatName(params_.type);
 
        if (params_.wide)
                lab += '*';
@@ -441,47 +466,16 @@ docstring InsetFloat::getCaption(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->getOptArg(ods, runparams);
-                               ods << '[';
-                               ins->getArgument(ods, runparams);
-                               ods << ']';
-                               return ods.str();
-                       }
-               }
-       }
-       return docstring();
-}
-
-
-docstring InsetFloat::getCaptionText(OutputParams const & runparams) const
-{
-       if (paragraphs().empty())
+       InsetCaption const * ins = getCaptionInset();
+       if (ins == 0)
                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();
+       odocstringstream ods;
+       ins->getOptArg(ods, runparams);
+       ods << '[';
+       ins->getArgument(ods, runparams);
+       ods << ']';
+       return ods.str();
 }