X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fgrace-iterator.hh;h=aee58b8c502105a96c05958b5dfdb58fa49a537d;hb=6786ba7b5cd73f94eec0a49fd68d0e6d9d283437;hp=b44bc8c41b8129b7a66d17893ebca55b2c7a5a7b;hpb=d9b43b93f2c885409bafdb157138158f65cc49aa;p=lilypond.git

diff --git a/lily/include/grace-iterator.hh b/lily/include/grace-iterator.hh
index b44bc8c41b..aee58b8c50 100644
--- a/lily/include/grace-iterator.hh
+++ b/lily/include/grace-iterator.hh
@@ -1,11 +1,21 @@
-/*   
-  grace-iterator.hh -- declare Grace_iterator
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  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
@@ -14,17 +24,14 @@
 
 class Grace_iterator : public Music_wrapper_iterator
 {
+  bool in_grace_;
 public:
-  VIRTUAL_COPY_CONS (Music_iterator);
-  ~Grace_iterator ();
-  virtual void construct_children () ;
+  Grace_iterator() : in_grace_ (false) { }
   virtual void process (Moment);
-  static SCM constructor_cxx_function;
+  DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_CLASSNAME (Grace_iterator);
   Moment pending_moment () const;
 };
 
-
-
 #endif /* GRACE_ITERATOR_HH */
 
-