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 a4df122a44c120684677d14c4315d1c5606ccac7..7d092334963f983a54ec1af8053df1d19365132c 100644 (file)
--- a/lily/context-specced-music-iterator.cc
+++ b/lily/context-specced-music-iterator.cc
@@ -1,20 +1,21 @@
-/*   
+/*
   context-specced-music-iterator.cc -- implement
-    Context_specced_music_iterator
+  Context_specced_music_iterator
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.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
 {
 public:
-  DECLARE_SCHEME_CALLBACK (constructor,());
+  DECLARE_SCHEME_CALLBACK (constructor, ());
   virtual void construct_children ();
 };
 
@@ -23,24 +24,24 @@ 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);
   SCM ops = get_music ()->get_property ("property-operations");
-  
-  Context * a = 0;
 
-  if (c_id == "$uniqueContextId")
-    a = get_outlet ()->create_unique_context (ct, ops);
+  Context *a = 0;
+
+  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);
 
   if (a
-       && to_boolean (get_music ()->get_property ("descend-only"))
+      && to_boolean (get_music ()->get_property ("descend-only"))
       && !is_child_context (get_outlet (), a))
     a = 0;
-  
+
   if (a)
     set_context (a);