Run `make grand-replace'.

[lilypond.git] / lily / note-heads-engraver.cc

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index a49bbbe81f64bfefb3d4d43ac1d35111a7895c44..e3fce707fae3210d16c222c4a1b735ec8d349b65 100644 (file)
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -1,7 +1,7 @@
 /*
   note-heads-engraver.cc -- part of GNU LilyPond
 
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -48,6 +48,9 @@ Note_heads_engraver::listen_note (Stream_event *ev)
 void
 Note_heads_engraver::process_music ()
 {
+  SCM c0 = get_property ("middleCPosition");
+  SCM layout_proc = get_property("staffLineLayoutFunction");
+      
   for (vsize i = 0; i < note_evs_.size (); i++)
     {
       Stream_event *ev = note_evs_[i];
@@ -61,11 +64,19 @@ Note_heads_engraver::process_music ()
        ev->origin ()->warning (_ ("NoteEvent without pitch"));
 #endif
 
-      int pos = pit ? pit->steps () : 0;
-      SCM c0 = get_property ("middleCPosition");
-      if (scm_is_number (c0))
-       pos += scm_to_int (c0);
+      int pos;
+      if (pit == 0)
+       pos = 0;
+      else if (ly_is_procedure (layout_proc)){
+       SCM pitch = ev->get_property("pitch");
+       pos = scm_to_int(scm_call_1 (layout_proc, pitch));
+      }
+      else 
+       pos = pit->steps ();
 
+      if (scm_is_number (c0))
+       pos += scm_to_int(c0);
+      
       note->set_property ("staff-position", scm_from_int (pos));
 
       /*
@@ -101,10 +112,16 @@ Note_heads_engraver::stop_translation_timestep ()
 }
 
 ADD_TRANSLATOR (Note_heads_engraver,
-               /* doc */ "Generate noteheads.",
+               /* doc */
+               "Generate note heads.",
+
                /* create */
                "NoteHead ",
+
                /* read */
-               "middleCPosition",
+               "middleCPosition "
+               "staffLineLayoutFunction ",
+
                /* write */
-               "");
+               ""
+               );