Links between citations and bibliography entries were broken in XHTML

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

diff --git a/src/insets/InsetFloatList.cpp b/src/insets/InsetFloatList.cpp
index e52f416aa5a2b2579e1cd3b20a28e4db1343d73b..0f849b24eea3c8dd2e47bb5c3e1d1d4e80fdc6b0 100644 (file)
--- a/src/insets/InsetFloatList.cpp
+++ b/src/insets/InsetFloatList.cpp
@@ -14,10 +14,13 @@
 
 #include "Buffer.h"
 #include "BufferParams.h"
+#include "BufferView.h"
+#include "Cursor.h"
 #include "DispatchResult.h"
 #include "Floating.h"
 #include "FloatList.h"
 #include "Font.h"
+#include "FuncRequest.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
@@ -79,6 +82,21 @@ docstring InsetFloatList::screenLabel() const
 }
 
 
+void InsetFloatList::doDispatch(Cursor & cur, FuncRequest & cmd) {
+       switch (cmd.action()) {
+       case LFUN_MOUSE_RELEASE:
+               if (!cur.selection() && cmd.button() == mouse_button::button1) {
+                       cur.bv().showDialog("toc", params2string(params()));
+                       cur.dispatched();
+               }
+               break;
+       
+       default:
+               InsetCommand::doDispatch(cur, cmd);
+       }
+}
+
+
 void InsetFloatList::write(ostream & os) const
 {
        os << "FloatList " << to_ascii(getParam("type")) << "\n";
@@ -113,17 +131,19 @@ void InsetFloatList::read(Lexer & lex)
 }
 
 
-int InsetFloatList::latex(otexstream & os, OutputParams const &) const
+void InsetFloatList::latex(otexstream & os, OutputParams const &) const
 {
        FloatList const & floats = buffer().params().documentClass().floats();
        FloatList::const_iterator cit = floats[to_ascii(getParam("type"))];
 
        if (cit != floats.end()) {
                Floating const & fl = cit->second;
-               if (fl.needsFloatPkg())
+               if (fl.usesFloatPkg()) {
+                       docstring const name =
+                               buffer().language()->translateLayout(fl.listName());
                        os << "\\listof{" << getParam("type") << "}{"
-                          << buffer().B_(fl.listName()) << "}\n"; 
-               else {
+                          << name << "}\n";
+               } else {
                        if (!fl.listCommand().empty())
                                os << "\\" << from_ascii(fl.listCommand()) << "\n";
                        else 
@@ -132,25 +152,26 @@ int InsetFloatList::latex(otexstream & os, OutputParams const &) const
                                   << "\n";
                }
        } else {
+               string const flName = "List of " + to_utf8(getParam("type"));
+               docstring const name = buffer().language()->translateLayout(flName);
                os << "%%\\listof{" << getParam("type") << "}{"
-                  << bformat(_("List of %1$s"), getParam("type"))
-                  << "}\n";
+                  << name << "}\n";
        }
-       return 1;
 }
 
 
-int InsetFloatList::plaintext(odocstream & os, OutputParams const &) const
+int InsetFloatList::plaintext(odocstringstream & os,
+        OutputParams const &, size_t max_length) const
 {
        os << screenLabel() << "\n\n";
 
-       buffer().tocBackend().writePlaintextTocList(to_ascii(getParam("type")), os);
+       buffer().tocBackend().writePlaintextTocList(to_ascii(getParam("type")), os, max_length);
 
        return PLAINTEXT_NEWLINE;
 }
 
 
-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"))];
 
@@ -167,22 +188,25 @@ docstring InsetFloatList::xhtml(XHTMLStream &, OutputParams const &) const {
        // If so, then they should define ListName, as non-builtin floats do, and
        // then we can use that. 
        // Really, all floats should define that.
-       if (!cit->second.needsFloatPkg()) {
+       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