Revert page-count to the old behaviour.

[lilypond.git] / lily / include / music-iterator.hh

diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh
index 3c62205b90ce396359dd2d6ee75d66d883ac98be..e7d1ce2f2627948957d665272c616e0631ee410f 100644 (file)
--- a/lily/include/music-iterator.hh
+++ b/lily/include/music-iterator.hh
@@ -1,9 +1,20 @@
 /*
-  music-iterator.hh -- declare Music_iterator
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 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 MUSIC_ITERATOR_HH
@@ -54,7 +65,7 @@ protected:
   Moment start_mom_;
 
   DECLARE_CLASSNAME(Music_iterator);
-  DECLARE_SMOBS (Music_iterator, dummy);
+  DECLARE_SMOBS (Music_iterator);
   Music_iterator (Music_iterator const &);
 
 public:
@@ -65,7 +76,7 @@ public:
   Context *get_outlet () const;
   void set_context (Context *);
   static SCM get_static_get_iterator (Music *mus);
-  void init_translator (Music *, Context *);
+  void init_context (Music *, Context *);
   void quit ();
   void substitute_outlet (Context *from, Context *to);
   void descend_to_bottom_context ();