/*
- 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"
#include <cctype>
using namespace std;
-#include "rhythmic-head.hh"
+#include "duration.hh"
+#include "item.hh"
#include "output-def.hh"
-#include "dots.hh"
-#include "dot-column.hh"
+#include "pitch.hh"
+#include "rhythmic-head.hh"
#include "staff-symbol-referencer.hh"
-#include "item.hh"
+#include "stream-event.hh"
#include "warn.hh"
-#include "duration.hh"
+
+#include "translator.icc"
class Note_heads_engraver : public Engraver
{
- Link_array__Item_ notes_;
- Link_array__Item_ dots_;
- Link_array__Music_ note_evs_;
+ vector<Stream_event *> note_evs_;
public:
TRANSLATOR_DECLARATIONS (Note_heads_engraver);
protected:
- virtual bool try_music (Music *ev);
+ void listen_note (Stream_event *);
void process_music ();
void stop_translation_timestep ();
};
-Note_heads_engraver::Note_heads_engraver ()
+Note_heads_engraver::Note_heads_engraver (Context *c)
+ : Engraver (c)
{
}
-bool
-Note_heads_engraver::try_music (Music *m)
+void
+Note_heads_engraver::listen_note (Stream_event *ev)
{
- if (m->is_mus_type ("note-event"))
- {
- note_evs_.push_back (m);
- return true;
- }
- else if (m->is_mus_type ("busy-playing-event"))
- return note_evs_.size ();
-
- return false;
+ note_evs_.push_back (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++)
{
- Music *ev = note_evs_[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"));
+ Pitch *pit = unsmob<Pitch> (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 (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);
+ }
}
}
void
Note_heads_engraver::stop_translation_timestep ()
{
- notes_.clear ();
- dots_.clear ();
note_evs_.clear ();
}
-#include "translator.icc"
+void
+Note_heads_engraver::boot ()
+{
+ ADD_LISTENER (Note_heads_engraver, note);
+}
ADD_TRANSLATOR (Note_heads_engraver,
- /* doc */ "Generate noteheads.",
- /* create */ "NoteHead Dots",
- /* accept */ "note-event busy-playing-event",
- /* read */ "middleCPosition",
- /* write */ "");
+ /* doc */
+ "Generate note heads.",
+
+ /* create */
+ "NoteHead ",
+
+ /* read */
+ "middleCPosition "
+ "staffLineLayoutFunction ",
+
+ /* write */
+ ""
+ );
projects / lilypond.git / blobdiff