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

diff --git a/src/insets/insetfloatlist.C b/src/insets/insetfloatlist.C
index cdd1d857af..6d11d93aa0 100644
--- a/src/insets/insetfloatlist.C
+++ b/src/insets/insetfloatlist.C
@@ -23,11 +23,14 @@
 #include "LaTeXFeatures.h"
 #include "lyxlex.h"
 #include "metricsinfo.h"
-#include "toc.h"
+#include "TocBackend.h"
 
 #include "support/lstrings.h"
 
-using lyx::support::bformat;
+
+namespace lyx {
+
+using support::bformat;
 
 using std::endl;
 using std::string;
@@ -35,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));
 }
 
 
-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_iterator it = floats[to_ascii(getParam("type"))];
 	if (it != floats.end())
 		return buf.B_(it->second.listName());
 	else
@@ -57,15 +60,15 @@ string const InsetFloatList::getScreenLabel(Buffer const & buf) const
 }
 
 
-InsetOld::Code InsetFloatList::lyxCode() const
+InsetBase::Code InsetFloatList::lyxCode() const
 {
-	return InsetOld::FLOAT_LIST_CODE;
+	return InsetBase::FLOAT_LIST_CODE;
 }
 
 
 void InsetFloatList::write(Buffer const &, ostream & os) const
 {
-	os << "FloatList " << getCmdName() << "\n";
+	os << "FloatList " << to_ascii(getParam("type")) << "\n";
 }
 
 
@@ -75,14 +78,15 @@ 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'");
 	while (lex.isOK()) {
-		lex.nextToken();
+		lex.next();
 		token = lex.getString();
 		if (token == "\\end_inset")
 			break;
@@ -94,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()) {
@@ -112,23 +116,24 @@ int InsetFloatList::latex(Buffer const & buf, ostream & os,
 				os << "%% unknown builtin float\n";
 			}
 		} else {
-			os << "\\listof{" << getCmdName() << "}{"
+			os << "\\listof{" << getParam("type") << "}{"
 			   << buf.B_(cit->second.listName()) << "}\n";
 		}
 	} else {
-		os << "%%\\listof{" << getCmdName() << "}{"
-		   << bformat(_("List of %1$s"), 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, ostream & os, OutputParams const &) const
+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;
@@ -137,5 +142,8 @@ int InsetFloatList::plaintext(Buffer const & buffer, ostream & os, OutputParams
 
 void InsetFloatList::validate(LaTeXFeatures & features) const
 {
-	features.useFloat(getCmdName());
+	features.useFloat(to_ascii(getParam("type")));
 }
+
+
+} // namespace lyx