Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / note-performer.cc

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index a1503f2b61ac4884331d2e96bb6bc933917eb7d5..ff296311ffead109a8de2936f8542a3170b8aa0d 100644 (file)
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -65,7 +65,14 @@ Note_performer::process_music ()
                     tie_event = ev;
                 }
 
-             Audio_note *p = new Audio_note (*pitp, get_event_length (n), 
+             Moment len = get_event_length (n);
+             if (now_mom().grace_part_)
+               {
+                 len.grace_part_ = len.main_part_;
+                 len.main_part_ = Rational (0);
+               }
+             
+             Audio_note *p = new Audio_note (*pitp, len, 
                                               tie_event, transposing.negated ());
              Audio_element_info info (p, n);
              announce_element (info);