X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fnote-heads-engraver.cc;h=807e8cc121eeed752f438e0d4e04bf85f5cccb80;hb=5cec63df3df4d0e9ccbdeaaf27f520be5e63161c;hp=93fb8feb4d620bc9946830809d2e70cf39ff1b44;hpb=cc676c5aadd45985251b5d60fa23eed1ed98f6e6;p=lilypond.git

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 93fb8feb4d..807e8cc121 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--2010 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,11 +22,10 @@
 #include <cctype>
 using namespace std;
 
-#include "dots.hh"
-#include "dot-column.hh"
 #include "duration.hh"
 #include "item.hh"
 #include "output-def.hh"
+#include "pitch.hh"
 #include "rhythmic-head.hh"
 #include "staff-symbol-referencer.hh"
 #include "stream-event.hh"
@@ -24,7 +36,6 @@ using namespace std;
 class Note_heads_engraver : public Engraver
 {
   vector<Item*> notes_;
-  vector<Item*> dots_;
   vector<Stream_event*> note_evs_;
 
 public:
@@ -50,28 +61,14 @@ 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];
       Item *note = make_item ("NoteHead", ev->self_scm ());
 
-      Duration dur = *unsmob_duration (ev->get_property ("duration"));
-
-      note->set_property ("duration-log", scm_from_int (dur.duration_log ()));
-      if (dur.dot_count ())
-	{
-	  Item *d = make_item ("Dots", note->self_scm ());
-	  Rhythmic_head::set_dots (note, d);
-
-	  if (dur.dot_count ()
-	      != robust_scm2int (d->get_property ("dot-count"), 0))
-	    d->set_property ("dot-count", scm_from_int (dur.dot_count ()));
-
-	  d->set_parent (note, Y_AXIS);
-
-	  dots_.push_back (d);
-	}
-
       Pitch *pit = unsmob_pitch (ev->get_property ("pitch"));
 
 #if 0 /* TODO: should have a mechanism to switch off these warnings. */
@@ -80,10 +77,18 @@ Note_heads_engraver::process_music ()
 	ev->origin ()->warning (_ ("NoteEvent without pitch"));
 #endif
 
-      int pos = pit ? pit->steps () : 0;
-      SCM c0 = get_property ("middleCPosition");
+      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);
+	pos += scm_to_int(c0);
 
       note->set_property ("staff-position", scm_from_int (pos));
 
@@ -116,16 +121,20 @@ void
 Note_heads_engraver::stop_translation_timestep ()
 {
   notes_.clear ();
-  dots_.clear ();
   note_evs_.clear ();
 }
 
 ADD_TRANSLATOR (Note_heads_engraver,
-		/* doc */ "Generate noteheads.",
+		/* doc */
+		"Generate note heads.",
+
 		/* create */
-		"NoteHead "
-		"Dots",
-		/* accept */
-		"note-event",
-		/* read */ "middleCPosition",
-		/* write */ "");
+		"NoteHead ",
+
+		/* read */
+		"middleCPosition "
+		"staffLineLayoutFunction ",
+
+		/* write */
+		""
+		);