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

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

diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C
index eae8bfc881f97e30ae5f71f4e2148ffdd4334c63..523602e99361a87d2c99d5aaa6e250bb88961eca 100644 (file)
--- a/src/insets/insetfloat.C
+++ b/src/insets/insetfloat.C
@@ -29,15 +29,15 @@
 #include "lyxlex.h"
 #include "outputparams.h"
 #include "paragraph.h"
-#include "pariterator.h"
+#include "TocBackend.h"
 
 #include "support/lstrings.h"
 #include "support/convert.h"
 
-#include <sstream>
 
-using lyx::docstring;
-using lyx::support::contains;
+namespace lyx {
+
+using support::contains;
 
 using std::endl;
 using std::string;
@@ -118,15 +118,14 @@ using std::ostringstream;
 InsetFloat::InsetFloat(BufferParams const & bp, string const & type)
        : InsetCollapsable(bp)
 {
-       // FIXME UNICODE
-       setLabel(lyx::to_utf8(_("float: ")) + floatName(type, bp));
+       setLabel(_("float: ") + floatName(type, bp));
        LyXFont font(LyXFont::ALL_SANE);
        font.decSize();
        font.decSize();
        font.setColor(LColor::collapsable);
        setLabelFont(font);
        params_.type = type;
-       setInsetName(type);
+       setInsetName(from_utf8(type));
 }
 
 
@@ -142,7 +141,7 @@ void InsetFloat::doDispatch(LCursor & cur, FuncRequest & cmd)
 
        case LFUN_INSET_MODIFY: {
                InsetFloatParams params;
-               InsetFloatMailer::string2params(lyx::to_utf8(cmd.argument()), params);
+               InsetFloatMailer::string2params(to_utf8(cmd.argument()), params);
                params_.placement = params.placement;
                params_.wide      = params.wide;
                params_.sideways  = params.sideways;
@@ -280,7 +279,7 @@ docstring const InsetFloat::editMessage() const
 }
 
 
-int InsetFloat::latex(Buffer const & buf, ostream & os,
+int InsetFloat::latex(Buffer const & buf, odocstream & os,
                      OutputParams const & runparams) const
 {
        FloatList const & floats = buf.params().getLyXTextClass().floats();
@@ -311,11 +310,11 @@ int InsetFloat::latex(Buffer const & buf, ostream & os,
        // The \n is used to force \begin{<floatname>} to appear in a new line.
        // The % is needed to prevent two consecutive \n chars in the case
        // when the current output line is empty.
-       os << "%\n\\begin{" << tmptype << '}';
+       os << "%\n\\begin{" << from_ascii(tmptype) << '}';
        // We only output placement if different from the def_placement.
        // sidewaysfloats always use their own page
        if (!placement.empty() && !params_.sideways) {
-               os << '[' << placement << ']';
+               os << '[' << from_ascii(placement) << ']';
        }
        os << '\n';
 
@@ -323,18 +322,19 @@ int InsetFloat::latex(Buffer const & buf, ostream & os,
 
        // The \n is used to force \end{<floatname>} to appear in a new line.
        // In this case, we do not case if the current output line is empty.
-       os << "\n\\end{" << tmptype << "}\n";
+       os << "\n\\end{" << from_ascii(tmptype) << "}\n";
 
        return i + 4;
 }
 
 
-int InsetFloat::docbook(Buffer const & buf, ostream & os,
+int InsetFloat::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;
 }
@@ -359,8 +359,7 @@ bool InsetFloat::showInsetDialog(BufferView * bv) const
 void InsetFloat::wide(bool w, BufferParams const & bp)
 {
        params_.wide = w;
-       // FIXME UNICODE
-       string lab = lyx::to_utf8(_("float: ")) + floatName(params_.type, bp);
+       docstring lab = _("float: ") + floatName(params_.type, bp);
        if (params_.wide)
                lab += '*';
        setLabel(lab);
@@ -370,15 +369,14 @@ void InsetFloat::wide(bool w, BufferParams const & bp)
 void InsetFloat::sideways(bool s, BufferParams const & bp)
 {
        params_.sideways = s;
-       // FIXME UNICODE
-       string lab = lyx::to_utf8(_("float: ")) + floatName(params_.type, bp);
+       docstring lab = _("float: ") + floatName(params_.type, bp);
        if (params_.sideways)
-               lab += lyx::to_utf8(_(" (sideways)"));
+               lab += _(" (sideways)");
        setLabel(lab);
 }
 
 
-void InsetFloat::addToToc(lyx::toc::TocList & toclist, Buffer const & buf) const
+void InsetFloat::addToToc(TocList & toclist, Buffer const & buf) const
 {
        ParConstIterator pit = par_const_iterator_begin(*this);
        ParConstIterator end = par_const_iterator_end(*this);
@@ -386,12 +384,12 @@ void InsetFloat::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 type = params_.type;
-                       string const str =
-                               convert<string>(toclist[type].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, 0 , str);
-                       toclist[type].push_back(item);
+                       toc.push_back(TocItem(pit, 0, str));
+                       return;
                }
        }
 }
@@ -446,3 +444,6 @@ string const InsetFloatMailer::params2string(InsetFloatParams const & params)
        params.write(data);
        return data.str();
 }
+
+
+} // namespace lyx