X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic.cc;h=9d87d3bec52cd009373ca817875f7785669ec94e;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=b938c86e2235bc5235b3081a6623d218eb142b6c;hpb=68f8545bd6a0221ee1100336e4ad49399a7ffaa4;p=lilypond.git

diff --git a/lily/music.cc b/lily/music.cc
index b938c86e22..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"
@@ -16,7 +16,6 @@
 #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;
@@ -185,29 +183,28 @@ Music::compress (Moment factor)
 }
 
 /*
-TODO: make transposition non-destructive
+  This mutates alist.  Hence, make sure that it is not shared 
 */
-SCM
+void
 transpose_mutable (SCM alist, Pitch delta)
 {
-  SCM retval = SCM_EOL;
-
   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"))
 	{
@@ -218,11 +215,11 @@ transpose_mutable (SCM alist, Pitch delta)
 	transpose_music_list (val, delta);
       else if (prop == ly_symbol2scm ("pitch-alist") &&
 	       scm_is_pair (val))
-	entry = scm_cons (prop, ly_transpose_key_alist (val, delta.smobbed_copy ()));
-      retval = scm_cons (entry, retval);
-    }
+	new_val = ly_transpose_key_alist (val, delta.smobbed_copy ());
 
-  return scm_reverse_x (retval, SCM_EOL);
+      if (val != new_val)
+	scm_set_cdr_x (entry , new_val);
+    }
 }
 
 void
@@ -231,7 +228,7 @@ Music::transpose (Pitch delta)
   if (to_boolean (get_property ("untransposable")))
     return;
 
-  mutable_property_alist_ = transpose_mutable (mutable_property_alist_, delta);
+  transpose_mutable (mutable_property_alist_, delta);
 }
 
 void
@@ -253,21 +250,7 @@ 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++)
-    {
-      if (isupper (in[inpos]))
-	out[outpos++] = '-';
-      out[outpos++] = tolower (in[inpos]);      
-    }
-  out[outpos] = 0;
-  SCM class_name = ly_symbol2scm (out);
+  SCM class_name = ly_camel_case_2_lisp_identifier (get_property ("name"));
 
   // catch programming mistakes.
   if (!internal_is_music_type (class_name))