X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic.cc;h=9d87d3bec52cd009373ca817875f7785669ec94e;hb=3704bcc57f83c44c279c40fb4b01ee8860144750;hp=246074f475f132ca540ce5bdb8c4ee80661657fe;hpb=b6a8afbd0a9a0b36b07c114503d81a7c420e09e7;p=lilypond.git

diff --git a/lily/music.cc b/lily/music.cc
index 246074f475..9d87d3bec5 100644
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "music.hh"
@@ -11,12 +11,11 @@
 #include "context.hh"
 #include "dispatcher.hh"
 #include "duration.hh"
-#include "input-smob.hh"
+#include "input.hh"
 #include "international.hh"
 #include "ly-smobs.icc"
 #include "main.hh"
 #include "music-sequence.hh"
-#include "pitch.hh"
 #include "score.hh"
 #include "warn.hh"
 
@@ -64,8 +63,7 @@ Music::copy_mutable_properties () const
 void
 Music::type_check_assignment (SCM s, SCM v) const
 {
-  if (!::type_check_assignment (s, v, ly_symbol2scm ("music-type?")))
-    abort ();
+  ::type_check_assignment (s, v, ly_symbol2scm ("music-type?"));
 }
 
 Music::Music (Music const &m)
@@ -139,7 +137,7 @@ Music::generic_to_relative_octave (Pitch last)
 	  Pitch expected_pit (scm_to_int (check),
 			      new_pit.get_notename (),
 			      new_pit.get_alteration ());
-	  origin ()->warning (_f ("octave check failed; expected \"%s\", found: %s",
+	  origin ()->warning (_f ("octave check failed; expected \"%s\", found: \"%s\"",
 				  expected_pit.to_string (),
 				  new_pit.to_string ()));
 	  new_pit = expected_pit;
@@ -184,43 +182,53 @@ Music::compress (Moment factor)
     set_property ("duration", d->compressed (factor.main_part_).smobbed_copy ());
 }
 
+/*
+  This mutates alist.  Hence, make sure that it is not shared 
+*/
 void
-Music::transpose (Pitch delta)
+transpose_mutable (SCM alist, Pitch delta)
 {
-  if (to_boolean (get_property ("untransposable")))
-    return;
-
-  for (SCM s = this->get_property_alist (true); scm_is_pair (s); s = scm_cdr (s))
+  for (SCM s = alist; scm_is_pair (s); s = scm_cdr (s))
     {
       SCM entry = scm_car (s);
+      SCM prop = scm_car (entry);
       SCM val = scm_cdr (entry);
-
+      SCM new_val = val;
+      
       if (Pitch *p = unsmob_pitch (val))
 	{
 	  Pitch transposed = p->transposed (delta);
-	  scm_set_cdr_x (entry, transposed.smobbed_copy ());
-
-	  if (abs (transposed.get_alteration ()) > DOUBLE_SHARP)
+	  if (transposed.get_alteration ().abs () > Rational (1,1))
 	    {
 	      warning (_f ("transposition by %s makes alteration larger than double",
 			   delta.to_string ()));
 	    }
+
+	  new_val = transposed.smobbed_copy ();
 	}
+      else if (prop == ly_symbol2scm ("element"))
+	{
+	  if (Music *m = unsmob_music (val))
+	    m->transpose (delta);
+	}
+      else if (prop == ly_symbol2scm ("elements"))
+	transpose_music_list (val, delta);
+      else if (prop == ly_symbol2scm ("pitch-alist") &&
+	       scm_is_pair (val))
+	new_val = ly_transpose_key_alist (val, delta.smobbed_copy ());
+
+      if (val != new_val)
+	scm_set_cdr_x (entry , new_val);
     }
+}
 
-  SCM elt = get_property ("element");
-
-  if (Music *m = unsmob_music (elt))
-    m->transpose (delta);
-
-  transpose_music_list (get_property ("elements"), delta);
+void
+Music::transpose (Pitch delta)
+{
+  if (to_boolean (get_property ("untransposable")))
+    return;
 
-  /*
-    UGH - how do this more generically?
-  */
-  SCM pa = get_property ("pitch-alist");
-  if (scm_is_pair (pa))
-    set_property ("pitch-alist", ly_transpose_key_alist (pa, delta.smobbed_copy ()));
+  transpose_mutable (mutable_property_alist_, delta);
 }
 
 void
@@ -242,45 +250,45 @@ Music::origin () const
 Stream_event *
 Music::to_event () const
 {
-  /* UGH. Temp hack */
-  SCM orig_sym = get_property ("name");
-  char out[200];
-  string in = ly_symbol2string (orig_sym);
-  /* don't add '-' before first character */
-  out[0] = tolower (in[0]);
-  size_t outpos = 1;
-  for (size_t inpos = 1; inpos < in.size () && outpos < 190; inpos++)
+  SCM class_name = ly_camel_case_2_lisp_identifier (get_property ("name"));
+
+  // catch programming mistakes.
+  if (!internal_is_music_type (class_name))
     {
-      if (isupper (in[inpos]))
-	out[outpos++] = '-';
-      out[outpos++] = tolower (in[inpos]);      
+      programming_error ("Not a music type");
     }
-  out[outpos] = 0;
-  SCM class_name = ly_symbol2scm (out);
 
   Stream_event *e = new Stream_event (class_name, mutable_property_alist_);
   Moment length = get_length ();
   if (length.to_bool ())
     e->set_property ("length", length.smobbed_copy ());
 
+  // articulations as events.
+  SCM art_mus = e->get_property ("articulations");
+  if (scm_is_pair (art_mus))
+    {
+      SCM art_ev = SCM_EOL;
+      for (; scm_is_pair (art_mus); art_mus = scm_cdr (art_mus))
+	{
+	  Music *m = unsmob_music (scm_car (art_mus));
+	  SCM ev = m ? m->to_event ()->unprotect () : scm_car (art_mus);
+	  art_ev = scm_cons (ev, art_ev);
+	}
+      e->set_property ("articulations", scm_reverse_x (art_ev, SCM_EOL));
+    }
+
   /*
     ES TODO: This is a temporary fix. Stream_events should not be
     aware of music.
   */
   e->set_property ("music-cause", self_scm ());
+
   return e;
 }
 
 void
 Music::send_to_context (Context *c)
 {
-  /*
-    TODO: This is a work-in-progress solution. Send the event so it
-    can be read both by old-style translators and the new ones.
-  */
-  send_stream_event (c, "OldMusicEvent", origin (),
-  		     ly_symbol2scm("music"), self_scm (), 0);
-
   Stream_event *ev = to_event ();
   c->event_source ()->broadcast (ev);
   ev->unprotect ();