X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Feasy-notation.cc;h=c6ecb0e20f4539a48301f0e959ac96f2240374c4;hb=2649586f759f68254919874fc4568a50eff2919c;hp=879ded5483b3ffa5c1b8db5a9e4368759fcc5082;hpb=4ecdbd7d70ca7441be4dddd15ac01cc255bc2a35;p=lilypond.git

diff --git a/lily/easy-notation.cc b/lily/easy-notation.cc
index 879ded5483..c6ecb0e20f 100644
--- a/lily/easy-notation.cc
+++ b/lily/easy-notation.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "note-head.hh"
@@ -11,24 +11,30 @@
 #include <cctype>
 using namespace std;
 
-#include "text-interface.hh"
+#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 "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 ());
@@ -45,7 +51,7 @@ Note_head::brew_ez_stencil (SCM smob)
     }
 
   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);