* lily/include/context.hh (class Context): make members protected.

(children_contexts): new accessor function.

* lily/include/context.hh (class Context): make daddy_context_
private.

* lily/include/context.hh (class Context): remove
find_context_below() as a method.

diff --git a/lily/include/context.hh b/lily/include/context.hh
index 75c7e65ac6f36d919741194a575187d8d2207378..f32e3e83789e3e0da6b9a62d857a6174f8aa541c 100644 (file)
--- a/lily/include/context.hh
+++ b/lily/include/context.hh
@@ -40,40 +40,44 @@ protected:
 public:
   SCM children_contexts () const { return context_list_; }
   SCM default_child_context_name () const;
+
   Translator_group* implementation () const;
-  
   Context * get_parent_context () const;
-  
   Context ();
+
+  /*
+    properties:
+   */
   void execute_pushpop_property (SCM prop, SCM sym, SCM val);
   SCM internal_get_property (SCM name_sym) const;
-
-  Context *remove_context (Context*trans);
-  void check_removal ();
-
   SCM properties_as_alist () const;
-  void unset_property (SCM var_sym);
   void internal_set_property (SCM var_sym, SCM value);  
-
   Context *where_defined (SCM name_sym) const;
+  void unset_property (SCM var_sym);
+
+  
+  Context *remove_context (Context*trans);
+  void check_removal ();
   String context_name () const;
   Global_context * get_global_context () const;
   
   virtual Score_context * get_score_context () const;  
+  virtual Music_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_context (Context *trans);
   bool is_bottom_context () const;
   bool is_removable () const;
   bool try_music (Music *);
-  
-  virtual Music_output_def *get_output_def () const;
-  virtual Moment now_mom () const;
+
   Context *find_create_context (SCM context_name,
                                String id, SCM ops);
   Link_array<Context> path_to_acceptable_context (SCM alias,
                                                  Music_output_def*) const;
-  virtual Context *get_default_interpreter ();
+
   String id_string_;
 };
 

diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index d2514ccc8d859bb6845d3c3f911a9bfae655eac6..9948739c26a85eeb9e9c75c9b16f78742de1c9b7 100644 (file)
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -20,9 +20,7 @@
 Translator_group*
 Translator_group::get_daddy_translator () const
 {
-  Translator *t
-    = unsmob_translator (get_parent_context ()->get_parent_context ()->implementation_);
-  return dynamic_cast<Translator_group*> (t);
+  return get_parent_context ()->get_parent_context ()->implementation ();
 }
 
 

diff --git a/lily/translator.cc b/lily/translator.cc
index d8211a24c1f3c1c19855317d7107482979d9ca49..62846fb3cd783120b48ed6ddc9ec658853a33467 100644 (file)
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -74,9 +74,7 @@ Translator::get_output_def () const
 Translator_group*
 Translator::get_daddy_translator () const
 {
-  Translator *t
-    = unsmob_translator (daddy_context_->implementation_);
-  return dynamic_cast<Translator_group*> (t);
+  return daddy_context_->implementation ();
 }