X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetFloatList.cpp;h=981503f9df4931f9fac68f5f68fc522efbfd6799;hb=245c2b3c45dce1f5f385665e932ee19c9a904081;hp=fcaf1b36c4a8bfe896f76a11e220872f1c3fa543;hpb=ecef54500d4d77baf4fa47eac2253679875ac08c;p=lyx.git

diff --git a/src/insets/InsetFloatList.cpp b/src/insets/InsetFloatList.cpp
index fcaf1b36c4..981503f9df 100644
--- a/src/insets/InsetFloatList.cpp
+++ b/src/insets/InsetFloatList.cpp
@@ -171,7 +171,7 @@ int InsetFloatList::plaintext(odocstringstream & os,
 }
 
 
-docstring InsetFloatList::xhtml(XHTMLStream &, OutputParams const &) const {
+docstring InsetFloatList::xhtml(XHTMLStream &, OutputParams const & op) const {
 	FloatList const & floats = buffer().params().documentClass().floats();
 	FloatList::const_iterator cit = floats[to_ascii(getParam("type"))];
 
@@ -193,17 +193,20 @@ docstring InsetFloatList::xhtml(XHTMLStream &, OutputParams const &) const {
 		string const type = cit->second.floattype();
 		if (type == "table") {
 			toctype = "table";
-			toclabel = _("List of Tables");
+			toclabel = translateIfPossible(from_ascii("List of Tables"),
+			                               op.local_font->language()->lang());
 		} else if (type == "figure") {
 			toctype = "figure";
-			toclabel = _("List of Figures");
+			toclabel = translateIfPossible(from_ascii("List of Figures"),
+			                               op.local_font->language()->lang());
 		} else {
 			LYXERR0("Unknown Builtin Float!");
 			return docstring();
 		}
 	} else {
 		toctype = to_utf8(getParam("type"));
-		toclabel = buffer().B_(cit->second.listName());
+		toclabel = translateIfPossible(from_utf8(cit->second.listName()),
+		                               op.local_font->language()->lang());
 	}
 
 	// FIXME Do we need to check if it exists? If so, we need a new
@@ -231,7 +234,7 @@ docstring InsetFloatList::xhtml(XHTMLStream &, OutputParams const &) const {
 	}
 	
 	string const tocclass = lay ? " " + lay->defaultCSSClass(): "";
-	string const tocattr = "class='tochead + toc-" + toctype + " " + tocclass + "'";
+	string const tocattr = "class='tochead toc-" + toctype + tocclass + "'";
 	
 	// we'll use our own stream, because we are going to defer everything.
 	// that's how we deal with the fact that we're probably inside a standard
@@ -239,24 +242,22 @@ docstring InsetFloatList::xhtml(XHTMLStream &, OutputParams const &) const {
 	odocstringstream ods;
 	XHTMLStream xs(ods);
 
-	xs << html::StartTag("div", "class='toc'");
-	xs << html::StartTag("div", tocattr) 
+	InsetLayout const & il = getLayout();
+	string const & tag = il.htmltag();
+	xs << html::StartTag("div", "class='toc toc-floats'");
+	xs << html::StartTag(tag, tocattr)
 		 << toclabel 
-		 << html::EndTag("div");
+		 << html::EndTag(tag);
 	
 	Toc::const_iterator it = toc.begin();
 	Toc::const_iterator const en = toc.end();
 	for (; it != en; ++it) {
 		Paragraph const & par = it->dit().innerParagraph();
-		string const attr = "class='lyxtoc-" + toctype + "'";
-		Font const dummy;
+		string const attr = "class='lyxtoc-floats lyxtoc-" + toctype + "'";
 		xs << html::StartTag("div", attr);
-		string const parattr = "href='#" + par.magicLabel() + "' class='tocarrow'";
-		xs << it->str() << " "
-		   << html::StartTag("a", parattr)
-		   // FIXME XHTML 
-		   // There ought to be a simple way to customize this.
-		   << XHTMLStream::ESCAPE_NONE << "&gt;"
+		string const parattr = "href='#" + par.magicLabel() + "' class='lyxtoc-floats'";
+		xs << html::StartTag("a", parattr)
+		   << it->str()
 		   << html::EndTag("a");
 		xs << html::EndTag("div");
 	}
@@ -268,6 +269,13 @@ docstring InsetFloatList::xhtml(XHTMLStream &, OutputParams const &) const {
 void InsetFloatList::validate(LaTeXFeatures & features) const
 {
 	features.useFloat(to_ascii(getParam("type")));
+	features.useInsetLayout(getLayout());
+}
+
+
+docstring InsetFloatList::layoutName() const
+{ 
+	return "FloatList:" + getParam("type");
 }