* mf/feta-macros.mf (soft_start_penstroke, soft_end_penstroke): New

[lilypond.git] / lily / lilypond-key.cc

diff --git a/lily/lilypond-key.cc b/lily/lilypond-key.cc
index 80031c6fd341e72563e3f34109f428967b4f512c..bf05aebf3cc1d5a78515d37312865345f7fd807e 100644 (file)
--- a/lily/lilypond-key.cc
+++ b/lily/lilypond-key.cc
@@ -7,8 +7,6 @@
 
 */
 
-
-#include "object-key.hh"
 #include "lilypond-key.hh"
 
 Lilypond_grob_key::Lilypond_grob_key (Object_key const *context,
@@ -163,10 +161,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 +211,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;