2003 -> 2004

[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 f1e64ba558a829c31d23f2b9ff01d0d1a29e0dc1..fd4cd1eaf93025e722401efa487c4130bf16d4ca 100644 (file)
--- a/lily/context-specced-music-iterator.cc
+++ b/lily/context-specced-music-iterator.cc
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 */
 
@@ -14,7 +14,6 @@
 class Context_specced_music_iterator : public Music_wrapper_iterator
 {
 public:
-  VIRTUAL_COPY_CONS(Music_iterator);
   DECLARE_SCHEME_CALLBACK(constructor,());
   virtual void construct_children ();
 };
@@ -23,19 +22,18 @@ 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))
     c_id = ly_scm2string (ci);
+  SCM ops = get_music ()->get_mus_property ("property-operations");
   
   Translator_group* a
-    =report_to ()->find_create_translator (c_type, c_id);
-  
-  set_translator (a);
+    = get_outlet ()->find_create_translator (ct, c_id, ops);
+
+  if (a)
+    set_translator (a);
 
   Music_wrapper_iterator::construct_children();
 }