X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-engraver.cc;h=04184a90203891e73fd53086ce50c34b8938b981;hb=9446d6a4f83a94754f584d2d973195fd800d1af6;hp=d09e3b95b8bb637de93018f12ab9f5f51eade291;hpb=a82dc4a0cca57f285e818f6c227c8428a3c02a71;p=lilypond.git diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc index d09e3b95b8..04184a9020 100644 --- a/lily/stem-engraver.cc +++ b/lily/stem-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2010 Han-Wen Nienhuys + Copyright (C) 1997--2011 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 @@ -38,6 +38,7 @@ class Stem_engraver : public Engraver { Grob *stem_; Grob *tremolo_; + vector maybe_flags_; Stream_event *rhythmic_ev_; Stream_event *tremolo_ev_; @@ -49,6 +50,8 @@ protected: DECLARE_TRANSLATOR_LISTENER (tremolo); DECLARE_ACKNOWLEDGER (rhythmic_head); void stop_translation_timestep (); + void finalize (); + void kill_unused_flags (); }; Stem_engraver::Stem_engraver () @@ -65,56 +68,54 @@ 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.grob ()->self_scm ()); - if (tremolo_ev_) { /* Stem tremolo is never applied to a note by default, - it must be 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 both get one tremolo flag. */ + the first and last (quarter) note both get one tremolo flag. */ int requested_type - = robust_scm2int (tremolo_ev_->get_property ("tremolo-type"), 0); + = robust_scm2int (tremolo_ev_->get_property ("tremolo-type"), 0); SCM f = get_property ("tremoloFlags"); if (!requested_type) - { - if (scm_is_number (f)) - requested_type = scm_to_int (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_from_int (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. + 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 - - (dur->duration_log () > 2 ? dur->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_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 ()); - } + { + 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 ()); + } } } @@ -134,36 +135,78 @@ Stem_engraver::acknowledge_rhythmic_head (Grob_info gi) if (!stem_) make_stem (gi); - if (Stem::duration_log (stem_) != d->duration_log ()) + 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) { - // FIXME: - gi.event_cause ()->origin ()->warning (_f ("adding note head to incompatible stem (type = %d)", - 1 << Stem::duration_log (stem_))); + 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 ()); + + if (Stem::is_normal_stem (stem_) + && Stem::duration_log (stem_) > 2) + { + Item *flag = make_item ("Flag", stem_->self_scm ()); + flag->set_parent (stem_, X_AXIS); + stem_->set_object ("flag", flag->self_scm ()); + maybe_flags_.push_back (flag); + } +} + +void +Stem_engraver::kill_unused_flags () +{ + for (vsize i = 0; i < maybe_flags_.size (); i++) + if (unsmob_grob (maybe_flags_[i]->get_parent (X_AXIS)->get_object ("beam"))) + maybe_flags_[i]->suicide (); +} + +void +Stem_engraver::finalize () +{ + kill_unused_flags (); } void Stem_engraver::stop_translation_timestep () { + if (scm_is_string (get_property ("whichBar"))) + kill_unused_flags (); + tremolo_ = 0; if (stem_) { /* FIXME: junk these properties. */ SCM prop = get_property ("stemLeftBeamCount"); if (scm_is_number (prop)) - { - Stem::set_beaming (stem_, scm_to_int (prop), LEFT); - context ()->unset_property (ly_symbol2scm ("stemLeftBeamCount")); - } + { + Stem::set_beaming (stem_, scm_to_int (prop), LEFT); + context ()->unset_property (ly_symbol2scm ("stemLeftBeamCount")); + } prop = get_property ("stemRightBeamCount"); if (scm_is_number (prop)) - { - Stem::set_beaming (stem_, scm_to_int (prop), RIGHT); - context ()->unset_property (ly_symbol2scm ("stemRightBeamCount")); - } + { + Stem::set_beaming (stem_, scm_to_int (prop), RIGHT); + context ()->unset_property (ly_symbol2scm ("stemRightBeamCount")); + } stem_ = 0; } tremolo_ev_ = 0; @@ -179,19 +222,20 @@ Stem_engraver::listen_tremolo (Stream_event *ev) 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 */ - "" - ); + /* 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 " + "whichBar ", + + /* write */ + "" + );