X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam-engraver.cc;h=bd12ffbc2580c17b7ddf133c081e02f4edcaa105;hb=be50e2580ab88b01ff5a903350c01ecba1b96d16;hp=42d0a8db418b3f0e0c548a0b628c0a668d03890b;hpb=95bae2d9c9ebf9fd1c1e408ec39d6f20d5d53308;p=lilypond.git diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc index 42d0a8db41..bd12ffbc25 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--2009 Han-Wen Nienhuys - (c) 1998--2006 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" @@ -27,6 +39,7 @@ class Beam_engraver : public Engraver public: DECLARE_ACKNOWLEDGER (stem); DECLARE_ACKNOWLEDGER (rest); + protected: Stream_event *start_ev_; @@ -34,7 +47,9 @@ protected: Spanner *beam_; Stream_event *prev_start_ev_; - Stream_event *now_stop_ev_; + Stream_event *stop_ev_; + + Direction forced_direction_; Beaming_pattern *beam_info_; Beaming_pattern *finished_beam_info_; @@ -45,9 +60,9 @@ 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); @@ -90,7 +105,8 @@ Beam_engraver::Beam_engraver () finished_beam_ = 0; finished_beam_info_ = 0; beam_info_ = 0; - now_stop_ev_ = 0; + forced_direction_ = CENTER; + stop_ev_ = 0; start_ev_ = 0; prev_start_ev_ = 0; } @@ -102,9 +118,15 @@ Beam_engraver::listen_beam (Stream_event *ev) Direction d = to_dir (ev->get_property ("span-direction")); if (d == START && valid_start_point ()) - 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 ()) - now_stop_ev_ = ev; + ASSIGN_EVENT_ONCE (stop_ev_, ev); } void @@ -118,9 +140,6 @@ Beam_engraver::set_melisma (bool ml) void Beam_engraver::process_music () { - if (beam_ && !to_boolean (get_property ("allowBeamBreak"))) - context ()->get_score_context ()->set_property ("forbidBreak", SCM_BOOL_T); - if (start_ev_) { if (beam_) @@ -132,14 +151,24 @@ Beam_engraver::process_music () 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 ()); + + } } void @@ -149,13 +178,20 @@ Beam_engraver::typeset_beam () { if (!finished_beam_->get_bound (RIGHT)) finished_beam_->set_bound (RIGHT, finished_beam_->get_bound (LEFT)); - - finished_beam_info_->beamify (context ()); + if (forced_direction_) + { + Grob *stem = finished_beam_->get_bound (RIGHT); + 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; + } } @@ -165,21 +201,19 @@ Beam_engraver::start_translation_timestep () start_ev_ = 0; if (beam_) - { - set_melisma (true); - } + set_melisma (true); } void Beam_engraver::stop_translation_timestep () { - typeset_beam (); - if (now_stop_ev_) + if (stop_ev_) { finished_beam_ = beam_; finished_beam_info_ = beam_info_; - - now_stop_ev_ = 0; + finished_beaming_options_ = beaming_options_; + + stop_ev_ = 0; beam_ = 0; beam_info_ = 0; typeset_beam (); @@ -206,15 +240,12 @@ Beam_engraver::finalize () void Beam_engraver::acknowledge_rest (Grob_info info) { - if (beam_) - { - chain_offset_callback (info.grob(), - Beam::rest_collision_callback_proc, Y_AXIS); - } + if (beam_ + && !scm_is_number (info.grob ()->get_property_data ("staff-position"))) + chain_offset_callback (info.grob (), + Beam::rest_collision_callback_proc, Y_AXIS); } - - void Beam_engraver::acknowledge_stem (Grob_info info) { @@ -228,8 +259,6 @@ Beam_engraver::acknowledge_stem (Grob_info info) 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")) @@ -242,7 +271,7 @@ Beam_engraver::acknowledge_stem (Grob_info info) int durlog = unsmob_duration (ev->get_property ("duration"))->duration_log (); if (durlog <= 2) { - ev->origin ()->warning (_ ("stem doesn't fit in beam")); + ev->origin ()->warning (_ ("stem does not fit in beam")); prev_start_ev_->origin ()->warning (_ ("beam was started here")); /* don't return, since @@ -251,11 +280,14 @@ Beam_engraver::acknowledge_stem (Grob_info info) */ } - 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)); Beam::add_stem (beam_, stem); } @@ -264,20 +296,20 @@ ADD_ACKNOWLEDGER (Beam_engraver, rest); ADD_TRANSLATOR (Beam_engraver, /* doc */ - - "Handles Beam events by engraving Beams. If omitted, then notes will be " - "printed with flags instead of beams.", + "Handle @code{Beam} events by engraving beams. If omitted," + " then notes are printed with flags instead of beams.", - /* create */ "Beam", - /* accept */ "beam-event", + /* create */ + "Beam ", /* read */ "beamMelismaBusy " "beatLength " - "subdivideBeams " - , + "subdivideBeams ", + /* write */ - "forbidBreak"); + "forbidBreak" + ); class Grace_beam_engraver : public Beam_engraver { @@ -321,7 +353,7 @@ Grace_beam_engraver::listen_beam (Stream_event *ev) if (d == START && valid_start_point ()) start_ev_ = ev; else if (d == STOP && valid_end_point ()) - now_stop_ev_ = ev; + stop_ev_ = ev; } @@ -329,20 +361,20 @@ 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. ", + "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", - /* accept */ "beam-event", + /* create */ + "Beam ", + /* read */ "beamMelismaBusy " "beatLength " - "allowBeamBreak " - "subdivideBeams " - , - /* write */ ""); + "subdivideBeams ", + + /* write */ + "" + );