X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-heads-engraver.cc;h=173961cb08d73b4a4e22183877478c034e02d688;hb=9d8942c954e7d44d121c89719aceb91cf83d51ed;hp=b6b457b6e33ea42e2bf37a7f8891caebc3078fae;hpb=474c8729dc274a30558102a015a01fa5882673db;p=lilypond.git

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index b6b457b6e3..173961cb08 100644
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -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,8 +112,16 @@ Note_heads_engraver::stop_translation_timestep ()
 }
 
 ADD_TRANSLATOR (Note_heads_engraver,
-		/* doc */ "Generate noteheads.",
+		/* doc */
+		"Generate note heads.",
+
 		/* create */
 		"NoteHead ",
-		/* read */ "middleCPosition",
-		/* write */ "");
+
+		/* read */
+		"middleCPosition "
+		"staffLineLayoutFunction ",
+
+		/* write */
+		""
+		);