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

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

diff --git a/src/insets/insetfloatlist.C b/src/insets/insetfloatlist.C
index d7e538c18e355bb57e486aae8ea281f3c1c4a5e8..6d11d93aa0b04536dff1d1ac6322ef0f12bc5ec1 100644 (file)
--- a/src/insets/insetfloatlist.C
+++ b/src/insets/insetfloatlist.C
@@ -23,12 +23,14 @@
 #include "LaTeXFeatures.h"
 #include "lyxlex.h"
 #include "metricsinfo.h"
-#include "toc.h"
+#include "TocBackend.h"
 
 #include "support/lstrings.h"
 
-using lyx::docstring;
-using lyx::support::bformat;
+
+namespace lyx {
+
+using support::bformat;
 
 using std::endl;
 using std::string;
@@ -36,21 +38,21 @@ using std::ostream;
 
 
 InsetFloatList::InsetFloatList()
-       : InsetCommand(InsetCommandParams(), "toc")
+       : InsetCommand(InsetCommandParams("floatlist"), "toc")
 {}
 
 
 InsetFloatList::InsetFloatList(string const & type)
-       : InsetCommand(InsetCommandParams(), "toc")
+       : InsetCommand(InsetCommandParams("floatlist"), "toc")
 {
-       setCmdName(type);
+       setParam("type", from_ascii(type));
 }
 
 
 docstring const InsetFloatList::getScreenLabel(Buffer const & buf) const
 {
        FloatList const & floats = buf.params().getLyXTextClass().floats();
-       FloatList::const_iterator it = floats[getCmdName()];
+       FloatList::const_iterator it = floats[to_ascii(getParam("type"))];
        if (it != floats.end())
                return buf.B_(it->second.listName());
        else
@@ -66,7 +68,7 @@ InsetBase::Code InsetFloatList::lyxCode() const
 
 void InsetFloatList::write(Buffer const &, ostream & os) const
 {
-       os << "FloatList " << getCmdName() << "\n";
+       os << "FloatList " << to_ascii(getParam("type")) << "\n";
 }
 
 
@@ -76,9 +78,10 @@ void InsetFloatList::read(Buffer const & buf, LyXLex & lex)
        string token;
 
        if (lex.eatLine()) {
-               setCmdName(lex.getString());
-               lyxerr[Debug::INSETS] << "FloatList::float_type: " << getCmdName() << endl;
-               if (!floats.typeExist(getCmdName()))
+               setParam("type", lex.getDocString());
+               lyxerr[Debug::INSETS] << "FloatList::float_type: "
+                                     << to_ascii(getParam("type")) << endl;
+               if (!floats.typeExist(to_ascii(getParam("type"))))
                        lex.printError("InsetFloatList: Unknown float type: `$$Token'");
        } else
                lex.printError("InsetFloatList: Parse error: `$$Token'");
@@ -95,11 +98,11 @@ void InsetFloatList::read(Buffer const & buf, LyXLex & lex)
 }
 
 
-int InsetFloatList::latex(Buffer const & buf, ostream & os,
+int InsetFloatList::latex(Buffer const & buf, odocstream & os,
                          OutputParams const &) const
 {
        FloatList const & floats = buf.params().getLyXTextClass().floats();
-       FloatList::const_iterator cit = floats[getCmdName()];
+       FloatList::const_iterator cit = floats[to_ascii(getParam("type"))];
 
        if (cit != floats.end()) {
                if (cit->second.builtin()) {
@@ -113,26 +116,24 @@ int InsetFloatList::latex(Buffer const & buf, ostream & os,
                                os << "%% unknown builtin float\n";
                        }
                } else {
-                       // FIXME UNICODE
-                       os << "\\listof{" << getCmdName() << "}{"
-                          << lyx::to_utf8(buf.B_(cit->second.listName())) << "}\n";
+                       os << "\\listof{" << getParam("type") << "}{"
+                          << buf.B_(cit->second.listName()) << "}\n";
                }
        } else {
-               // FIXME UNICODE
-               os << "%%\\listof{" << getCmdName() << "}{"
-                  << lyx::to_utf8(bformat(_("List of %1$s"), lyx::from_utf8(cit->second.name())))
+               os << "%%\\listof{" << getParam("type") << "}{"
+                  << bformat(_("List of %1$s"), from_utf8(cit->second.name()))
                   << "}\n";
        }
        return 1;
 }
 
 
-int InsetFloatList::plaintext(Buffer const & buffer, lyx::odocstream & os,
+int InsetFloatList::plaintext(Buffer const & buffer, odocstream & os,
                               OutputParams const &) const
 {
        os << getScreenLabel(buffer) << "\n\n";
 
-       lyx::toc::asciiTocList(getCmdName(), buffer, os);
+       buffer.tocBackend().writePlaintextTocList(to_ascii(getParam("type")), os);
 
        os << "\n";
        return 0;
@@ -141,5 +142,8 @@ int InsetFloatList::plaintext(Buffer const & buffer, lyx::odocstream & os,
 
 void InsetFloatList::validate(LaTeXFeatures & features) const
 {
-       features.useFloat(getCmdName());
+       features.useFloat(to_ascii(getParam("type")));
 }
+
+
+} // namespace lyx