X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcontext-specced-music-iterator.cc;h=1a27d2a93d346f1478d398510435c0035647c4ae;hb=750b714488c5af6eae22d07163bba8b554734ac6;hp=fd6bcf3a028cc682d6f041460b22db6197e23783;hpb=ef8093ad63c7a00a169cf88d71368b204dd65655;p=lilypond.git

diff --git a/lily/context-specced-music-iterator.cc b/lily/context-specced-music-iterator.cc
index fd6bcf3a02..1a27d2a93d 100644
--- a/lily/context-specced-music-iterator.cc
+++ b/lily/context-specced-music-iterator.cc
@@ -1,40 +1,60 @@
-/*   
-  context-specced-music-iterator.cc -- implement
-    Context_specced_music_iterator
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2002--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2002--2003 Han-Wen Nienhuys <hanwen@cs.uu.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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "music-wrapper-iterator.hh"
-#include "translator-group.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 ();
 };
 
 void
 Context_specced_music_iterator::construct_children ()
 {
-  SCM ct = get_music ()->get_mus_property ("context-type");
+  SCM ct = get_music ()->get_property ("context-type");
 
-  String c_id;
-  SCM ci = get_music ()->get_mus_property ("context-id");
-  if (gh_string_p (ci))
+  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_mus_property ("property-operations");
-  
-  Translator_group* a
-    = get_outlet ()->find_create_translator (ct, c_id, ops);
+  SCM ops = get_music ()->get_property ("property-operations");
+
+  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();
+  Music_wrapper_iterator::construct_children ();
 }
-IMPLEMENT_CTOR_CALLBACK(Context_specced_music_iterator);
+
+IMPLEMENT_CTOR_CALLBACK (Context_specced_music_iterator);