X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstream-event.cc;fp=lily%2Fstream-event.cc;h=5ce03ec08d0d21883b0e3249eea1685326fdcbc9;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=840695301ad4a31f2e8287af2e22a9c15ff79e89;hpb=f41973ff763d5972a85995b6d40c864281ec6714;p=lilypond.git

diff --git a/lily/stream-event.cc b/lily/stream-event.cc
index 840695301a..5ce03ec08d 100644
--- a/lily/stream-event.cc
+++ b/lily/stream-event.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2011 Erik Sandberg  <mandolaerik@gmail.com>
+  Copyright (C) 2005--2012 Erik Sandberg  <mandolaerik@gmail.com>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -22,7 +22,8 @@
 #include "ly-smobs.icc"
 #include "context.hh"
 #include "input.hh"
-#include "input.hh"
+#include "music.hh"
+#include "pitch.hh"
 
 /* TODO: Rename Stream_event -> Event */
 
@@ -31,16 +32,15 @@ Stream_event::Stream_event ()
 {
 }
 
-Stream_event::Stream_event (SCM event_class, SCM mutable_props)
+Stream_event::Stream_event (SCM event_class, SCM immutable_props)
   : Prob (ly_symbol2scm ("Stream_event"),
-	  scm_list_1 (scm_cons (ly_symbol2scm ("class"), event_class)))
+          scm_acons (ly_symbol2scm ("class"), event_class, immutable_props))
 {
-  mutable_property_alist_ = mutable_props;
 }
 
 Stream_event::Stream_event (SCM class_name, Input *origin)
   : Prob (ly_symbol2scm ("Stream_event"),
-	  scm_list_1 (scm_cons (ly_symbol2scm ("class"), class_name)))
+          scm_list_1 (scm_cons (ly_symbol2scm ("class"), class_name)))
 {
   if (origin)
     set_spot (origin);
@@ -69,20 +69,41 @@ bool
 Stream_event::internal_in_event_class (SCM class_name)
 {
   SCM cl = get_property ("class");
-  cl = scm_call_1 (ly_lily_module_constant ("ly:make-event-class"), cl);
   return scm_c_memq (class_name, cl) != SCM_BOOL_F;
 }
 
 MAKE_SCHEME_CALLBACK (Stream_event, undump, 1);
 MAKE_SCHEME_CALLBACK (Stream_event, dump, 1);
 
+void
+Stream_event::make_transposable ()
+{
+  /* This is in preparation for transposing stuff
+     that may be defined in the immutable part */
+
+  for (SCM s = immutable_property_alist_; scm_is_pair (s); s = scm_cdr (s))
+    {
+      SCM entry = scm_car (s);
+      SCM prop = scm_car (entry);
+      SCM val = scm_cdr (entry);
+
+      if ((unsmob_pitch (val)
+           || (prop == ly_symbol2scm ("element") && unsmob_music (val))
+           || (prop == ly_symbol2scm ("elements") && scm_is_pair (val))
+           || (prop == ly_symbol2scm ("pitch-alist") && scm_is_pair (val)))
+          && scm_is_false (scm_assq (prop, mutable_property_alist_)))
+        mutable_property_alist_
+          = scm_acons (prop, ly_music_deep_copy (val), mutable_property_alist_);
+    }
+}
+
 SCM
 Stream_event::dump (SCM self)
 {
   Stream_event *ev = unsmob_stream_event (self);
   // Reversed alists look prettier.
   return scm_cons (scm_reverse (ev->immutable_property_alist_),
-		   scm_reverse (ev->mutable_property_alist_));
+                   scm_reverse (ev->mutable_property_alist_));
 }
 
 SCM
@@ -97,5 +118,5 @@ Stream_event::undump (SCM data)
 Stream_event *
 unsmob_stream_event (SCM m)
 {
-  return dynamic_cast<Stream_event*> (unsmob_prob (m));
+  return dynamic_cast<Stream_event *> (unsmob_prob (m));
 }