* lily/translator.cc (derived_mark): new function.

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

diff --git a/lily/include/context.hh b/lily/include/context.hh
index 09015d26ecd0b100f95056c988e1cc658cdc82bb..af504c121881480047f21744d01989ee833495f3 100644 (file)
--- a/lily/include/context.hh
+++ b/lily/include/context.hh
@@ -21,50 +21,65 @@ class Context
   DECLARE_SMOBS (Context, dummy);
 
   void terminate ();
-public:
+
+private:
+  friend class Interpretation_context_handle;
+  int iterator_count_;
+  bool init_;
+  
+protected:
+  Context * daddy_context_;
   SCM definition_;
   SCM properties_scm_;
   SCM context_list_;
   SCM accepts_list_;
-  Context * daddy_context_;
-  
+  SCM aliases_;
+  SCM implementation_;
+  String id_string_;
+
+  friend class Context_def;
+public:
+  String id_string () const { return id_string_; } 
+  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 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_existing_context (SCM context_name, String id);
+
   Context *find_create_context (SCM context_name,
-                                           String id, SCM ops);
+                               String id, SCM ops);
   Link_array<Context> path_to_acceptable_context (SCM alias,
-                                                 Music_output_def*) const;
-  Context *get_default_interpreter ();
-  String id_string_;
+                                                 Output_def*) const;
 
-  SCM implementation_;
-private:
-  friend class Interpretation_context_handle;
-  int iterator_count_;
-  bool init_;
 };
 
 /*
@@ -75,16 +90,13 @@ void apply_property_operations (Context*tg, SCM pre_init_ops);
 void execute_pushpop_property (Context * trg, SCM prop, SCM eltprop, SCM val);
 SCM updated_grob_properties (Context* tg, SCM sym);
 Context * find_context_below (Context * where,
-                   String type, String id);
-
-Context * unsmob_context (SCM);
+                             SCM type_sym, String id);
+bool melisma_busy (Context*);
 
-#define set_property(x,y) internal_set_property(ly_symbol2scm(x),y)
+Context *get_voice_to_lyrics (Context *lyrics);
+Grob *get_current_note_head (Context * voice);
+Context *unsmob_context (SCM);
 
-/*
-  C&P! 
- */
-#define get_property(x) internal_get_property(ly_symbol2scm(x))
 DECLARE_UNSMOB(Context,context);
 
 #endif /* CONTEXT_HH */