X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic.cc;h=9d87d3bec52cd009373ca817875f7785669ec94e;hb=5a44d42908f7722f9f4a7675ec81325087c42e9a;hp=3dbbe123e522067d8aee92a31c0b872fffdcb84e;hpb=e42585017a01fd02f6353b994cf0c87b03a7bb2e;p=lilypond.git

diff --git a/lily/music.cc b/lily/music.cc
index 3dbbe123e5..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"
@@ -63,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)
@@ -251,7 +250,7 @@ Music::origin () const
 Stream_event *
 Music::to_event () const
 {
-  SCM class_name = ly_camel_case_to_lisp_identifier (get_property ("name"));
+  SCM class_name = ly_camel_case_2_lisp_identifier (get_property ("name"));
 
   // catch programming mistakes.
   if (!internal_is_music_type (class_name))