Issue 5167/6: Changes: show \markup xxx = ... \etc assignments

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

diff --git a/lily/music-wrapper-iterator.cc b/lily/music-wrapper-iterator.cc
index e208d135f5c75bf63973866b8815695263f4499c..009f64f237caa0e7bdd782f435a0736958ffeede 100644 (file)
--- a/lily/music-wrapper-iterator.cc
+++ b/lily/music-wrapper-iterator.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1998--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
@@ -51,9 +51,9 @@ void
 Music_wrapper_iterator::construct_children ()
 {
   Music *my_music = get_music ();
-  Music *child = unsmob_music (my_music->get_property ("element"));
+  Music *child = unsmob<Music> (my_music->get_property ("element"));
   child_iter_ = (child)
-                ? unsmob_iterator (get_iterator (child))
+                ? unsmob<Music_iterator> (get_iterator (child))
                 : 0;
 }
 
@@ -79,6 +79,22 @@ Music_wrapper_iterator::pending_moment () const
     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);
 
 bool