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

diff --git a/src/insets/InsetFloatList.cpp b/src/insets/InsetFloatList.cpp
index fcaf1b36c4..e711feebf4 100644
--- a/src/insets/InsetFloatList.cpp
+++ b/src/insets/InsetFloatList.cpp
@@ -26,6 +26,7 @@
 #include "Lexer.h"
 #include "Paragraph.h"
 #include "output_xhtml.h"
+#include "texstream.h"
 #include "TextClass.h"
 #include "TocBackend.h"
 
@@ -90,7 +91,7 @@ void InsetFloatList::doDispatch(Cursor & cur, FuncRequest & cmd) {
 			cur.dispatched();
 		}
 		break;
-	
+
 	default:
 		InsetCommand::doDispatch(cur, cmd);
 	}
@@ -146,7 +147,7 @@ void InsetFloatList::latex(otexstream & os, OutputParams const &) const
 		} else {
 			if (!fl.listCommand().empty())
 				os << "\\" << from_ascii(fl.listCommand()) << "\n";
-			else 
+			else
 				os << "%% "
 				   << bformat(_("LyX cannot generate a list of %1$s"), getParam("type"))
 				   << "\n";
@@ -171,7 +172,7 @@ int InsetFloatList::plaintext(odocstringstream & os,
 }
 
 
-docstring InsetFloatList::xhtml(XHTMLStream &, OutputParams const &) const {
+docstring InsetFloatList::xhtml(XMLStream &, OutputParams const & op) const {
 	FloatList const & floats = buffer().params().documentClass().floats();
 	FloatList::const_iterator cit = floats[to_ascii(getParam("type"))];
 
@@ -186,42 +187,43 @@ docstring InsetFloatList::xhtml(XHTMLStream &, OutputParams const &) const {
 	// Other builtin floats should be handled here. But I'm not sure if that is
 	// even possible yet, since I'm not sure if we have a TOC for such things.
 	// If so, then they should define ListName, as non-builtin floats do, and
-	// then we can use that. 
+	// then we can use that.
 	// Really, all floats should define that.
 	if (cit->second.isPredefined()) {
 		// Only two different types allowed here:
 		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
-	// routine in TocBackend to do that.
-	Toc const & toc = buffer().tocBackend().toc(toctype);
-	if (toc.empty())
+	shared_ptr<Toc const> toc = buffer().tocBackend().toc(toctype);
+	if (toc->empty())
 		return docstring();
 
 	// we want to look like a chapter, section, or whatever.
 	// so we're going to look for the layout with the minimum toclevel
-	// number > 0---because we don't want Part. 
+	// number > 0---because we don't want Part.
 	// we'll take the first one, just because.
 	// FIXME This could be specified in the layout file.
 	DocumentClass const & dc = buffer().params().documentClass();
 	TextClass::LayoutList::const_iterator lit = dc.begin();
 	TextClass::LayoutList::const_iterator len = dc.end();
 	int minlevel = 1000;
-	Layout const * lay = NULL;
+	Layout const * lay = nullptr;
 	for (; lit != len; ++lit) {
 		int const level = lit->toclevel;
 		if (level > 0 && (level == Layout::NOT_IN_TOC || level >= minlevel))
@@ -229,38 +231,38 @@ docstring InsetFloatList::xhtml(XHTMLStream &, OutputParams const &) const {
 		lay = &*lit;
 		minlevel = level;
 	}
-	
+
 	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
 	// paragraph, and we don't want to be.
 	odocstringstream ods;
-	XHTMLStream xs(ods);
-
-	xs << html::StartTag("div", "class='toc'");
-	xs << html::StartTag("div", tocattr) 
-		 << toclabel 
-		 << html::EndTag("div");
-	
-	Toc::const_iterator it = toc.begin();
-	Toc::const_iterator const en = toc.end();
+	XMLStream xs(ods);
+
+	InsetLayout const & il = getLayout();
+	string const & tag = il.htmltag();
+	xs << xml::StartTag("div", "class='toc toc-floats'");
+	xs << xml::StartTag(tag, tocattr)
+		 << toclabel
+		 << xml::EndTag(tag);
+
+	Toc::const_iterator it = toc->begin();
+	Toc::const_iterator const en = toc->end();
 	for (; it != en; ++it) {
+		if (it->str().empty())
+			continue;
 		Paragraph const & par = it->dit().innerParagraph();
-		string const attr = "class='lyxtoc-" + toctype + "'";
-		Font const dummy;
-		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;"
-		   << html::EndTag("a");
-		xs << html::EndTag("div");
+		string const attr = "class='lyxtoc-floats lyxtoc-" + toctype + "'";
+		xs << xml::StartTag("div", attr);
+		string const parattr = "href='#" + par.magicLabel() + "' class='lyxtoc-floats'";
+		xs << xml::StartTag("a", parattr)
+		   << it->str()
+		   << xml::EndTag("a");
+		xs << xml::EndTag("div");
 	}
-	xs << html::EndTag("div");
+	xs << xml::EndTag("div");
 	return ods.str();
 }
 
@@ -268,6 +270,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");
 }