Merge branch 'master' of git://git.sv.gnu.org/lilypond

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

diff --git a/lily/grob-pq-engraver.cc b/lily/grob-pq-engraver.cc
index 476cae950ca61cece500a96b27fd0f510742ca77..7265d4634784033d37db85251d0858f11e8a52a9 100644 (file)
--- a/lily/grob-pq-engraver.cc
+++ b/lily/grob-pq-engraver.cc
@@ -47,9 +47,10 @@ Grob_pq_engraver::initialize ()
   context ()->set_property ("busyGrobs", SCM_EOL);
 }
 
-LY_DEFINE (ly_grob_pq_less_p, "ly:grob-pq-less?",
+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;