Bug fix; ensure that all is Ok after the combox is moved with

[lyx.git] / src / FloatList.C

diff --git a/src/FloatList.C b/src/FloatList.C
index 0bfabdfb6f1594dc75c6f6ebf9009b75e1ace12c..7b1bf81ccf3e3f6807fb80acced4354aac2ae71c 100644 (file)
--- a/src/FloatList.C
+++ b/src/FloatList.C
@@ -1,49 +1,57 @@
-#include <config.h>
+/**
+ * \file FloatList.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.
+ */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
 
 #include "FloatList.h"
+#include "Floating.h"
+
+using std::string;
+
+// This class is now mostly finished, except one thing, it is a global
+// object. This will not do. The user (and layout files) are free to
+// create floats and modify them to fit into a certain document. So it is
+// pretty clear that each layout needs its own list, as do documents.
+// However this is also not enough since we really want the user to be
+// able to create "presistent" floats, in the sense that a user created
+// float can be used across sessions and across documents. So we need a
+// global¹ floatlist as well. The interaction between these are not quite
+// clear, but it seems natural that the definition found in the document
+// takes precedence.
+// We also have the issue about what get stored _in_ the lyx file.
+//
+// ¹ not absolutely global but somewhere where documents,layouts and
+// the bufferview can have access to it.
+//
+// Lgb
 
 FloatList::FloatList()
 {
-       // Insert the latex builtin float-types
-       Floating table;
-       table.type = "table";
-       table.placement = "htbp";
-       table.ext = "lot";
-       table.within = "";
-       table.style = "plain";
-       table.name = "Table";
-       table.builtin = true;
-       list[table.type] = table;
-       Floating figure;
-       figure.type = "figure";
-       figure.placement = "htbp";
-       figure.ext = "lof";
-       figure.within = "";
-       figure.style = "plain";
-       figure.name = "Figure";
-       figure.builtin = true;
-       list[figure.type] = figure;
-       // And we add algorithm too since LyX has
-       // supported that for a long time
-       Floating algorithm;
-       algorithm.type = "algorithm";
-       algorithm.placement = "htbp";
-       algorithm.ext = "loa";
-       algorithm.within = "";
-       algorithm.style = "ruled";
-       algorithm.name = "Algorithm";
-       algorithm.builtin = false;
-       list[algorithm.type] = algorithm;
+}
+
+
+FloatList::const_iterator FloatList::begin() const
+{
+       return list.begin();
+}
+
+
+FloatList::const_iterator FloatList::end() const
+{
+       return list.end();
 }
 
 
 void FloatList::newFloat(Floating const & fl)
 {
-       list[fl.type] = fl;
+       list[fl.type()] = fl;
 }
 
 
@@ -51,7 +59,7 @@ string const FloatList::defaultPlacement(string const & t) const
 {
        List::const_iterator cit = list.find(t);
        if (cit != list.end())
-               return (*cit).second.placement;
+               return cit->second.placement();
        return string();
 }
 
@@ -68,7 +76,7 @@ Floating const & FloatList::getType(string const & t) const
        // I wish we could use exceptions
        List::const_iterator cit = list.find(t);
        if (cit != list.end())
-               return (*cit).second;
+               return cit->second;
 #ifdef HAVE_EXCEPTIONS
        throw UnknownFloatType(t);
 #else
@@ -77,5 +85,14 @@ Floating const & FloatList::getType(string const & t) const
 #endif
 }
 
-// The global floatlist
-FloatList floatList;
+
+void FloatList::erase(string const & t)
+{
+       list.erase(t);
+}
+
+
+FloatList::const_iterator FloatList::operator[](string const & t) const
+{
+       return list.find(t);
+}