* lily/lyric-engraver.cc (get_current_rest): New function.

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

diff --git a/lily/include/context.hh b/lily/include/context.hh
index af504c121881480047f21744d01989ee833495f3..46d836e26dfad94e1e9b26dadfa370e817fb7fca 100644 (file)
--- a/lily/include/context.hh
+++ b/lily/include/context.hh
@@ -1,10 +1,10 @@
-/*   
-     context.hh -- declare  Context
-
-     source file of the GNU LilyPond music typesetter
-
-     (c) 2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
- */
+/*
+  context.hh -- declare  Context
+  
+  source file of the GNU LilyPond music typesetter
+  
+  (c) 2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef CONTEXT_HH
 #define CONTEXT_HH
@@ -44,12 +44,10 @@ public:
   SCM default_child_context_name () const;
 
   Translator_group* implementation () const;
-  Context * get_parent_context () const;
+  Context *get_parent_context () const;
   Context ();
 
-  /*
-    properties:
-   */
+  /* properties:  */
   void execute_pushpop_property (SCM prop, SCM sym, SCM val);
   SCM internal_get_property (SCM name_sym) const;
   SCM properties_as_alist () const;
@@ -58,10 +56,10 @@ public:
   void unset_property (SCM var_sym);
 
   
-  Context *remove_context (Context*trans);
+  Context *remove_context (Context *trans);
   void check_removal ();
   String context_name () const;
-  Global_context * get_global_context () const;
+  Global_context *get_global_context () const;
   
   virtual Score_context * get_score_context () const;  
   virtual Output_def *get_output_def () const;
@@ -86,18 +84,19 @@ public:
   Context arg? 
  */
 
-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,
+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,
                              SCM type_sym, String id);
-bool melisma_busy (Context*);
+bool melisma_busy (Context *);
 
 Context *get_voice_to_lyrics (Context *lyrics);
-Grob *get_current_note_head (Context * voice);
+Grob *get_current_note_head (Context *voice);
+Grob *get_current_rest (Context *voice);
 Context *unsmob_context (SCM);
 
-DECLARE_UNSMOB(Context,context);
+DECLARE_UNSMOB(Context, context);
 
 #endif /* CONTEXT_HH */