X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fcontext.hh;h=5c3b93fa14b1b28350ce891b98fff0e175d7ebf4;hb=9d4a5bbc9687aef811a60aabd9cb839412984e96;hp=0981bc536a4ec49c07a69e2004cc406ece50a24e;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/include/context.hh b/lily/include/context.hh
index 0981bc536a..5c3b93fa14 100644
--- a/lily/include/context.hh
+++ b/lily/include/context.hh
@@ -3,16 +3,18 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2006 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
 {
@@ -20,56 +22,57 @@ class Context
   Context (Context const &src);
 
   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<std::string, int> grob_counts_;
+  map<std::string, int> context_counts_;
 
 protected:
   Object_key const *key_;
   Context *daddy_context_;
   SCM definition_;
+
   SCM properties_scm_;
   SCM context_list_;
   SCM accepts_list_;
   SCM aliases_;
-  SCM implementation_;
-  String id_string_;
+  Translator_group *implementation_;
+  std::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);
+  Object_key const *key () const { return key_; }
+  Object_key const *create_grob_key (std::string);
+  Object_key const *get_grob_key (std::string);
+  Object_key const *get_context_key (std::string, std::string);
 
-  Context *create_context (Context_def *, String, SCM);
-  String id_string () const { return id_string_; }
+  Context *create_context (Context_def *, std::string, SCM);
+  std::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 *);
 
   /* 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);
   void check_removal ();
-  String context_name () const;
+  std::string context_name () const;
   SCM context_name_symbol () const;
   Global_context *get_global_context () const;
 
@@ -86,12 +89,11 @@ public:
   bool try_music (Music *);
 
   Context *find_create_context (SCM context_name,
-				String id, SCM ops);
+				std::string id, SCM ops);
   Context *create_unique_context (SCM context_name,
 				  SCM ops);
-  Link_array<Context> path_to_acceptable_context (SCM alias,
+  Link_array__Context_ path_to_acceptable_context (SCM alias,
 						  Output_def *) const;
-
 };
 
 /*
@@ -100,9 +102,11 @@ 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);
+			     SCM type_sym, std::string id);
 bool melisma_busy (Context *);
 
 Context *get_voice_to_lyrics (Context *lyrics);
@@ -110,5 +114,9 @@ Grob *get_current_note_head (Context *voice);
 Grob *get_current_rest (Context *voice);
 DECLARE_UNSMOB (Context, context);
 
+Moment measure_position (Context const *context);
+Rational measure_length (Context const *context);
+void set_context_property_on_children (Context *trans, SCM sym, SCM val);
+
 #endif /* CONTEXT_HH */