* input/regression/beam-quant-standard.ly: reindent, set

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

diff --git a/lily/include/context.hh b/lily/include/context.hh
index 15b281110eb7c91f8c0bc9df805b8e1acb0d1415..ce954e664008f90bc845f48927d4e45aea720c79 100644 (file)
--- a/lily/include/context.hh
+++ b/lily/include/context.hh
@@ -10,9 +10,11 @@
 #define CONTEXT_HH
 
 #include <map>
+using namespace std;
 
 #include "moment.hh"
 #include "lily-proto.hh"
+#include "virtual-methods.hh"
 
 class Context
 {
@@ -20,7 +22,7 @@ class Context
   Context (Context const &src);
 
   DECLARE_SMOBS (Context, dummy);
-
+  DECLARE_CLASSNAME(Context);
   void terminate ();
 
 private:
@@ -28,8 +30,8 @@ private:
   int iterator_count_;
   bool init_;
 
-  std::map<String, int> grob_counts_;
-  std::map<String, int> context_counts_;
+  map<String, int> grob_counts_;
+  map<String, int> context_counts_;
 
 protected:
   Object_key const *key_;
@@ -56,16 +58,15 @@ public:
   SCM children_contexts () const { return context_list_; }
   SCM default_child_context_name () const;
 
-  Translator_group *implementation () const;
+  Translator_group *implementation () const { return implementation_; }
   Context *get_parent_context () const;
   Context (Object_key const *);
 
   /* properties:  */
-  void execute_pushpop_property (SCM prop, SCM sym, SCM val);
   SCM internal_get_property (SCM name_sym) const;
   SCM properties_as_alist () const;
   void internal_set_property (SCM var_sym, SCM value);
-  Context *where_defined (SCM name_sym) const;
+  Context *where_defined (SCM name_sym, SCM *value) const;
   void unset_property (SCM var_sym);
 
   Context *remove_context (Context *trans);
@@ -100,6 +101,8 @@ public:
 
 void apply_property_operations (Context *tg, SCM pre_init_ops);
 void execute_pushpop_property (Context *trg, SCM prop, SCM eltprop, SCM val);
+void execute_general_pushpop_property (Context *context,
+                                      SCM context_property, SCM grob_property_path, SCM val);
 SCM updated_grob_properties (Context *tg, SCM sym);
 Context *find_context_below (Context *where,
                             SCM type_sym, String id);