Run `make grand-replace'.

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

diff --git a/lily/grob-pq-engraver.cc b/lily/grob-pq-engraver.cc
index 7cb4afab87900821d25ee4f39df5e28a8cec35ea..6e6cead34eece87b2817658c6ab04e7a456e3092 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--2007  Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2001--2008  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "context.hh"
@@ -49,7 +49,8 @@ Grob_pq_engraver::initialize ()
 
 LY_DEFINE (ly_grob_pq_less_p, "ly:grob-pq<?",
           2, 0, 0, (SCM a, SCM b),
-          "Compare 2 grob priority queue entries. Internal")
+          "Compare two grob priority queue entries."
+          "  This is an internal function.")
 {
   if (Moment::compare (*unsmob_moment (scm_car (a)),
                       *unsmob_moment (scm_car (b))) < 0)
@@ -67,17 +68,11 @@ Grob_pq_engraver::acknowledge_grob (Grob_info gi)
       && !gi.grob ()->internal_has_interface (ly_symbol2scm ("multi-measure-interface")))
     {
       Moment n = now_mom ();
-      Moment l = get_event_length (ev);
+      Moment l = get_event_length (ev, n);
 
       if (!l.to_bool ())
        return;
 
-      if (n.grace_part_)
-       {
-         l.grace_part_ = l.main_part_;
-         l.main_part_ = 0;
-       }
-
       Moment end = n + l;
 
       Grob_pq_entry e;
@@ -143,8 +138,16 @@ Grob_pq_engraver::start_translation_timestep ()
 #include "translator.icc"
 ADD_ACKNOWLEDGER (Grob_pq_engraver, grob);
 ADD_TRANSLATOR (Grob_pq_engraver,
+               /* doc */
+               "Administrate when certain grobs (e.g., note heads) stop"
+               " playing.",
+
+               /* create */
+               "",
+
+               /* read */
+               "busyGrobs ",
 
-               /* doc */ "Administrate when certain grobs (eg. note heads) stop playing",
-               /* create */ "",
-               /* read */ "busyGrobs",
-               /* write */ "busyGrobs");
+               /* write */
+               "busyGrobs "
+               );