* lily/music.cc (derived_mark): derive Music from Prob.

[lilypond.git] / lily / grob-pq-engraver.cc

diff --git a/lily/grob-pq-engraver.cc b/lily/grob-pq-engraver.cc
index 28f405021af50e92294af0b765ddded2215fc318..dc61fb93e624bee3de785fd0d424e9f3170ac2ad 100644 (file)
--- a/lily/grob-pq-engraver.cc
+++ b/lily/grob-pq-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2005  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2001--2006  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "context.hh"
@@ -28,7 +28,7 @@ public:
   TRANSLATOR_DECLARATIONS (Grob_pq_engraver);
 protected:
   virtual void initialize ();
-  DECLARE_ACKNOWLEDGER(grob);
+  DECLARE_ACKNOWLEDGER (grob);
   void start_translation_timestep ();
   void stop_translation_timestep ();
 
@@ -81,7 +81,7 @@ Grob_pq_engraver::acknowledge_grob (Grob_info gi)
       Grob_pq_entry e;
       e.grob_ = gi.grob ();
       e.end_ = end;
-      
+
       started_now_.push (e);
     }
 }
@@ -93,9 +93,7 @@ Grob_pq_engraver::stop_translation_timestep ()
   SCM start_busy = get_property ("busyGrobs");
   SCM busy = start_busy;
   while (scm_is_pair (busy) && *unsmob_moment (scm_caar (busy)) == now)
-    {
-      busy = scm_cdr (busy);
-    }
+    busy = scm_cdr (busy);
 
   started_now_.sort (Grob_pq_entry::compare);
   SCM lst = SCM_EOL;
@@ -105,9 +103,9 @@ Grob_pq_engraver::stop_translation_timestep ()
       *tail = scm_acons (started_now_[i].end_.smobbed_copy (),
                         started_now_[i].grob_->self_scm (),
                         SCM_EOL);
-      tail = SCM_CDRLOC(*tail);
+      tail = SCM_CDRLOC (*tail);
     }
-  
+
   busy = scm_merge_x (lst, busy, ly_grob_pq_less_p_proc);
   context ()->set_property ("busyGrobs", busy);
 
@@ -135,11 +133,11 @@ Grob_pq_engraver::start_translation_timestep ()
 }
 
 #include "translator.icc"
-ADD_ACKNOWLEDGER(Grob_pq_engraver, grob);
+ADD_ACKNOWLEDGER (Grob_pq_engraver, grob);
 ADD_TRANSLATOR (Grob_pq_engraver,
 
-               /* descr */ "Administrate when certain grobs (eg. note heads) stop playing",
-               /* creats*/ "",
-               /* accepts */ "",
-               /* reads */ "busyGrobs",
+               /* doc */ "Administrate when certain grobs (eg. note heads) stop playing",
+               /* create */ "",
+               /* accept */ "",
+               /* read */ "busyGrobs",
                /* write */ "busyGrobs");