X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-engraver.cc;h=6890b5b041c410f56186d1c8733eb4613e313179;hb=4a401ca1c60f428daa242dbdd102fdb3f327ebfb;hp=3483bab450b3bacfbeb3c6e02f6e313b0149c4f3;hpb=b8a07e5e54ebac3f08cee75683ed2cc6d1db3d64;p=lilypond.git diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc index 3483bab450..6890b5b041 100644 --- a/lily/stem-engraver.cc +++ b/lily/stem-engraver.cc @@ -1,15 +1,28 @@ /* - stem-grav.cc -- implement Stem_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2011 Han-Wen Nienhuys - (c) 1997--2004 Han-Wen Nienhuys + 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 . */ +#include "engraver.hh" + #include "context.hh" #include "directional-element-interface.hh" -#include "engraver.hh" -#include "event.hh" +#include "duration.hh" +#include "international.hh" #include "item.hh" #include "misc.hh" #include "rhythmic-head.hh" @@ -17,24 +30,25 @@ #include "staff-symbol-referencer.hh" #include "stem-tremolo.hh" #include "stem.hh" +#include "stream-event.hh" +#include "translator.icc" -/** - Make stems upon receiving noteheads. - */ class Stem_engraver : public Engraver { - Grob *stem_; + Grob *stem_; Grob *tremolo_; - Music *rhythmic_ev_; - Music* tremolo_ev_; + Stream_event *rhythmic_ev_; + Stream_event *tremolo_ev_; + TRANSLATOR_DECLARATIONS (Stem_engraver); protected: void make_stem (Grob_info); - virtual void acknowledge_grob (Grob_info); - virtual void stop_translation_timestep (); - virtual bool try_music (Music *); + + DECLARE_TRANSLATOR_LISTENER (tremolo); + DECLARE_ACKNOWLEDGER (rhythmic_head); + void stop_translation_timestep (); }; Stem_engraver::Stem_engraver () @@ -42,7 +56,7 @@ Stem_engraver::Stem_engraver () tremolo_ev_ = 0; stem_ = 0; tremolo_ = 0; - rhythmic_ev_ =0; + rhythmic_ev_ = 0; } void @@ -50,77 +64,100 @@ Stem_engraver::make_stem (Grob_info gi) { /* Announce the cause of the head as cause of the stem. The stem needs a rhythmic structure to fit it into a beam. */ - stem_ = make_item ("Stem", gi.music_cause ()->self_scm ()); - - int duration_log = gi.music_cause ()->duration_log (); - stem_->set_property ("duration-log", scm_int2num (duration_log)); + stem_ = make_item ("Stem", gi.grob ()->self_scm ()); if (tremolo_ev_) { /* Stem tremolo is never applied to a note by default, - is must me requested. But there is a default for the - tremolo value: + it must be requested. But there is a default for the + tremolo value: - c4:8 c c: + c4:8 c c: - the first and last (quarter) note bothe get one tremolo flag. */ + the first and last (quarter) note both get one tremolo flag. */ int requested_type - = ly_scm2int (tremolo_ev_->get_property ("tremolo-type")); + = robust_scm2int (tremolo_ev_->get_property ("tremolo-type"), 0); SCM f = get_property ("tremoloFlags"); if (!requested_type) - { - if (ly_c_number_p (f)) - requested_type = ly_scm2int (f); - else - requested_type = 8; - } + { + if (scm_is_number (f)) + requested_type = scm_to_int (f); + else + requested_type = 8; + } else - context ()->set_property ("tremoloFlags", scm_int2num (requested_type)); + context ()->set_property ("tremoloFlags", scm_from_int (requested_type)); + + /* + we take the duration log from the Event, since the duration-log + for a note head is always <= 2. + */ + Stream_event *ev = gi.event_cause (); + Duration *dur = unsmob_duration (ev->get_property ("duration")); int tremolo_flags = intlog2 (requested_type) - 2 - - (duration_log > 2 ? duration_log - 2 : 0); + - (dur->duration_log () > 2 ? dur->duration_log () - 2 : 0); if (tremolo_flags <= 0) - { - tremolo_ev_->origin ()->warning (_("tremolo duration is too long")); - tremolo_flags = 0; - } + { + tremolo_ev_->origin ()->warning (_ ("tremolo duration is too long")); + tremolo_flags = 0; + } if (tremolo_flags) - { - tremolo_ = make_item ("StemTremolo", tremolo_ev_->self_scm ()); - - /* The number of tremolo flags is the number of flags of the - tremolo-type minus the number of flags of the note itself. */ - tremolo_->set_property ("flag-count", scm_int2num (tremolo_flags)); - tremolo_->set_parent (stem_, X_AXIS); - stem_->set_property ("tremolo-flag", tremolo_->self_scm ()); - tremolo_->set_property ("stem", stem_->self_scm ()); - } + { + tremolo_ = make_item ("StemTremolo", tremolo_ev_->self_scm ()); + + /* The number of tremolo flags is the number of flags of the + tremolo-type minus the number of flags of the note itself. */ + tremolo_->set_property ("flag-count", scm_from_int (tremolo_flags)); + tremolo_->set_parent (stem_, X_AXIS); + stem_->set_object ("tremolo-flag", tremolo_->self_scm ()); + tremolo_->set_object ("stem", stem_->self_scm ()); + } } } void -Stem_engraver::acknowledge_grob (Grob_info gi) +Stem_engraver::acknowledge_rhythmic_head (Grob_info gi) { - if (Rhythmic_head::has_interface (gi.grob_)) + if (Rhythmic_head::get_stem (gi.grob ())) + return; + + Stream_event *cause = gi.event_cause (); + if (!cause) + return; + Duration *d = unsmob_duration (cause->get_property ("duration")); + if (!d) + return; + + if (!stem_) + make_stem (gi); + + int ds = Stem::duration_log (stem_); + int dc = d->duration_log (); + + // half notes and quarter notes all have compatible stems. + // Longas are done differently (oops?), so we can't unify + // them with the other stemmed notes. + if (ds == 1) + ds = 2; + if (dc == 1) + dc = 2; + // whole notes and brevis both have no stems + if (ds == -1) + ds = 0; + if (dc == -1) + dc = 0; + + if (ds != dc) { - if (Rhythmic_head::get_stem (gi.grob_)) - return; - - if (!stem_) - make_stem (gi); - - int duration_log = gi.music_cause ()->duration_log (); - if (Stem::duration_log (stem_) != duration_log) - { - // FIXME: - gi.music_cause ()->origin ()->warning (_f ("Adding note head to incompatible stem (type = %d)", 1 << Stem::duration_log (stem_))); - - gi.music_cause ()->origin ()->warning (_f ("Don't you want polyphonic voices instead?")); - } - - Stem::add_head (stem_, gi.grob_); + gi.event_cause ()->origin ()->warning (_f ("adding note head to incompatible stem (type = %d/%d)", + ds < 0 ? 1 << -ds : 1, + ds > 0 ? 1 << ds : 1)); + gi.event_cause ()->origin ()->warning (_ ("maybe input should specify polyphonic voices")); } + + Stem::add_head (stem_, gi.grob ()); } void @@ -131,38 +168,45 @@ Stem_engraver::stop_translation_timestep () { /* FIXME: junk these properties. */ SCM prop = get_property ("stemLeftBeamCount"); - if (ly_c_number_p (prop)) - { - Stem::set_beaming (stem_,ly_scm2int (prop),LEFT); - context ()->unset_property (ly_symbol2scm ("stemLeftBeamCount")); - } + if (scm_is_number (prop)) + { + Stem::set_beaming (stem_, scm_to_int (prop), LEFT); + context ()->unset_property (ly_symbol2scm ("stemLeftBeamCount")); + } prop = get_property ("stemRightBeamCount"); - if (ly_c_number_p (prop)) - { - Stem::set_beaming (stem_,ly_scm2int (prop), RIGHT); - context ()->unset_property (ly_symbol2scm ("stemRightBeamCount")); - } + if (scm_is_number (prop)) + { + Stem::set_beaming (stem_, scm_to_int (prop), RIGHT); + context ()->unset_property (ly_symbol2scm ("stemRightBeamCount")); + } stem_ = 0; } tremolo_ev_ = 0; } -bool -Stem_engraver::try_music (Music *m) +IMPLEMENT_TRANSLATOR_LISTENER (Stem_engraver, tremolo); +void +Stem_engraver::listen_tremolo (Stream_event *ev) { - if (m->is_mus_type ("tremolo-event")) - { - tremolo_ev_ = m; - return true; - } - return false; + ASSIGN_EVENT_ONCE (tremolo_ev_, ev); } -ENTER_DESCRIPTION (Stem_engraver, -/* descr */ "Create stems and single-stem tremolos. It also works together with " -"the beam engraver for overriding beaming.", -/* creats*/ "Stem StemTremolo", -/* accepts */ "tremolo-event", -/* acks */ "rhythmic-head-interface", -/* reads */ "tremoloFlags stemLeftBeamCount stemRightBeamCount", -/* write */ ""); +ADD_ACKNOWLEDGER (Stem_engraver, rhythmic_head); + +ADD_TRANSLATOR (Stem_engraver, + /* doc */ + "Create stems and single-stem tremolos. It also works" + " together with the beam engraver for overriding beaming.", + + /* create */ + "Stem " + "StemTremolo ", + + /* read */ + "tremoloFlags " + "stemLeftBeamCount " + "stemRightBeamCount ", + + /* write */ + "" + );