ws changes

[lyx.git] / src / FloatList.C

diff --git a/src/FloatList.C b/src/FloatList.C
index 66e9adcc6b910ef24395695b7c06808d9ff39706..61d0aadff776e9877e5df150e046f9bf38d6ce55 100644 (file)
--- a/src/FloatList.C
+++ b/src/FloatList.C
@@ -5,35 +5,58 @@
 #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
+       // (these will later be read from a layout file)
 
        // table
-       Floating table("table", "htbp", "lot", "", "plain", "Table", true);
-       list[table.type()] = table;
+       Floating table("table", "htbp", "lot", "", "plain", N_("Table"),
+                      N_("List of Tables"), true);
+       newFloat(table);
 
        // figure
-       Floating figure("figure", "htbp", "lof", "", "plain", "Figure", true);
-       list[figure.type()] = figure;
-       
+       Floating figure("figure", "htbp", "lof",
+                       "", "plain", N_("Figure"), 
+                       N_("List of Figures"), true);
+       newFloat(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;
+                          "", "ruled", N_("Algorithm"),
+                          N_("List of Algorithms"));
+       newFloat(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 +72,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 +89,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