add vcs lines to debian/control

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

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index cfd684779948acdb97a151424b88d58e6d78bd5c..4aa97dd4b90c62666feb682274a967c38c536aa7 100644 (file)
--- 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--2011 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"
@@ -24,9 +35,7 @@ using namespace std;
 
 class Note_heads_engraver : public Engraver
 {
-  vector<Item*> notes_;
-  vector<Item*> dots_;
-  vector<Stream_event*> note_evs_;
+  vector<Stream_event *> note_evs_;
 
 public:
   TRANSLATOR_DECLARATIONS (Note_heads_engraver);
@@ -51,6 +60,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];
@@ -64,8 +76,17 @@ 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);
 
@@ -91,25 +112,26 @@ Note_heads_engraver::process_music ()
          if (scm_is_symbol (style))
            note->set_property ("style", style);
        }
-
-      notes_.push_back (note);
     }
 }
 
 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 */
+               ""
+               );