* src/LyXAction.C: mark goto-clear-bookmark as working without buffer

[lyx.git] / src / insets / insetwrap.C

diff --git a/src/insets/insetwrap.C b/src/insets/insetwrap.C
index 1ac102ba36c3dd12ded6f33057766aa4fe9b1397..570802c50d70b6371f71452d6cf531b577cd2b32 100644 (file)
--- a/src/insets/insetwrap.C
+++ b/src/insets/insetwrap.C
@@ -28,11 +28,12 @@
 #include "lyxlex.h"
 #include "outputparams.h"
 #include "paragraph.h"
-#include "pariterator.h"
+#include "TocBackend.h"
 
 #include "support/convert.h"
 
-#include <sstream>
+
+namespace lyx {
 
 using std::string;
 using std::endl;
@@ -42,22 +43,10 @@ using std::ostream;
 using std::ostringstream;
 
 
-namespace {
-
-string floatname(string const & type, BufferParams const & bp)
-{
-       FloatList const & floats = bp.getLyXTextClass().floats();
-       FloatList::const_iterator it = floats[type];
-       return (it == floats.end()) ? type : _(it->second.name());
-}
-
-} // namespace anon
-
-
 InsetWrap::InsetWrap(BufferParams const & bp, string const & type)
        : InsetCollapsable(bp)
 {
-       setLabel(_("wrap: ") + floatname(type, bp));
+       setLabel(_("wrap: ") + floatName(type, bp));
        LyXFont font(LyXFont::ALL_SANE);
        font.decSize();
        font.decSize();
@@ -65,7 +54,7 @@ InsetWrap::InsetWrap(BufferParams const & bp, string const & type)
        setLabelFont(font);
        params_.type = type;
        params_.width = LyXLength(50, LyXLength::PCW);
-       setInsetName(type);
+       setInsetName(from_utf8(type));
 }
 
 
@@ -80,7 +69,7 @@ void InsetWrap::doDispatch(LCursor & cur, FuncRequest & cmd)
        switch (cmd.action) {
        case LFUN_INSET_MODIFY: {
                InsetWrapParams params;
-               InsetWrapMailer::string2params(cmd.argument, params);
+               InsetWrapMailer::string2params(to_utf8(cmd.argument()), params);
                params_.placement = params.placement;
                params_.width     = params.width;
                break;
@@ -184,31 +173,32 @@ auto_ptr<InsetBase> InsetWrap::doClone() const
 }
 
 
-string const InsetWrap::editMessage() const
+docstring const InsetWrap::editMessage() const
 {
        return _("Opened Wrap Inset");
 }
 
 
-int InsetWrap::latex(Buffer const & buf, ostream & os,
+int InsetWrap::latex(Buffer const & buf, odocstream & os,
                     OutputParams const & runparams) const
 {
-       os << "\\begin{floating" << params_.type << '}';
+       os << "\\begin{floating" << from_ascii(params_.type) << '}';
        if (!params_.placement.empty())
-               os << '[' << params_.placement << ']';
-       os << '{' << params_.width.asLatexString() << "}%\n";
+               os << '[' << from_ascii(params_.placement) << ']';
+       os << '{' << from_ascii(params_.width.asLatexString()) << "}%\n";
        int const i = InsetText::latex(buf, os, runparams);
-       os << "\\end{floating" << params_.type << "}%\n";
+       os << "\\end{floating" << from_ascii(params_.type) << "}%\n";
        return i + 2;
 }
 
 
-int InsetWrap::docbook(Buffer const & buf, ostream & os,
+int InsetWrap::docbook(Buffer const & buf, odocstream & os,
                       OutputParams const & runparams) const
 {
-       os << '<' << params_.type << '>';
+        // FIXME UNICODE
+        os << '<' << from_ascii(params_.type) << '>';
        int const i = InsetText::docbook(buf, os, runparams);
-       os << "</" << params_.type << '>';
+       os << "</" << from_ascii(params_.type) << '>';
        return i;
 }
 
@@ -234,7 +224,7 @@ bool InsetWrap::showInsetDialog(BufferView * bv) const
 }
 
 
-void InsetWrap::addToToc(lyx::toc::TocList & toclist, Buffer const & buf) const
+void InsetWrap::addToToc(TocList & toclist, Buffer const & buf) const
 {
        ParConstIterator pit = par_const_iterator_begin(*this);
        ParConstIterator end = par_const_iterator_end(*this);
@@ -242,12 +232,11 @@ void InsetWrap::addToToc(lyx::toc::TocList & toclist, Buffer const & buf) const
        // Find a caption layout in one of the (child inset's) pars
        for (; pit != end; ++pit) {
                if (pit->layout()->labeltype == LABEL_SENSITIVE) {
-                       string const name = floatname(params_.type, buf.params());
-                       string const str =
-                               convert<string>(toclist[name].size() + 1)
+                       Toc & toc = toclist[params_.type];
+                       docstring const str =
+                               convert<docstring>(toc.size() + 1)
                                + ". " + pit->asString(buf, false);
-                       lyx::toc::TocItem const item(pit->id(), 0 , str);
-                       toclist[name].push_back(item);
+                       toc.push_back(TocItem(pit, 0, str));
                }
        }
 }
@@ -301,3 +290,6 @@ string const InsetWrapMailer::params2string(InsetWrapParams const & params)
        params.write(data);
        return data.str();
 }
+
+
+} // namespace lyx