X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrace-iterator.cc;h=daaaf855bf59216a1f1f90304e38fb1ca2435a09;hb=7c44f8bece4865eb0eb26b0490a4a9a04499a76b;hp=5d95fef2e79ca14b244fe791af43fac1e5c3497c;hpb=d61cf3bbdb1c6670a127ba3baddf2f04d3e34fd3;p=lilypond.git

diff --git a/lily/grace-iterator.cc b/lily/grace-iterator.cc
index 5d95fef2e7..daaaf855bf 100644
--- a/lily/grace-iterator.cc
+++ b/lily/grace-iterator.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -19,13 +19,22 @@
 
 #include "grace-iterator.hh"
 #include "global-context.hh"
-#include "warn.hh"
+#include "music.hh"
 
 void
 Grace_iterator::process (Moment m)
 {
   Moment main;
   main.main_part_ = -start_mom_.grace_part_ + m.grace_part_;
+
+  // GraceChange is announced in order to make the Grace_engraver able
+  // to distinguish \stemNeutral \grace { ... and \grace { \stemNeutral ...
+  if (in_grace_ != bool (m.grace_part_) && child_iter_ && child_iter_->get_outlet ())
+    {
+      send_stream_event (child_iter_->get_outlet (), "GraceChange", get_music ()->origin (), 0);
+    }
+  in_grace_ = m.grace_part_;
+
   Music_wrapper_iterator::process (main);
 
   /* We can safely do this, since \grace should always be inside