Handle the case of TeX fonts LuaTeX

[lyx.git] / src / insets / InsetFloatList.cpp

diff --git a/src/insets/InsetFloatList.cpp b/src/insets/InsetFloatList.cpp
index 0f849b24eea3c8dd2e47bb5c3e1d1d4e80fdc6b0..2d9c33d5039ac5c7ae6ba3abaa0f4a270e2deb11 100644 (file)
--- 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"
 
@@ -209,10 +210,8 @@ docstring InsetFloatList::xhtml(XHTMLStream &, OutputParams const & op) const {
                                               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.
@@ -234,7 +233,7 @@ docstring InsetFloatList::xhtml(XHTMLStream &, OutputParams const & op) 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
@@ -242,24 +241,24 @@ docstring InsetFloatList::xhtml(XHTMLStream &, OutputParams const & op) 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();
+       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;
+               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");
        }
@@ -271,6 +270,13 @@ docstring InsetFloatList::xhtml(XHTMLStream &, OutputParams const & op) const {
 void InsetFloatList::validate(LaTeXFeatures & features) const
 {
        features.useFloat(to_ascii(getParam("type")));
+       features.useInsetLayout(getLayout());
+}
+
+
+docstring InsetFloatList::layoutName() const
+{ 
+       return "FloatList:" + getParam("type");
 }