* lily/ : rename Request to Event

[lilypond.git] / lily / note-head.cc

diff --git a/lily/note-head.cc b/lily/note-head.cc
index 16c58ebaea15aa1137b235a6ea3dc07e50862290..e32c1a663f0e4172e85d74ac9234afc001ad80f9 100644 (file)
--- a/lily/note-head.cc
+++ b/lily/note-head.cc
@@ -14,7 +14,7 @@
 #include "warn.hh"
 #include "font-interface.hh"
 #include "molecule.hh"
-#include "musical-request.hh"
+#include "event.hh"
 #include "rhythmic-head.hh"
 #include "staff-symbol-referencer.hh"
 #include "lookup.hh"
@@ -111,16 +111,9 @@ internal_brew_molecule (Grob *me, bool ledger_take_space)
       return Molecule();
     }
 
-  /*
-    ugh: use gh_call () / scm_apply ().
-
-    UGH: use grob-property.
-  */
   SCM log = gh_int2scm (Note_head::get_balltype (me));
-  SCM exp = scm_list_n (ly_symbol2scm ("find-notehead-symbol"), log,
-                       ly_quote_scm (style),
-                       SCM_UNDEFINED);
-  SCM scm_font_char = scm_primitive_eval (exp);
+  SCM proc = me->get_grob_property ("glyph-name-procedure");
+  SCM scm_font_char = scm_call_2 (proc, log, style);
   String font_char = "noteheads-" + ly_scm2string (scm_font_char);
 
   Font_metric * fm = Font_interface::get_default_font (me);
@@ -259,5 +252,5 @@ Note_head::get_balltype (Grob*me)
 
 ADD_INTERFACE (Note_head,"note-head-interface",
   "Note head",
-  "accidental-grob style stem-attachment-function");
+  "glyph-name-procedure accidental-grob style stem-attachment-function");