X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fcontext.hh;h=0595bf851389c655080c34e1199aaa1437bb02fa;hb=59edf02a1acae41e21a080617aa7bd8673125762;hp=4121f84c7836de7ac9aab17cb91286c9f62bafc7;hpb=f40beee2bdf96ff578b5a3d004cc276ee333b799;p=lilypond.git

diff --git a/lily/include/context.hh b/lily/include/context.hh
index 4121f84c78..0595bf8513 100644
--- a/lily/include/context.hh
+++ b/lily/include/context.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -34,13 +34,14 @@ class Context
   Context (Context const &src);
 
   DECLARE_SMOBS (Context);
-  DECLARE_CLASSNAME(Context);
+  DECLARE_CLASSNAME (Context);
   void terminate ();
 
 private:
   friend class Context_handle;
-  int iterator_count_;
-  
+  /* how many Context_handles point to this Context */
+  int client_count_;
+
   /* Used internally by create_context */
   Stream_event *infant_event_;
 
@@ -50,14 +51,15 @@ protected:
   SCM definition_;
   /* Additions to the Context_def, given by \with */
   SCM definition_mods_;
-  
+
   SCM properties_scm_;
   SCM context_list_;
   SCM accepts_list_;
+  SCM default_child_;
   SCM aliases_;
   Translator_group *implementation_;
   string id_string_;
-  
+
   /* Events reported in the context is sent to this dispatcher. */
   Dispatcher *event_source_;
 
@@ -74,7 +76,7 @@ protected:
 
   DECLARE_LISTENER (set_property_from_event);
   DECLARE_LISTENER (unset_property_from_event);
-  
+
 public:
   string id_string () const { return id_string_; }
   SCM children_contexts () const { return context_list_; }
@@ -95,12 +97,13 @@ public:
   SCM internal_get_property (SCM name_sym) const;
   SCM properties_as_alist () const;
   Context *where_defined (SCM name_sym, SCM *value) const;
+  bool here_defined (SCM name_sym, SCM *value) const;
   void unset_property (SCM var_sym);
 
-  void instrumented_set_property (SCM, SCM, const char*, int, const char*);
+  void instrumented_set_property (SCM, SCM, const char *, int, const char *);
   void internal_set_property (SCM var_sym, SCM value);
 
-  Context *create_context (Context_def *, string, SCM);
+  Context *create_context (Context_def *, const string&, SCM);
   DECLARE_LISTENER (create_context_from_event);
   DECLARE_LISTENER (acknowledge_infant);
   DECLARE_LISTENER (remove_context);
@@ -114,7 +117,7 @@ public:
   virtual Context *get_score_context () const;
   virtual Output_def *get_output_def () const;
   virtual Moment now_mom () const;
-  virtual Context *get_default_interpreter (string context_id = "");
+  virtual Context *get_default_interpreter (const string &context_id = "");
 
   bool is_alias (SCM) const;
   void add_alias (SCM);
@@ -123,10 +126,10 @@ public:
   bool is_removable () const;
 
   Context *find_create_context (SCM context_name,
-				string id, SCM ops);
-  Context *create_unique_context (SCM context_name, string context_id,
-				  SCM ops);
-  vector<Context_def*> path_to_acceptable_context (SCM alias) const;
+                                const string &id, SCM ops);
+  Context *create_unique_context (SCM context_name, const string &context_id,
+                                  SCM ops);
+  vector<Context_def *> path_to_acceptable_context (SCM alias) const;
 };
 
 /*
@@ -135,20 +138,19 @@ public:
 
 void apply_property_operations (Context *tg, SCM pre_init_ops);
 void execute_revert_property (Context *context,
-			      SCM context_property,
-			      SCM grob_property_path);
+                              SCM context_property,
+                              SCM grob_property_path);
 void execute_pushpop_property (Context *trg, SCM prop, SCM eltprop, SCM val);
 void sloppy_general_pushpop_property (Context *context,
-				       SCM context_property, SCM grob_property_path, SCM val);
+                                      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, const string &id);
 bool melisma_busy (Context *);
 
 Context *get_voice_to_lyrics (Context *lyrics);
 Grob *get_current_note_head (Context *voice, bool include_grace_notes);
 Grob *get_current_rest (Context *voice);
-DECLARE_UNSMOB (Context, context);
 
 Moment measure_position (Context const *context);
 Moment measure_position (Context const *context, Duration const *dur);
@@ -160,10 +162,10 @@ bool check_repeat_count_visibility (Context const *context, SCM count);
 void set_context_property_on_children (Context *trans, SCM sym, SCM val);
 
 /* Shorthand for creating and broadcasting stream events. */
-#define send_stream_event(ctx, type, origin, ...)				\
-{									\
-  SCM props[] = { __VA_ARGS__, 0 };					\
-  ctx->internal_send_stream_event (ly_symbol2scm (type), origin, props);	\
+#define send_stream_event(ctx, type, origin, ...)                               \
+{                                                                       \
+  SCM props[] = { __VA_ARGS__, 0 };                                     \
+  ctx->internal_send_stream_event (ly_symbol2scm (type), origin, props);        \
 }
 
 SCM nested_property_alist (SCM alist, SCM prop_path, SCM value);