X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFloatList.C;h=5647c71073182cf624c1074a6b0da253ef31a7cc;hb=2523638092e2024bac408eee98ad2094bc4e4089;hp=66e9adcc6b910ef24395695b7c06808d9ff39706;hpb=74b224fcba406f4ea4d1f1fa91a63aea39ca2712;p=lyx.git

diff --git a/src/FloatList.C b/src/FloatList.C
index 66e9adcc6b..5647c71073 100644
--- a/src/FloatList.C
+++ b/src/FloatList.C
@@ -5,35 +5,37 @@
 #endif
 
 #include "FloatList.h"
+#include "gettext.h"
+
+// 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
-
-	// table
-	Floating table("table", "htbp", "lot", "", "plain", "Table", true);
-	list[table.type()] = table;
-
-	// figure
-	Floating figure("figure", "htbp", "lof", "", "plain", "Figure", true);
-	list[figure.type()] = figure;
-	
-	// And we add algorithm too since LyX has
-	// supported that for a long time,
-	// but support for this should probably be moved to a layout file.
-	Floating algorithm("algorithm", "htbp", "loa",
-			   "", "ruled", "Algorithm");
-	list[algorithm.type()] = algorithm;
 }
 
 
-FloatList::const_iterator FloatList::begin() const 
+FloatList::const_iterator FloatList::begin() const
 {
 	return list.begin();
 }
 
 
-FloatList::const_iterator FloatList::end() const 
+FloatList::const_iterator FloatList::end() const
 {
 	return list.end();
 }
@@ -49,7 +51,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();
 }
 
@@ -66,7 +68,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
@@ -76,11 +78,13 @@ Floating const & FloatList::getType(string const & t) const
 }
 
 
-FloatList::const_iterator FloatList::operator[](string const & t) const
+void FloatList::erase(string const & t)
 {
-	return list.find(t);
+	list.erase(t);
 }
 
 
-// The global floatlist
-FloatList floatList;
+FloatList::const_iterator FloatList::operator[](string const & t) const
+{
+	return list.find(t);
+}