X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcontext-specced-music-iterator.cc;h=323dd7ca502a71fd560e30b7138ec4df63350163;hb=eb87f600313f2d56a8708e5624b7bc7ec7acf1ff;hp=dc3c929781c2be1b6397b12d86fa65e0c92c3ef0;hpb=7aabfb20c46e0a1de41698ddc6859ccd3a6dea85;p=lilypond.git

diff --git a/lily/context-specced-music-iterator.cc b/lily/context-specced-music-iterator.cc
index dc3c929781..323dd7ca50 100644
--- a/lily/context-specced-music-iterator.cc
+++ b/lily/context-specced-music-iterator.cc
@@ -1,41 +1,49 @@
-/*   
-context-specced-music-iterator.cc --  implement 
+/*
+  context-specced-music-iterator.cc -- implement
+  Context_specced_music_iterator
 
-source file of the GNU LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
-(c) 2002--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
+  (c) 2002--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #include "music-wrapper-iterator.hh"
-#include "translator-group.hh"
+#include "context.hh"
 
 class Context_specced_music_iterator : public Music_wrapper_iterator
 {
 public:
-  VIRTUAL_COPY_CONS(Music_iterator);
-  DECLARE_SCHEME_CALLBACK(constructor,());
+  DECLARE_SCHEME_CALLBACK (constructor, ());
   virtual void construct_children ();
 };
 
 void
 Context_specced_music_iterator::construct_children ()
 {
-  SCM ct = get_music ()->get_mus_property ("context-type");
-  String c_type;
-  if (gh_string_p (ct))
-    c_type =  ly_scm2string (ct);
-  
-  String c_id;
-  SCM ci = get_music ()->get_mus_property ("context-id");
-  if (gh_string_p (ci))
+  SCM ct = get_music ()->get_property ("context-type");
+
+  std::string c_id;
+  SCM ci = get_music ()->get_property ("context-id");
+  if (scm_is_string (ci))
     c_id = ly_scm2string (ci);
-  
-  Translator_group* a
-    =report_to ()->find_create_translator (c_type, c_id);
-  
-  set_translator (a);
+  SCM ops = get_music ()->get_property ("property-operations");
+
+  Context *a = 0;
+
+  if (c_id == "$uniqueContextId")
+    a = get_outlet ()->create_unique_context (ct, ops);
+  else
+    a = get_outlet ()->find_create_context (ct, c_id, ops);
 
-  Music_wrapper_iterator::construct_children();
+  if (a
+      && to_boolean (get_music ()->get_property ("descend-only"))
+      && !is_child_context (get_outlet (), a))
+    a = 0;
+
+  if (a)
+    set_context (a);
+
+  Music_wrapper_iterator::construct_children ();
 }
-IMPLEMENT_CTOR_CALLBACK(Context_specced_music_iterator);
+
+IMPLEMENT_CTOR_CALLBACK (Context_specced_music_iterator);