X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fgrace-iterator.hh;h=aee58b8c502105a96c05958b5dfdb58fa49a537d;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=77d5cd75b7d12c05963b68cffc4d22cce02c8537;hpb=434da79e9d7684b2b05fa92a6d808d4ea7933046;p=lilypond.git

diff --git a/lily/include/grace-iterator.hh b/lily/include/grace-iterator.hh
index 77d5cd75b7..aee58b8c50 100644
--- a/lily/include/grace-iterator.hh
+++ b/lily/include/grace-iterator.hh
@@ -1,29 +1,37 @@
-/*   
-  grace-iterator.hh -- declare 
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-
-#ifndef GRACE_ITERATOR_HH
-#define GRACE_ITERATOR_HH
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  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/>.
+*/
+
+#ifndef NEWGRACE_ITERATOR_HH
+#define NEWGRACE_ITERATOR_HH
 
 #include "music-wrapper-iterator.hh"
 
 class Grace_iterator : public Music_wrapper_iterator
 {
+  bool in_grace_;
 public:
-  ~Grace_iterator ();
-  virtual void construct_children () ;
-  virtual void do_process_and_next (Moment);
-  Moment next_moment () const;
-  Music* next_music_l ();
+  Grace_iterator() : in_grace_ (false) { }
+  virtual void process (Moment);
+  DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_CLASSNAME (Grace_iterator);
+  Moment pending_moment () const;
 };
 
-
-
 #endif /* GRACE_ITERATOR_HH */
 
-