X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Feasy-notation.cc;h=87325342306af13ab39f75ea4f41fee56b40590c;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=80ebdca8130bbb579347d9d6e7d99534945d0525;hpb=be4f786099ef94bc10aa48eb706631e4c1bbf016;p=lilypond.git

diff --git a/lily/easy-notation.cc b/lily/easy-notation.cc
index 80ebdca813..8732534230 100644
--- a/lily/easy-notation.cc
+++ b/lily/easy-notation.cc
@@ -3,33 +3,41 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "note-head.hh"
 
-#include "text-item.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 "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_int2num (pit->get_notename ());
+  SCM idx = scm_from_int (pit->get_notename ());
   SCM names = me->get_property ("note-names");
   SCM charstr = SCM_EOL;
   if (scm_is_vector (names))
@@ -37,39 +45,35 @@ 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
-    = 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);
-  
+
   Stencil l (*unsmob_stencil (letter));
   l.align_to (X_AXIS, CENTER);
   l.align_to (Y_AXIS, CENTER);
 
-  
-  l = Stencil (Box (), l.expr ()); 
+  l = Stencil (Box (), l.expr ());
   Real ss = Staff_symbol_referencer::staff_space (me);
   Real lt = Staff_symbol_referencer::line_thickness (me);
 
   Real radius = (ss + lt) / 2.0;
-  Real stem_thick = 1.3 * lt; 
-  if (Grob *stem = unsmob_grob (me->get_property ("stem")))
-    {
-      stem_thick = Stem::thickness (stem);
-    }
+  Real stem_thick = 1.3 * lt;
+  if (Grob *stem = unsmob_grob (me->get_object ("stem")))
+    stem_thick = Stem::thickness (stem);
 
   int black = (log >= 2);
 
   Stencil head;
   Box extent (Interval (-radius, radius),
 	      Interval (-radius, radius));
-	      
+
   Stencil black_head (extent,
 		      scm_list_4 (ly_symbol2scm ("circle"),
 				  scm_from_double (radius),
@@ -77,20 +81,17 @@ Note_head::brew_ez_stencil (SCM smob)
 				  SCM_BOOL_T));
   Stencil white_head;
   if (black)
-    {
-      l = l.in_color (1, 1, 1); 
-    }
+    l = l.in_color (1, 1, 1);
   else
     {
       white_head = Stencil (extent,
 			    scm_list_4 (ly_symbol2scm ("circle"),
-			       scm_from_double (radius - stem_thick),
-			       scm_from_double (0.0),
-			       SCM_BOOL_T));
+					scm_from_double (radius - stem_thick),
+					scm_from_double (0.0),
+					SCM_BOOL_T));
 
       white_head = white_head.in_color (1, 1, 1);
     }
-    
 
   Stencil total;
   total.add_stencil (l);