X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrace-iterator.cc;h=daaaf855bf59216a1f1f90304e38fb1ca2435a09;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=f93e13e942990681a7a6d6d987de3bfa5654bc43;hpb=da7dbf5f2f54bc66984ab2524c490335d567b5e7;p=lilypond.git

diff --git a/lily/grace-iterator.cc b/lily/grace-iterator.cc
index f93e13e942..daaaf855bf 100644
--- a/lily/grace-iterator.cc
+++ b/lily/grace-iterator.cc
@@ -1,47 +1,56 @@
-/*   
-  grace-iterator.cc --  implement Grace_iterator
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
-#include "grace-iterator.hh"
-#include "global-translator.hh"
-#include "warn.hh"
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-void
-Grace_iterator::construct_children () 
-{
-  Translator_group * t = report_to_l ()->find_create_translator_l ("Grace", ""); // umgh.
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
-  if (t)
-    set_translator (t);
-  Music_wrapper_iterator::construct_children ();
-}
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "grace-iterator.hh"
+#include "global-context.hh"
+#include "music.hh"
 
 void
-Grace_iterator::do_process_and_next (Moment m)
+Grace_iterator::process (Moment m)
 {
-  Global_translator * t = dynamic_cast<Global_translator*>(report_to_l ());
-  if (t)
-    {
-      t->start ();
-      t->run_iterator_on_me (child_iter_p_);
-      delete child_iter_p_;
-      child_iter_p_ = 0;
-      t->finish ();
-    }
-  else
+  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 ())
     {
-      warning (_("No Grace context available!")); 
+      send_stream_event (child_iter_->get_outlet (), "GraceChange", get_music ()->origin (), 0);
     }
-  Music_iterator::do_process_and_next (m);
+  in_grace_ = m.grace_part_;
+
+  Music_wrapper_iterator::process (main);
+
+  /* We can safely do this, since \grace should always be inside
+     sequential.  */
+  descend_to_child (child_iter_->get_outlet ());
 }
 
 Moment
-Grace_iterator::next_moment ()  const
+Grace_iterator::pending_moment () const
 {
-  return 0;
+  Moment cp = Music_wrapper_iterator::pending_moment ();
+
+  Moment pending;
+  pending.grace_part_ = start_mom_.grace_part_ + cp.main_part_;
+
+  return pending;
 }
+
+IMPLEMENT_CTOR_CALLBACK (Grace_iterator);