X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fcontext.hh;h=ce954e664008f90bc845f48927d4e45aea720c79;hb=087a4bf794b39cbfd99eb032183101013386f475;hp=060fe9c22f1307fbea1d0e98a5ebbfe0a865da6a;hpb=5b03334eaf11104855ef5fd3e18a7c00cd0fcea2;p=lilypond.git

diff --git a/lily/include/context.hh b/lily/include/context.hh
index 060fe9c22f..ce954e6640 100644
--- a/lily/include/context.hh
+++ b/lily/include/context.hh
@@ -1,46 +1,48 @@
 /*
   context.hh -- declare  Context
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef CONTEXT_HH
 #define CONTEXT_HH
 
 #include <map>
+using namespace std;
 
 #include "moment.hh"
 #include "lily-proto.hh"
-
+#include "virtual-methods.hh"
 
 class Context
 {
   Scheme_hash_table *properties_dict () const;
   Context (Context const &src);
-  
-  DECLARE_SMOBS (Context, dummy);
 
+  DECLARE_SMOBS (Context, dummy);
+  DECLARE_CLASSNAME(Context);
   void terminate ();
 
 private:
-  friend class Interpretation_context_handle;
+  friend class Context_handle;
   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_;
-  Context * daddy_context_;
+  Object_key const *key_;
+  Context *daddy_context_;
   SCM definition_;
+
   SCM properties_scm_;
   SCM context_list_;
   SCM accepts_list_;
   SCM aliases_;
-  SCM implementation_;
+  Translator_group *implementation_;
   String id_string_;
 
   friend class Context_def;
@@ -51,37 +53,35 @@ public:
   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_; } 
+  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;
 
-  Translator_group* implementation () const;
+  Translator_group *implementation () const { return implementation_; }
   Context *get_parent_context () const;
-  Context (Object_key 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;
+  void internal_set_property (SCM var_sym, SCM value);
+  Context *where_defined (SCM name_sym, SCM *value) const;
   void unset_property (SCM var_sym);
 
-  
   Context *remove_context (Context *trans);
   void check_removal ();
   String context_name () const;
   SCM context_name_symbol () const;
   Global_context *get_global_context () const;
-  
-  virtual Score_context * get_score_context () const;  
+
+  virtual Score_context *get_score_context () const;
   virtual Output_def *get_output_def () const;
   virtual Moment now_mom () const;
   virtual Context *get_default_interpreter ();
 
   bool is_alias (SCM) const;
-  void add_alias (SCM); 
+  void add_alias (SCM);
   void add_context (Context *trans);
   bool is_bottom_context () const;
   bool is_removable () const;
@@ -90,27 +90,31 @@ public:
   Context *find_create_context (SCM context_name,
 				String id, SCM ops);
   Context *create_unique_context (SCM context_name,
-				   SCM ops);
+				  SCM ops);
   Link_array<Context> path_to_acceptable_context (SCM alias,
-						  Output_def*) const;
-
+						  Output_def *) const;
 };
 
 /*
-  Context arg? 
- */
+  Context arg?
+*/
 
 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);
+			     SCM type_sym, String id);
 bool melisma_busy (Context *);
 
 Context *get_voice_to_lyrics (Context *lyrics);
 Grob *get_current_note_head (Context *voice);
 Grob *get_current_rest (Context *voice);
-DECLARE_UNSMOB(Context, context);
+DECLARE_UNSMOB (Context, context);
+
+Moment measure_position (Context const *context);
+Rational measure_length (Context const *context);
 
 #endif /* CONTEXT_HH */