Fix wrongly copy-pasted entries in SpellcheckerUi.ui

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

diff --git a/src/insets/InsetFloatList.cpp b/src/insets/InsetFloatList.cpp
index a0d29d0ffb5e807313efe8eb71b4489f5b2d21a3..f0c649824e6b077e74def8c2ebf68116d37e72e9 100644 (file)
--- a/src/insets/InsetFloatList.cpp
+++ b/src/insets/InsetFloatList.cpp
@@ -17,6 +17,7 @@
 #include "DispatchResult.h"
 #include "Floating.h"
 #include "FloatList.h"
+#include "Font.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
@@ -112,17 +113,19 @@ void InsetFloatList::read(Lexer & lex)
 }
 
 
-int InsetFloatList::latex(odocstream & 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 
@@ -131,11 +134,11 @@ int InsetFloatList::latex(odocstream & 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;
 }
 
 
@@ -166,7 +169,7 @@ 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") {
@@ -234,7 +237,7 @@ docstring InsetFloatList::xhtml(XHTMLStream &, OutputParams const &) const {
                   << html::StartTag("a", parattr)
                   // FIXME XHTML 
                   // There ought to be a simple way to customize this.
-                  << XHTMLStream::NextRaw() << "&gt;"
+                  << XHTMLStream::ESCAPE_NONE << "&gt;"
                   << html::EndTag("a");
                xs << html::EndTag("div");
        }