Release: bump Welcome versions.

[lilypond.git] / lily / music-wrapper-iterator.cc

diff --git a/lily/music-wrapper-iterator.cc b/lily/music-wrapper-iterator.cc
index e89896ce663652bca52800985e9ecdf487eeedc4..009f64f237caa0e7bdd782f435a0736958ffeede 100644 (file)
--- a/lily/music-wrapper-iterator.cc
+++ b/lily/music-wrapper-iterator.cc
@@ -1,9 +1,20 @@
 /*
-  music-wrapper-iterator.cc -- implement Music_wrapper_iterator
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1998--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1998--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/>.
 */
 
 #include "music-wrapper-iterator.hh"
@@ -18,7 +29,8 @@ Music_wrapper_iterator::Music_wrapper_iterator ()
 void
 Music_wrapper_iterator::do_quit ()
 {
-  child_iter_->quit ();
+  if (child_iter_)
+    child_iter_->quit ();
 }
 
 void
@@ -39,8 +51,10 @@ void
 Music_wrapper_iterator::construct_children ()
 {
   Music *my_music = get_music ();
-  Music *child = unsmob_music (my_music->get_property ("element"));
-  child_iter_ = unsmob_iterator (get_iterator (child));
+  Music *child = unsmob<Music> (my_music->get_property ("element"));
+  child_iter_ = (child)
+                ? unsmob<Music_iterator> (get_iterator (child))
+                : 0;
 }
 
 bool
@@ -52,13 +66,33 @@ Music_wrapper_iterator::ok () const
 void
 Music_wrapper_iterator::process (Moment m)
 {
-  child_iter_->process (m);
+  if (child_iter_)
+    child_iter_->process (m);
 }
 
 Moment
 Music_wrapper_iterator::pending_moment () const
 {
-  return child_iter_->pending_moment ();
+  if (child_iter_)
+    return child_iter_->pending_moment ();
+  else
+    return Music_iterator::pending_moment ();
+}
+
+Context *
+Music_wrapper_iterator::get_outlet () const
+{
+  if (child_iter_)
+    return child_iter_->get_outlet ();
+  return Music_iterator::get_outlet ();
+}
+
+void
+Music_wrapper_iterator::set_context (Context *trans)
+{
+  if (child_iter_)
+    child_iter_->set_context (trans);
+  Music_iterator::set_context (trans);
 }
 
 IMPLEMENT_CTOR_CALLBACK (Music_wrapper_iterator);
@@ -66,5 +100,5 @@ IMPLEMENT_CTOR_CALLBACK (Music_wrapper_iterator);
 bool
 Music_wrapper_iterator::run_always () const
 {
-  return child_iter_->run_always ();
+  return (child_iter_ && child_iter_->run_always ());
 }