X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-engraver.cc;h=62c0974f9f3a04627b807c70f0d76581fadcfb14;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=05470724151221d42ff6c3b07fef627843ee4e44;hpb=bc95f4434f760d41191341ab4508b2064eb19025;p=lilypond.git diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc index 0547072415..62c0974f9f 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--2015 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,17 +38,22 @@ class Stem_engraver : public Engraver { Grob *stem_; Grob *tremolo_; + vector maybe_flags_; Stream_event *rhythmic_ev_; Stream_event *tremolo_ev_; + bool tuplet_start_; TRANSLATOR_DECLARATIONS (Stem_engraver); protected: - void make_stem (Grob_info); + void make_stem (Grob_info, bool); DECLARE_TRANSLATOR_LISTENER (tremolo); + DECLARE_TRANSLATOR_LISTENER (tuplet_span); DECLARE_ACKNOWLEDGER (rhythmic_head); void stop_translation_timestep (); + void finalize (); + void kill_unused_flags (); }; Stem_engraver::Stem_engraver () @@ -57,64 +62,56 @@ Stem_engraver::Stem_engraver () stem_ = 0; tremolo_ = 0; rhythmic_ev_ = 0; + tuplet_start_ = false; } void -Stem_engraver::make_stem (Grob_info gi) +Stem_engraver::make_stem (Grob_info gi, bool tuplet_start) { /* 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 (tuplet_start) + stem_->set_property ("tuplet-start", SCM_BOOL_T); + (void) make_item ("StemStub", 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 - = scm_to_int (tremolo_ev_->get_property ("tremolo-type")); - SCM f = get_property ("tremoloFlags"); - if (!requested_type) - { - 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)); - + = robust_scm2int (tremolo_ev_->get_property ("tremolo-type"), 8); /* - 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")); - + Duration *dur = Duration::unsmob (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 ()); + } } } @@ -127,48 +124,107 @@ Stem_engraver::acknowledge_rhythmic_head (Grob_info gi) Stream_event *cause = gi.event_cause (); if (!cause) return; - Duration *d = unsmob_duration (cause->get_property ("duration")); + Duration *d = Duration::unsmob (cause->get_property ("duration")); if (!d) return; if (!stem_) - make_stem (gi); - - if (Stem::duration_log (stem_) != d->duration_log ()) + make_stem (gi, tuplet_start_); + + 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); + } + if (tuplet_start_) + stem_->set_property ("tuplet-start", SCM_BOOL_T); +} + +void +Stem_engraver::kill_unused_flags () +{ + for (vsize i = 0; i < maybe_flags_.size (); i++) + if (Grob::is_smob (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; } + tuplet_start_ = false; tremolo_ev_ = 0; } +IMPLEMENT_TRANSLATOR_LISTENER (Stem_engraver, tuplet_span); +void +Stem_engraver::listen_tuplet_span (Stream_event *ev) +{ + Direction dir = to_dir (ev->get_property ("span-direction")); + if (dir == START) + { + // set stem property if stem already exists + if (stem_) + stem_->set_property ("tuplet-start", SCM_BOOL_T); + tuplet_start_ = true; // stash the value for use in later creation + } +} + IMPLEMENT_TRANSLATOR_LISTENER (Stem_engraver, tremolo); void Stem_engraver::listen_tremolo (Stream_event *ev) @@ -179,19 +235,19 @@ 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 */ + "stemLeftBeamCount " + "stemRightBeamCount " + "whichBar ", + + /* write */ + "" + );