X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Feasy-notation.cc;h=34c0a97f781823f9936ae4e625f68ad7e7c3f2d0;hb=39e7a8e9833986f4cb6bbf1767aa4d86d5b672e0;hp=bd24ffbab2f699a4646bc8c04b7776f1100ca881;hpb=108cf0e8c08c8e15e2a800feb161cfad9057daa8;p=lilypond.git

diff --git a/lily/easy-notation.cc b/lily/easy-notation.cc
index bd24ffbab2..34c0a97f78 100644
--- a/lily/easy-notation.cc
+++ b/lily/easy-notation.cc
@@ -3,30 +3,38 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "note-head.hh"
 
-#include "text-interface.hh"
+#include <cctype>
+using namespace std;
+
+#include "font-interface.hh"
 #include "grob.hh"
-#include "output-def.hh"
 #include "music.hh"
-#include "pitch.hh"
-#include "font-interface.hh"
+#include "output-def.hh"
 #include "staff-symbol-referencer.hh"
 #include "stem.hh"
-#include <cctype>
+#include "stream-event.hh"
+#include "text-interface.hh"
+#include "rhythmic-head.hh"
+
+/*
+
+TODO: move to scheme
 
+*/
 MAKE_SCHEME_CALLBACK (Note_head, brew_ez_stencil, 1);
 SCM
 Note_head::brew_ez_stencil (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
-  int log = Note_head::get_balltype (me);
+  int log = Rhythmic_head::duration_log (me);
 
   SCM cause = me->get_property ("cause");
-  SCM spitch = unsmob_music (cause)->get_property ("pitch");
+  SCM spitch = unsmob_stream_event (cause)->get_property ("pitch");
   Pitch *pit = unsmob_pitch (spitch);
 
   SCM idx = scm_from_int (pit->get_notename ());
@@ -39,11 +47,11 @@ Note_head::brew_ez_stencil (SCM smob)
       char s[2] = "a";
       s[0] = (pit->get_notename () + 2) % 7 + 'a';
       s[0] = toupper (s[0]);
-      charstr = scm_makfrom0str (s);
+      charstr = scm_from_locale_string (s);
     }
 
   SCM letter
-    = Text_interface::interpret_string (me->get_layout ()->self_scm (),
+    = Text_interface::interpret_string (me->layout ()->self_scm (),
 					Font_interface::text_font_alist_chain (me),
 					charstr);