X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam-engraver.cc;h=2672a3aff4d091be5af7061073a8b51393eccf76;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=bd12ffbc2580c17b7ddf133c081e02f4edcaa105;hpb=b7a0cffbf9d1069860368f289a5b50e9d1d90ba8;p=lilypond.git diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc index bd12ffbc25..2672a3aff4 100644 --- a/lily/beam-engraver.cc +++ b/lily/beam-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1998--2009 Han-Wen Nienhuys + Copyright (C) 1998--2014 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 @@ -30,6 +30,7 @@ #include "spanner.hh" #include "stream-event.hh" #include "stem.hh" +#include "unpure-pure-container.hh" #include "warn.hh" #include "translator.icc" @@ -62,7 +63,7 @@ protected: Beaming_options beaming_options_; Beaming_options finished_beaming_options_; - + void typeset_beam (); void set_melisma (bool); @@ -123,7 +124,7 @@ Beam_engraver::listen_beam (Stream_event *ev) Direction updown = to_dir (ev->get_property ("direction")); if (updown) - forced_direction_ = updown; + forced_direction_ = updown; } else if (d == STOP && valid_end_point ()) ASSIGN_EVENT_ONCE (stop_ev_, ev); @@ -143,17 +144,17 @@ Beam_engraver::process_music () if (start_ev_) { if (beam_) - { - start_ev_->origin ()->warning (_ ("already have a beam")); - return; - } + { + start_ev_->origin ()->warning (_ ("already have a beam")); + return; + } set_melisma (true); prev_start_ev_ = start_ev_; beam_ = make_spanner ("Beam", start_ev_->self_scm ()); Moment mp (robust_scm2moment (get_property ("measurePosition"), - Moment (0))); + Moment (0))); beam_start_location_ = mp; beam_start_mom_ = now_mom (); @@ -167,7 +168,7 @@ Beam_engraver::process_music () if (stop_ev_ && beam_) { announce_end_grob (beam_, stop_ev_->self_scm ()); - + } } @@ -176,14 +177,18 @@ Beam_engraver::typeset_beam () { if (finished_beam_) { - if (!finished_beam_->get_bound (RIGHT)) - finished_beam_->set_bound (RIGHT, finished_beam_->get_bound (LEFT)); - if (forced_direction_) - { - Grob *stem = finished_beam_->get_bound (RIGHT); - set_grob_direction (stem, forced_direction_); - forced_direction_ = CENTER; - } + Grob *stem = finished_beam_->get_bound (RIGHT); + if (!stem) + { + stem = finished_beam_->get_bound (LEFT); + if (stem) + finished_beam_->set_bound (RIGHT, stem); + } + + if (stem && forced_direction_) + set_grob_direction (stem, forced_direction_); + + forced_direction_ = CENTER; finished_beam_info_->beamify (finished_beaming_options_); Beam::set_beaming (finished_beam_, finished_beam_info_); @@ -212,7 +217,7 @@ Beam_engraver::stop_translation_timestep () finished_beam_ = beam_; finished_beam_info_ = beam_info_; finished_beaming_options_ = beaming_options_; - + stop_ev_ = 0; beam_ = 0; beam_info_ = 0; @@ -230,8 +235,8 @@ Beam_engraver::finalize () prev_start_ev_->origin ()->warning (_ ("unterminated beam")); /* - we don't typeset it, (we used to, but it was commented - out. Reason unknown) */ + we don't typeset it, (we used to, but it was commented + out. Reason unknown) */ beam_->suicide (); delete beam_info_; } @@ -243,7 +248,10 @@ Beam_engraver::acknowledge_rest (Grob_info info) if (beam_ && !scm_is_number (info.grob ()->get_property_data ("staff-position"))) chain_offset_callback (info.grob (), - Beam::rest_collision_callback_proc, Y_AXIS); + ly_make_unpure_pure_container + (Beam::rest_collision_callback_proc, + Beam::pure_rest_collision_callback_proc), + Y_AXIS); } void @@ -251,15 +259,23 @@ Beam_engraver::acknowledge_stem (Grob_info info) { if (!beam_) return; - + Moment now = now_mom (); if (!valid_start_point ()) return; + // It's suboptimal that we don't support callbacks returning ##f, + // but this makes beams have no effect on "stems" reliably in + // TabStaff when \tabFullNotation is switched off: the real stencil + // callback for beams is called quite late in the process, and we + // don't want to trigger it early. + if (scm_is_false (beam_->get_property_data ("stencil"))) + return; + Item *stem = dynamic_cast (info.grob ()); if (Stem::get_beam (stem)) return; - + Stream_event *ev = info.ultimate_event_cause (); if (!ev->in_event_class ("rhythmic-event")) { @@ -268,15 +284,18 @@ Beam_engraver::acknowledge_stem (Grob_info info) } last_stem_added_at_ = now; - int durlog = unsmob_duration (ev->get_property ("duration"))->duration_log (); + + Duration *stem_duration = unsmob_duration (ev->get_property ("duration")); + int durlog = stem_duration->duration_log (); + //int durlog = unsmob_duration (ev->get_property ("duration"))->duration_log (); if (durlog <= 2) { ev->origin ()->warning (_ ("stem does not fit in beam")); prev_start_ev_->origin ()->warning (_ ("beam was started here")); /* - don't return, since + don't return, since - [r4 c8] can just as well be modern notation. + [r4 c8] can just as well be modern notation. */ } @@ -286,8 +305,10 @@ Beam_engraver::acknowledge_stem (Grob_info info) stem->set_property ("duration-log", scm_from_int (durlog)); Moment stem_location = now - beam_start_mom_ + beam_start_location_; beam_info_->add_stem (stem_location, - max (durlog- 2, 0), - Stem::is_invisible (stem)); + max (durlog - 2, 0), + Stem::is_invisible (stem), + stem_duration->factor (), + (stem->get_property ("tuplet-start") == SCM_BOOL_T)); Beam::add_stem (beam_, stem); } @@ -295,21 +316,22 @@ ADD_ACKNOWLEDGER (Beam_engraver, stem); ADD_ACKNOWLEDGER (Beam_engraver, rest); ADD_TRANSLATOR (Beam_engraver, - /* doc */ - "Handle @code{Beam} events by engraving beams. If omitted," - " then notes are printed with flags instead of beams.", - - /* create */ - "Beam ", - - /* read */ - "beamMelismaBusy " - "beatLength " - "subdivideBeams ", - - /* write */ - "forbidBreak" - ); + /* doc */ + "Handle @code{Beam} events by engraving beams. If omitted," + " then notes are printed with flags instead of beams.", + + /* create */ + "Beam ", + + /* read */ + "baseMoment " + "beamMelismaBusy " + "beatStructure " + "subdivideBeams ", + + /* write */ + "forbidBreak" + ); class Grace_beam_engraver : public Beam_engraver { @@ -317,7 +339,7 @@ public: TRANSLATOR_DECLARATIONS (Grace_beam_engraver); DECLARE_TRANSLATOR_LISTENER (beam); - + protected: virtual bool valid_start_point (); virtual bool valid_end_point (); @@ -356,25 +378,25 @@ Grace_beam_engraver::listen_beam (Stream_event *ev) stop_ev_ = ev; } - ADD_ACKNOWLEDGER (Grace_beam_engraver, stem); ADD_ACKNOWLEDGER (Grace_beam_engraver, rest); ADD_TRANSLATOR (Grace_beam_engraver, - /* doc */ - "Handle @code{Beam} events by engraving beams. If omitted," - " then notes are printed with flags instead of beams. Only" - " engraves beams when we are at grace points in time.", - - /* create */ - "Beam ", - - /* read */ - "beamMelismaBusy " - "beatLength " - "subdivideBeams ", - - /* write */ - "" - ); + /* doc */ + "Handle @code{Beam} events by engraving beams. If omitted," + " then notes are printed with flags instead of beams. Only" + " engraves beams when we are at grace points in time.", + + /* create */ + "Beam ", + + /* read */ + "baseMoment " + "beamMelismaBusy " + "beatStructure " + "subdivideBeams ", + + /* write */ + "" + );