* lily/object-key-dumper-scheme.cc: new file.

[lilypond.git] / lily / include / context.hh

diff --git a/lily/include/context.hh b/lily/include/context.hh
index 6dfb6d752f38d38a973814111c5d53ea945a6ac8..060fe9c22f1307fbea1d0e98a5ebbfe0a865da6a 100644 (file)
--- a/lily/include/context.hh
+++ b/lily/include/context.hh
@@ -9,6 +9,8 @@
 #ifndef CONTEXT_HH
 #define CONTEXT_HH
 
+#include <map>
+
 #include "moment.hh"
 #include "lily-proto.hh"
 
@@ -26,7 +28,10 @@ private:
   friend class Interpretation_context_handle;
   int iterator_count_;
   bool init_;
-  
+
+  std::map<String, int> grob_counts_;
+  std::map<String, int> context_counts_;
+
 protected:
   Object_key const * key_;
   Context * daddy_context_;
@@ -39,9 +44,14 @@ protected:
   String id_string_;
 
   friend class Context_def;
+  void clear_key_disambiguations ();
 
 public:
   Object_key const *get_key () const;
+  Object_key const *get_grob_key (String);
+  Object_key const *get_context_key (String, String);
+
+  Context *create_context (Context_def*, String, SCM); 
   String id_string () const { return id_string_; } 
   SCM children_contexts () const { return context_list_; }
   SCM default_child_context_name () const;
@@ -79,6 +89,8 @@ public:
 
   Context *find_create_context (SCM context_name,
                                String id, SCM ops);
+  Context *create_unique_context (SCM context_name,
+                                  SCM ops);
   Link_array<Context> path_to_acceptable_context (SCM alias,
                                                  Output_def*) const;