Run `make grand-replace'.

[lilypond.git] / lily / easy-notation.cc

diff --git a/lily/easy-notation.cc b/lily/easy-notation.cc
index 90e6accd98a48fafbcd64171ca90e175e0f552d8..87325342306af13ab39f75ea4f41fee56b40590c 100644 (file)
--- a/lily/easy-notation.cc
+++ b/lily/easy-notation.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2008 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 ());
@@ -39,9 +45,9 @@ Note_head::brew_ez_stencil (SCM smob)
   else
     {
       char s[2] = "a";
-      s[0] = (pit->get_notename () + 2) % 7 + 'a';
-      s[0] = toupper (s[0]);
-      charstr = scm_makfrom0str (s);
+      s[0] = char ((pit->get_notename () + 2) % 7 + 'a');
+      s[0] = char (toupper (s[0]));
+      charstr = scm_from_locale_string (s);
     }
 
   SCM letter