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

diff --git a/src/insets/insetfloatlist.C b/src/insets/insetfloatlist.C
index 0064f2dede..6d11d93aa0 100644
--- 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;
@@ -43,14 +45,14 @@ InsetFloatList::InsetFloatList()
 InsetFloatList::InsetFloatList(string const & type)
 	: 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,24 +68,41 @@ InsetBase::Code InsetFloatList::lyxCode() 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)
 {
-	InsetCommand::read(buf, lex);
-	lyxerr[Debug::INSETS] << "FloatList::float_type: " << getCmdName() << endl;
-	if (!buf.params().getLyXTextClass().floats().typeExist(getCmdName()))
-		lex.printError("InsetFloatList: Unknown float type: `$$Token'");
+	FloatList const & floats = buf.params().getLyXTextClass().floats();
+	string token;
+
+	if (lex.eatLine()) {
+		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.next();
+		token = lex.getString();
+		if (token == "\\end_inset")
+			break;
+	}
+	if (token != "\\end_inset") {
+		lex.printError("Missing \\end_inset at this point. "
+			       "Read: `$$Token'");
+	}
 }
 
 
-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()) {
@@ -97,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;
@@ -125,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