X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-signature-interface.cc;h=79e2bd99482d25b8e5eb1fb10e9fb1ce2255cae7;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=9181071aeefad9c7231e832d7544e74f780d7671;hpb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;p=lilypond.git

diff --git a/lily/key-signature-interface.cc b/lily/key-signature-interface.cc
index 9181071aee..79e2bd9948 100644
--- a/lily/key-signature-interface.cc
+++ b/lily/key-signature-interface.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1996--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   keyplacement by Mats Bengtsson
 
@@ -27,11 +27,11 @@
 #include "output-def.hh"
 #include "staff-symbol-referencer.hh"
 #include "rational.hh"
+#include "lily-imports.hh"
 
 struct Key_signature_interface
 {
   DECLARE_SCHEME_CALLBACK (print, (SCM));
-  DECLARE_GROB_INTERFACE ();
 };
 
 /*
@@ -42,7 +42,7 @@ MAKE_SCHEME_CALLBACK (Key_signature_interface, print, 1);
 SCM
 Key_signature_interface::print (SCM smob)
 {
-  Item *me = dynamic_cast<Item *> (unsmob_grob (smob));
+  Item *me = unsmob<Item> (smob);
 
   Real inter = Staff_symbol_referencer::staff_space (me) / 2.0;
 
@@ -87,11 +87,10 @@ Key_signature_interface::print (SCM smob)
         me->warning (_ ("alteration not found"));
       else
         {
-          SCM proc = ly_lily_module_constant ("key-signature-interface::alteration-positions");
-
           pos.set_empty ();
           Stencil column;
-          for (SCM pos_list = scm_call_3 (proc, scm_car (s), c0s, smob);
+          for (SCM pos_list = Lily::key_signature_interface_alteration_positions
+                 (scm_car (s), c0s, smob);
                scm_is_pair (pos_list); pos_list = scm_cdr (pos_list))
             {
               int p = scm_to_int (scm_car (pos_list));
@@ -137,4 +136,5 @@ ADD_INTERFACE (Key_signature_interface,
                "sharp-positions "
                "padding "
                "padding-pairs "
+               "non-default "
               );