X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcontext-specced-music-iterator.cc;h=38f5549141d0c86780ceb8e423bfb5963dde3f78;hb=4063c4f664e044181e416857e999cb07391c3e33;hp=fb5968b980bb97999d2cf9e2f42dd817abf27c4b;hpb=ba858880848d6aca1de4401d185860eb2017a01c;p=lilypond.git

diff --git a/lily/context-specced-music-iterator.cc b/lily/context-specced-music-iterator.cc
index fb5968b980..38f5549141 100644
--- 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--2007 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,22 +24,26 @@ 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 (ly_c_string_p (ci))
+  if (scm_is_string (ci))
     c_id = ly_scm2string (ci);
   SCM ops = get_music ()->get_property ("property-operations");
-  
-  Context * a
-    = get_outlet ()->find_create_context (ct, c_id, 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"))
       && !is_child_context (get_outlet (), a))
     a = 0;
-  
+
   if (a)
-    set_translator (a);
+    set_context (a);
 
   Music_wrapper_iterator::construct_children ();
 }