X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-heads-engraver.cc;h=a6886c3b370ac3664d65123e9af9dc5eb812a196;hb=5f03f8603e38802a1c38cf7a85a1c833ccfc2c39;hp=1c6bf4142d4e70efd749cde07a472a46b834212b;hpb=38c49bb9b2b4dd218249d8bb668057892c53601b;p=lilypond.git

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 1c6bf4142d..a6886c3b37 100644
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -1,7 +1,20 @@
 /*
-  note-heads-engraver.cc -- part of GNU LilyPond
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "engraver.hh"
@@ -9,8 +22,6 @@
 #include <cctype>
 using namespace std;
 
-#include "dots.hh"
-#include "dot-column.hh"
 #include "duration.hh"
 #include "item.hh"
 #include "output-def.hh"
@@ -50,6 +61,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];
@@ -63,11 +77,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));
 
       /*
@@ -103,10 +125,16 @@ Note_heads_engraver::stop_translation_timestep ()
 }
 
 ADD_TRANSLATOR (Note_heads_engraver,
-		/* doc */ "Generate noteheads.",
+		/* doc */
+		"Generate note heads.",
+
 		/* create */
 		"NoteHead ",
-		/* accept */
-		"note-event",
-		/* read */ "middleCPosition",
-		/* write */ "");
+
+		/* read */
+		"middleCPosition "
+		"staffLineLayoutFunction ",
+
+		/* write */
+		""
+		);