Run `make grand-replace'.

[lilypond.git] / lily / context-specced-music-iterator.cc

diff --git a/lily/context-specced-music-iterator.cc b/lily/context-specced-music-iterator.cc
index 2aa280dfe5dd31e5a57493c5c229095cb80ce085..7d092334963f983a54ec1af8053df1d19365132c 100644 (file)
--- a/lily/context-specced-music-iterator.cc
+++ b/lily/context-specced-music-iterator.cc
@@ -4,11 +4,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "music-wrapper-iterator.hh"
 #include "context.hh"
+#include "music.hh"
+
 
 class Context_specced_music_iterator : public Music_wrapper_iterator
 {
@@ -22,7 +24,7 @@ Context_specced_music_iterator::construct_children ()
 {
   SCM ct = get_music ()->get_property ("context-type");
 
-  String c_id;
+  string c_id;
   SCM ci = get_music ()->get_property ("context-id");
   if (scm_is_string (ci))
     c_id = ly_scm2string (ci);
@@ -30,8 +32,8 @@ Context_specced_music_iterator::construct_children ()
 
   Context *a = 0;
 
-  if (c_id == "$uniqueContextId")
-    a = get_outlet ()->create_unique_context (ct, ops);
+  if (to_boolean (get_music ()->get_property ("create-new")))
+    a = get_outlet ()->create_unique_context (ct, c_id, ops);
   else
     a = get_outlet ()->find_create_context (ct, c_id, ops);