X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam-engraver.cc;h=e6ca4caf16d58586556a288fb7c915bb8e06659c;hb=2280391948b1e5879606cc8494f1fc1787386c8c;hp=288a47494149b9077187d17902b224a791905be3;hpb=a276a19dc6bd57832db3107f2f2cbb04cb4677b6;p=lilypond.git diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc index 288a474941..e6ca4caf16 100644 --- a/lily/beam-engraver.cc +++ b/lily/beam-engraver.cc @@ -1,14 +1,26 @@ /* - beam-engraver.cc -- implement Beam_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1998--2015 Han-Wen Nienhuys - (c) 1998--2007 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 "beam.hh" #include "beaming-pattern.hh" #include "context.hh" +#include "directional-element-interface.hh" #include "drul-array.hh" #include "duration.hh" #include "engraver.hh" @@ -18,6 +30,7 @@ #include "spanner.hh" #include "stream-event.hh" #include "stem.hh" +#include "unpure-pure-container.hh" #include "warn.hh" #include "translator.icc" @@ -37,6 +50,8 @@ protected: Stream_event *stop_ev_; + Direction forced_direction_; + Beaming_pattern *beam_info_; Beaming_pattern *finished_beam_info_; @@ -46,8 +61,8 @@ protected: /// moment (global time) where beam started. Moment beam_start_mom_; - bool subdivide_beams_; - Moment beat_length_; + Beaming_options beaming_options_; + Beaming_options finished_beaming_options_; void typeset_beam (); void set_melisma (bool); @@ -91,6 +106,7 @@ Beam_engraver::Beam_engraver () finished_beam_ = 0; finished_beam_info_ = 0; beam_info_ = 0; + forced_direction_ = CENTER; stop_ev_ = 0; start_ev_ = 0; prev_start_ev_ = 0; @@ -103,7 +119,13 @@ Beam_engraver::listen_beam (Stream_event *ev) Direction d = to_dir (ev->get_property ("span-direction")); if (d == START && valid_start_point ()) - ASSIGN_EVENT_ONCE (start_ev_, ev); + { + ASSIGN_EVENT_ONCE (start_ev_, ev); + + Direction updown = to_dir (ev->get_property ("direction")); + if (updown) + forced_direction_ = updown; + } else if (d == STOP && valid_end_point ()) ASSIGN_EVENT_ONCE (stop_ev_, ev); } @@ -122,26 +144,32 @@ 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 mp (robust_scm2moment (get_property ("measurePosition"), + Moment (0))); beam_start_location_ = mp; beam_start_mom_ = now_mom (); + beaming_options_.from_context (context ()); beam_info_ = new Beaming_pattern; /* urg, must copy to Auto_beam_engraver too */ } typeset_beam (); if (stop_ev_ && beam_) - announce_end_grob (beam_, stop_ev_->self_scm ()); + { + announce_end_grob (beam_, stop_ev_->self_scm ()); + + } } void @@ -149,15 +177,26 @@ Beam_engraver::typeset_beam () { if (finished_beam_) { - if (!finished_beam_->get_bound (RIGHT)) - finished_beam_->set_bound (RIGHT, finished_beam_->get_bound (LEFT)); - - finished_beam_info_->beamify (context ()); + 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_); delete finished_beam_info_; finished_beam_info_ = 0; finished_beam_ = 0; + } } @@ -167,9 +206,7 @@ Beam_engraver::start_translation_timestep () start_ev_ = 0; if (beam_) - { - set_melisma (true); - } + set_melisma (true); } void @@ -179,6 +216,7 @@ Beam_engraver::stop_translation_timestep () { finished_beam_ = beam_; finished_beam_info_ = beam_info_; + finished_beaming_options_ = beaming_options_; stop_ev_ = 0; beam_ = 0; @@ -197,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_; } @@ -209,30 +247,35 @@ 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); - } + chain_offset_callback (info.grob (), + Unpure_pure_container::make_smob + (Beam::rest_collision_callback_proc, + Beam::pure_rest_collision_callback_proc), + Y_AXIS); } - - void 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")) { @@ -241,23 +284,31 @@ 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 (ev->get_property ("duration")); + int durlog = stem_duration->duration_log (); + //int durlog = unsmob (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. */ } - stem->set_property ("duration-log", - scm_from_int (durlog)); + if (forced_direction_) + set_grob_direction (stem, forced_direction_); + + 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)); + max (durlog - 2, 0), + Stem::is_invisible (stem), + stem_duration->factor (), + (to_boolean (stem->get_property ("tuplet-start")))); Beam::add_stem (beam_, stem); } @@ -265,20 +316,22 @@ ADD_ACKNOWLEDGER (Beam_engraver, stem); ADD_ACKNOWLEDGER (Beam_engraver, rest); ADD_TRANSLATOR (Beam_engraver, - /* doc */ + /* doc */ + "Handle @code{Beam} events by engraving beams. If omitted," + " then notes are printed with flags instead of beams.", + + /* create */ + "Beam ", - "Handles Beam events by engraving Beams. If omitted, then notes will be " - "printed with flags instead of beams.", - - /* create */ "Beam", + /* read */ + "baseMoment " + "beamMelismaBusy " + "beatStructure " + "subdivideBeams ", - /* read */ - "beamMelismaBusy " - "beatLength " - "subdivideBeams " - , - /* write */ - "forbidBreak"); + /* write */ + "forbidBreak" + ); class Grace_beam_engraver : public Beam_engraver { @@ -286,7 +339,7 @@ public: TRANSLATOR_DECLARATIONS (Grace_beam_engraver); DECLARE_TRANSLATOR_LISTENER (beam); - + protected: virtual bool valid_start_point (); virtual bool valid_end_point (); @@ -325,23 +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 */ - - "Handles Beam events by engraving Beams. If omitted, then notes will " - "be 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 */ + "" + );