Merge remote branch 'origin/master' into release/unstable

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

diff --git a/lily/include/context.hh b/lily/include/context.hh
index c8bea9fad98c571201f25fb52433cc13f56be71a..06d0cf10d20888fce617cc8a170d4aa278e94a01 100644 (file)
--- a/lily/include/context.hh
+++ b/lily/include/context.hh
@@ -28,12 +28,17 @@
 #include "std-vector.hh"
 #include "virtual-methods.hh"
 
-class Context
+class Context : public Smob<Context>
 {
+public:
+  SCM mark_smob ();
+  int print_smob (SCM, scm_print_state *);
+  static const char type_p_name_[];
+  virtual ~Context ();
+private:
   Scheme_hash_table *properties_dict () const;
   Context (Context const &src);
 
-  DECLARE_SMOBS (Context);
   DECLARE_CLASSNAME (Context);
   void terminate ();
 
@@ -144,7 +149,7 @@ Context *find_context_below (Context *where,
 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_note_head (Context *voice);
 Grob *get_current_rest (Context *voice);
 
 Moment measure_position (Context const *context);