parlist-a-1.diff

[lyx.git] / src / insets / insetfloatlist.C

diff --git a/src/insets/insetfloatlist.C b/src/insets/insetfloatlist.C
index e40876460ef34a0686f9d84b3bc5e696f33a8b7f..3df488deb3ada0c903675a2581c34040081b0d90 100644 (file)
--- a/src/insets/insetfloatlist.C
+++ b/src/insets/insetfloatlist.C
@@ -1,18 +1,28 @@
+/**
+ * \file insetfloatlist.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS
+ */
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "insetfloatlist.h"
 #include "FloatList.h"
+#include "LaTeXFeatures.h"
+#include "lyxlex.h"
 #include "frontends/Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "BufferView.h"
 #include "buffer.h"
+#include "toc.h"
 #include "gettext.h"
 #include "debug.h"
 
+#include "support/BoostFormat.h"
 
 using std::ostream;
 using std::endl;
@@ -31,14 +41,21 @@ InsetFloatList::InsetFloatList(string const & type)
 }
 
 
-string const InsetFloatList::getScreenLabel(Buffer const *) const
+InsetFloatList::~InsetFloatList()
 {
-       string const guiName = floatList[getCmdName()]->second.name();
-       if (!guiName.empty()) {
-               string const res = _(guiName) + _(" List");
-               return res;
-       }
-       return _("ERROR: Nonexistent float type!");
+       InsetCommandMailer mailer("toc", *this);
+       mailer.hideDialog();
+}
+
+
+string const InsetFloatList::getScreenLabel(Buffer const * buf) const
+{
+       FloatList const & floats = buf->params.getLyXTextClass().floats();
+       FloatList::const_iterator it = floats[getCmdName()];
+       if (it != floats.end())
+               return _(it->second.listName());
+       else
+               return _("ERROR: Nonexistent float type!");
 }
 
 
@@ -54,13 +71,16 @@ void InsetFloatList::write(Buffer const *, ostream & os) const
 }
 
 
-void InsetFloatList::read(Buffer const *, LyXLex & lex)
+void InsetFloatList::read(Buffer const * buf, LyXLex & lex)
 {
+       FloatList const & floats = buf->params.getLyXTextClass().floats();
        string token;
 
        if (lex.eatLine()) {
                setCmdName(lex.getString());
-               lyxerr << "FloatList::float_type: " << getCmdName() << endl;
+               lyxerr[Debug::INSETS] << "FloatList::float_type: " << getCmdName() << endl;
+               if (!floats.typeExist(getCmdName()))
+                       lex.printError("InsetFloatList: Unknown float type: `$$Token'");
        } else
                lex.printError("InsetFloatList: Parse error: `$$Token'");
        while (lex.isOK()) {
@@ -76,23 +96,25 @@ void InsetFloatList::read(Buffer const *, LyXLex & lex)
 }
 
 
-void InsetFloatList::edit(BufferView * bv, int, int, unsigned int)
+void InsetFloatList::edit(BufferView * bv, int, int, mouse_button::state)
 {
-       bv->owner()->getDialogs()->showTOC(this);
+       InsetCommandMailer mailer("toc", *this);
+       mailer.showDialog(bv);
 }
 
 
 void InsetFloatList::edit(BufferView * bv, bool)
 {
-       edit(bv, 0, 0, 0);
+       edit(bv, 0, 0, mouse_button::none);
 }
 
 
-int InsetFloatList::latex(Buffer const *, ostream & os, bool, bool) const
+int InsetFloatList::latex(Buffer const * buf, ostream & os, bool, bool) const
 {
-       FloatList::const_iterator cit = floatList[getCmdName()];
+       FloatList const & floats = buf->params.getLyXTextClass().floats();
+       FloatList::const_iterator cit = floats[getCmdName()];
 
-       if (cit != floatList.end()) {
+       if (cit != floats.end()) {
                if (cit->second.builtin()) {
                        // Only two different types allowed here:
                        string const type = cit->second.type();
@@ -105,11 +127,22 @@ int InsetFloatList::latex(Buffer const *, ostream & os, bool, bool) const
                        }
                } else {
                        os << "\\listof{" << getCmdName() << "}{"
-                          << _("List of ") << cit->second.name() << "}\n";
+                          << cit->second.listName() << "}\n";
                }
        } else {
-               os << "%%\\listof{" << getCmdName() << "}{"
-                  << _("List of ") << cit->second.name() << "}\n";
+#if USE_BOOST_FORMAT
+               os << "%%\\listof{"
+                  << getCmdName()
+                  << "}{"
+                  << boost::format(_("List of %1$s")) % cit->second.name()
+                  << "}\n";
+#else
+               os << "%%\\listof{"
+                  << getCmdName()
+                  << "}{"
+                  << _("List of ") << cit->second.name()
+                  << "}\n";
+#endif
        }
        return 1;
 }
@@ -119,17 +152,14 @@ int InsetFloatList::ascii(Buffer const * buffer, ostream & os, int) const
 {
        os << getScreenLabel(buffer) << "\n\n";
 
-       Buffer::Lists const toc_list = buffer->getLists();
-       Buffer::Lists::const_iterator cit =
-               toc_list.find(getCmdName());
-       if (cit != toc_list.end()) {
-               Buffer::SingleList::const_iterator ccit = cit->second.begin();
-               Buffer::SingleList::const_iterator end = cit->second.end();
-               for (; ccit != end; ++ccit)
-                       os << string(4 * ccit->depth, ' ')
-                          << ccit->str << "\n";
-       }
+       toc::asciiTocList(getCmdName(), buffer, os);
 
        os << "\n";
        return 0;
 }
+
+
+void InsetFloatList::validate(LaTeXFeatures & features) const
+{
+       features.useFloat(getCmdName());
+}