X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flilypond-key.cc;h=6dc69be030f790aea8ab6c7aa0c912048304a86e;hb=e10ac37baf76ef07809e851f70870d1e5b8f3bb1;hp=0cb7652413c6699d0082ed9b8374d63b1ae9e5fe;hpb=4415180779ee5ba2981a4cf1ead235d7126878a1;p=lilypond.git

diff --git a/lily/lilypond-key.cc b/lily/lilypond-key.cc
index 0cb7652413..6dc69be030 100644
--- a/lily/lilypond-key.cc
+++ b/lily/lilypond-key.cc
@@ -78,7 +78,7 @@ Lilypond_grob_key::from_scheme (SCM a)
   return new Lilypond_grob_key (unsmob_key (scm_car (a)),
 				*unsmob_moment (scm_cadr (a)),
 				ly_scm2string  (scm_caddr (a)),
-				scm_to_int (scm_cadddr (a)));
+				scm_to_int  (scm_list_ref (a, scm_from_int (3))));
 }
 
 
@@ -163,10 +163,11 @@ Lilypond_context_key::as_scheme () const
 Object_key *
 Lilypond_context_key::from_scheme (SCM a) 
 {
-  return new Lilypond_grob_key (unsmob_key (scm_car (a)),
-				*unsmob_moment (scm_cadr (a)),
-				ly_scm2string  (scm_list_ref (a, scm_from_int (2))),
-				scm_to_int  (scm_list_ref (a, scm_from_int (3))));
+  return new Lilypond_context_key (unsmob_key (scm_car (a)),
+				   *unsmob_moment (scm_cadr (a)),
+				   ly_scm2string  (scm_list_ref (a, scm_from_int (2))),
+				   ly_scm2string  (scm_list_ref (a, scm_from_int (3))),
+				   scm_to_int  (scm_list_ref (a, scm_from_int (4))));
 }
 
 
@@ -212,7 +213,6 @@ Lilypond_general_key::do_compare (Object_key const* key)const
   if (c)
     return c;
 
-  
   c = sign (disambiguation_count_ - other->disambiguation_count_);
   if (c)
     return c;