X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-heads-engraver.cc;h=0431981eb65a46b3543acd02b9c8af0c78dc1e06;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=7d976761dd9fbfdd512ad9d4af025c6b6b01feea;hpb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;p=lilypond.git

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 7d976761dd..0431981eb6 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--2015 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"
@@ -22,8 +35,7 @@ using namespace std;
 
 class Note_heads_engraver : public Engraver
 {
-  vector<Item*> notes_;
-  vector<Stream_event*> note_evs_;
+  vector<Stream_event *> note_evs_;
 
 public:
   TRANSLATOR_DECLARATIONS (Note_heads_engraver);
@@ -48,61 +60,78 @@ 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 ());
 
-      Pitch *pit = unsmob_pitch (ev->get_property ("pitch"));
+      Pitch *pit = Pitch::unsmob (ev->get_property ("pitch"));
 
 #if 0 /* TODO: should have a mechanism to switch off these warnings. */
 
       if (!pit)
-	ev->origin ()->warning (_ ("NoteEvent without pitch"));
+        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));
 
       /*
-	Shape note heads change on step of the scale.
+        Shape note heads change on step of the scale.
       */
       SCM shape_vector = get_property ("shapeNoteStyles");
       if (scm_is_vector (shape_vector))
-	{
-	  SCM scm_tonic = get_property ("tonic");
-	  Pitch tonic (0, 0, 0);
-	  if (unsmob_pitch (scm_tonic))
-	    tonic = *unsmob_pitch (scm_tonic);
-
-	  unsigned int delta = (pit->get_notename () - tonic.get_notename () + 7) % 7;
-
-	  SCM style = SCM_EOL;
-	  if (scm_c_vector_length (shape_vector) > delta
-	      && scm_is_symbol (scm_vector_ref (shape_vector, scm_from_int (delta))))
-	    style = scm_vector_ref (shape_vector, scm_from_int (delta));
-	  if (scm_is_symbol (style))
-	    note->set_property ("style", style);
-	}
-
-      notes_.push_back (note);
+        {
+          SCM scm_tonic = get_property ("tonic");
+          Pitch tonic;
+          if (Pitch::is_smob (scm_tonic))
+            tonic = *Pitch::unsmob (scm_tonic);
+
+          unsigned int delta = (pit->get_notename () - tonic.get_notename () + 7) % 7;
+
+          SCM style = SCM_EOL;
+          if (scm_c_vector_length (shape_vector) > delta
+              && scm_is_symbol (scm_vector_ref (shape_vector, scm_from_int (delta))))
+            style = scm_vector_ref (shape_vector, scm_from_int (delta));
+          if (scm_is_symbol (style))
+            note->set_property ("style", style);
+        }
     }
 }
 
 void
 Note_heads_engraver::stop_translation_timestep ()
 {
-  notes_.clear ();
   note_evs_.clear ();
 }
 
 ADD_TRANSLATOR (Note_heads_engraver,
-		/* doc */ "Generate noteheads.",
-		/* create */
-		"NoteHead ",
-		/* read */ "middleCPosition",
-		/* write */ "");
+                /* doc */
+                "Generate note heads.",
+
+                /* create */
+                "NoteHead ",
+
+                /* read */
+                "middleCPosition "
+                "staffLineLayoutFunction ",
+
+                /* write */
+                ""
+               );