X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetfloatlist.C;h=6d11d93aa0b04536dff1d1ac6322ef0f12bc5ec1;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=6562e74bd2a59ef8ad587cb5ad724f7a42af00b4;hpb=a0d71b53fea6dfb12489f937de0eb7218b0d20ea;p=lyx.git

diff --git a/src/insets/insetfloatlist.C b/src/insets/insetfloatlist.C
index 6562e74bd2..6d11d93aa0 100644
--- a/src/insets/insetfloatlist.C
+++ b/src/insets/insetfloatlist.C
@@ -1,76 +1,92 @@
-#include <config.h>
+/**
+ * \file insetfloatlist.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
 
 #include "insetfloatlist.h"
+
+#include "buffer.h"
+#include "bufferparams.h"
+#include "debug.h"
+#include "dispatchresult.h"
+#include "Floating.h"
 #include "FloatList.h"
+#include "funcrequest.h"
+#include "gettext.h"
 #include "LaTeXFeatures.h"
 #include "lyxlex.h"
-#include "frontends/Dialogs.h"
-#include "frontends/LyXView.h"
-#include "BufferView.h"
-#include "buffer.h"
-#include "toc.h"
-#include "gettext.h"
-#include "debug.h"
+#include "metricsinfo.h"
+#include "TocBackend.h"
 
+#include "support/lstrings.h"
+
+
+namespace lyx {
+
+using support::bformat;
 
-using std::ostream;
 using std::endl;
+using std::string;
+using std::ostream;
 
 
 InsetFloatList::InsetFloatList()
-	: InsetCommand(InsetCommandParams())
-{
-}
+	: InsetCommand(InsetCommandParams("floatlist"), "toc")
+{}
 
 
 InsetFloatList::InsetFloatList(string const & type)
-	: InsetCommand(InsetCommandParams())
+	: InsetCommand(InsetCommandParams("floatlist"), "toc")
 {
-	setCmdName(type);
+	setParam("type", from_ascii(type));
 }
 
 
-string const InsetFloatList::getScreenLabel(Buffer const * buf) const
+docstring const InsetFloatList::getScreenLabel(Buffer const & buf) const
 {
-	FloatList const & floats = buf->params.getLyXTextClass().floats();
-	FloatList::const_iterator it = floats[getCmdName()];
+	FloatList const & floats = buf.params().getLyXTextClass().floats();
+	FloatList::const_iterator it = floats[to_ascii(getParam("type"))];
 	if (it != floats.end())
-		return _(it->second.listName());
+		return buf.B_(it->second.listName());
 	else
 		return _("ERROR: Nonexistent float type!");
 }
 
 
-Inset::Code InsetFloatList::lyxCode() const
+InsetBase::Code InsetFloatList::lyxCode() const
 {
-	return Inset::FLOAT_LIST_CODE;
+	return InsetBase::FLOAT_LIST_CODE;
 }
 
 
-void InsetFloatList::write(Buffer const *, ostream & os) const
+void InsetFloatList::write(Buffer const &, ostream & os) const
 {
-	os << "FloatList " << getCmdName() << "\n";
+	os << "FloatList " << to_ascii(getParam("type")) << "\n";
 }
 
 
-void InsetFloatList::read(Buffer const * buf, LyXLex & lex)
+void InsetFloatList::read(Buffer const & buf, LyXLex & lex)
 {
-	FloatList const & floats = buf->params.getLyXTextClass().floats();
+	FloatList const & floats = buf.params().getLyXTextClass().floats();
 	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'");
 	while (lex.isOK()) {
-		lex.nextToken();
+		lex.next();
 		token = lex.getString();
 		if (token == "\\end_inset")
 			break;
@@ -82,22 +98,11 @@ void InsetFloatList::read(Buffer const * buf, LyXLex & lex)
 }
 
 
-void InsetFloatList::edit(BufferView * bv, int, int, mouse_button::state)
+int InsetFloatList::latex(Buffer const & buf, odocstream & os,
+			  OutputParams const &) const
 {
-	bv->owner()->getDialogs().showTOC(this);
-}
-
-
-void InsetFloatList::edit(BufferView * bv, bool)
-{
-	edit(bv, 0, 0, mouse_button::none);
-}
-
-
-int InsetFloatList::latex(Buffer const * buf, ostream & os, bool, bool) const
-{
-	FloatList const & floats = buf->params.getLyXTextClass().floats();
-	FloatList::const_iterator cit = floats[getCmdName()];
+	FloatList const & floats = buf.params().getLyXTextClass().floats();
+	FloatList::const_iterator cit = floats[to_ascii(getParam("type"))];
 
 	if (cit != floats.end()) {
 		if (cit->second.builtin()) {
@@ -111,22 +116,24 @@ int InsetFloatList::latex(Buffer const * buf, ostream & os, bool, bool) const
 				os << "%% unknown builtin float\n";
 			}
 		} else {
-			os << "\\listof{" << getCmdName() << "}{"
-			   << cit->second.listName() << "}\n";
+			os << "\\listof{" << getParam("type") << "}{"
+			   << buf.B_(cit->second.listName()) << "}\n";
 		}
 	} else {
-		os << "%%\\listof{" << getCmdName() << "}{"
-		   << _("List of ") << cit->second.name() << "}\n";
+		os << "%%\\listof{" << getParam("type") << "}{"
+		   << bformat(_("List of %1$s"), from_utf8(cit->second.name()))
+		   << "}\n";
 	}
 	return 1;
 }
 
 
-int InsetFloatList::ascii(Buffer const * buffer, ostream & os, int) const
+int InsetFloatList::plaintext(Buffer const & buffer, odocstream & os,
+                              OutputParams const &) const
 {
 	os << getScreenLabel(buffer) << "\n\n";
 
-	toc::asciiTocList(getCmdName(), buffer, os);
+	buffer.tocBackend().writePlaintextTocList(to_ascii(getParam("type")), os);
 
 	os << "\n";
 	return 0;
@@ -135,5 +142,8 @@ int InsetFloatList::ascii(Buffer const * buffer, ostream & os, int) const
 
 void InsetFloatList::validate(LaTeXFeatures & features) const
 {
-	features.useFloat(getCmdName());
+	features.useFloat(to_ascii(getParam("type")));
 }
+
+
+} // namespace lyx