X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fauto-beam-engraver.cc;h=2c61f00959b3283568bf6550508949f688555f60;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=8d8a4b6c56674348d472b9e786788917e290ad40;hpb=4bb29573149a0ffa1f881c5e38a0fe68e9e76b67;p=lilypond.git diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index 8d8a4b6c56..2c61f00959 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1999--2011 Jan Nieuwenhuizen + Copyright (C) 1999--2015 Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,12 +17,13 @@ along with LilyPond. If not, see . */ -#include "bar-line.hh" #include "beaming-pattern.hh" #include "beam.hh" #include "context.hh" +#include "context-handle.hh" #include "duration.hh" #include "engraver.hh" +#include "grob-properties.hh" #include "item.hh" #include "rest.hh" #include "spanner.hh" @@ -38,28 +39,28 @@ class Auto_beam_engraver : public Engraver protected: void stop_translation_timestep (); - void process_music (); + void process_acknowledged (); + + virtual void process_music (); virtual void finalize (); virtual void derived_mark () const; - DECLARE_ACKNOWLEDGER (rest); - DECLARE_ACKNOWLEDGER (beam); - DECLARE_ACKNOWLEDGER (bar_line); - DECLARE_ACKNOWLEDGER (breathing_sign); - DECLARE_ACKNOWLEDGER (stem); - DECLARE_TRANSLATOR_LISTENER (beam_forbid); - - void process_acknowledged (); + void acknowledge_rest (Grob_info); + void acknowledge_beam (Grob_info); + void acknowledge_bar_line (Grob_info); + void acknowledge_breathing_sign (Grob_info); + void acknowledge_stem (Grob_info); + void listen_beam_forbid (Stream_event *); private: - bool test_moment (Direction, Moment, Moment); + virtual bool test_moment (Direction, Moment, Moment); void consider_begin (Moment, Moment); void consider_end (Moment, Moment); Spanner *create_beam (); void begin_beam (); void end_beam (); void junk_beam (); - bool is_same_grace_state (Grob *e); + virtual bool is_same_grace_state (Moment, Moment); void recheck_beam (); void typeset_beam (); vector *remove_end_stems (vsize); @@ -80,7 +81,10 @@ private: Moment extend_mom_; Moment beam_start_moment_; Moment beam_start_location_; - Context *beam_start_context_; + /* + Handle on the starting staff keeps it alive until beam is comlete + */ + Context_handle beam_start_context_; // We act as if beam were created, and start a grouping anyway. Beaming_pattern *grouping_; @@ -143,19 +147,20 @@ Auto_beam_engraver::process_music () } } -Auto_beam_engraver::Auto_beam_engraver () +Auto_beam_engraver::Auto_beam_engraver (Context *c) + : Engraver (c) { forbid_ = 0; process_acknowledged_count_ = 0; stems_ = 0; shortest_mom_ = Moment (Rational (1, 4)); + extend_mom_ = Moment (-1); finished_beam_ = 0; finished_grouping_ = 0; grouping_ = 0; beam_settings_ = SCM_EOL; } -IMPLEMENT_TRANSLATOR_LISTENER (Auto_beam_engraver, beam_forbid); void Auto_beam_engraver::listen_beam_forbid (Stream_event *ev) { @@ -165,12 +170,11 @@ Auto_beam_engraver::listen_beam_forbid (Stream_event *ev) bool Auto_beam_engraver::test_moment (Direction dir, Moment test_mom, Moment dur) { - return scm_call_4 (get_property ("autoBeamCheck"), - context ()->self_scm (), - scm_from_int (dir), - test_mom.smobbed_copy (), - dur.smobbed_copy ()) - != SCM_BOOL_F; + return scm_is_true (scm_call_4 (get_property ("autoBeamCheck"), + context ()->self_scm (), + scm_from_int (dir), + test_mom.smobbed_copy (), + dur.smobbed_copy ())); } void @@ -219,8 +223,7 @@ Auto_beam_engraver::create_beam () Beam::add_stem (beam, (*stems_)[i]); Grob_info i = make_grob_info (beam, (*stems_)[0]->self_scm ()); - i.rerouting_daddy_context_ = beam_start_context_; - announce_grob (i); + announce_grob (i, beam_start_context_.get_context ()); return beam; } @@ -237,9 +240,9 @@ Auto_beam_engraver::begin_beam () stems_ = new vector; grouping_ = new Beaming_pattern (); beaming_options_.from_context (context ()); - beam_settings_ = updated_grob_properties (context (), ly_symbol2scm ("Beam")); + beam_settings_ = Grob_property_info (context (), ly_symbol2scm ("Beam")).updated (); - beam_start_context_ = context ()->get_parent_context (); + beam_start_context_.set_context (context ()->get_parent_context ()); beam_start_moment_ = now_mom (); beam_start_location_ = robust_scm2moment (get_property ("measurePosition"), Moment (0)); @@ -260,6 +263,13 @@ Auto_beam_engraver::junk_beam () shortest_mom_ = Moment (Rational (1, 4)); } +bool +Auto_beam_engraver::is_same_grace_state (Moment start, Moment now) +{ + return bool (start.grace_part_) == bool (now.grace_part_); +} + + void Auto_beam_engraver::end_beam () { @@ -272,9 +282,8 @@ Auto_beam_engraver::end_beam () if (finished_beam_) { Grob_info i = make_grob_info (finished_beam_, SCM_EOL); - i.rerouting_daddy_context_ = beam_start_context_; - announce_end_grob (i); + announce_end_grob (i, beam_start_context_.get_context ()); finished_grouping_ = grouping_; finished_beaming_options_ = beaming_options_; } @@ -284,6 +293,7 @@ Auto_beam_engraver::end_beam () beam_settings_ = SCM_EOL; } + beam_start_context_.set_context (NULL); shortest_mom_ = Moment (Rational (1, 4)); } @@ -383,7 +393,7 @@ Auto_beam_engraver::acknowledge_stem (Grob_info info) return; } - int durlog = unsmob_duration (ev->get_property ("duration"))->duration_log (); + int durlog = unsmob (ev->get_property ("duration"))->duration_log (); if (durlog <= 2) { @@ -393,13 +403,16 @@ Auto_beam_engraver::acknowledge_stem (Grob_info info) } /* - ignore grace notes. + ignore interspersed grace notes. */ Moment now = now_mom (); - if (bool (beam_start_location_.grace_part_) != bool (now.grace_part_)) + if (!is_same_grace_state (beam_start_location_, now)) return; - Moment dur = unsmob_duration (ev->get_property ("duration"))->get_length (); + Duration *stem_duration = unsmob (ev->get_property ("duration")); + Moment dur = stem_duration->get_length (); + + //Moment dur = unsmob (ev->get_property ("duration"))->get_length (); Moment measure_now = measure_position (context ()); bool recheck_needed = false; @@ -420,7 +433,9 @@ Auto_beam_engraver::acknowledge_stem (Grob_info info) grouping_->add_stem (now - beam_start_moment_ + beam_start_location_, durlog - 2, - Stem::is_invisible (stem)); + Stem::is_invisible (stem), + stem_duration->factor (), + (to_boolean (stem->get_property ("tuplet-start")))); stems_->push_back (stem); last_add_mom_ = now; extend_mom_ = max (extend_mom_, now) + get_event_length (ev, now); @@ -526,11 +541,17 @@ Auto_beam_engraver::process_acknowledged () process_acknowledged_count_++; } -ADD_ACKNOWLEDGER (Auto_beam_engraver, stem); -ADD_ACKNOWLEDGER (Auto_beam_engraver, bar_line); -ADD_ACKNOWLEDGER (Auto_beam_engraver, beam); -ADD_ACKNOWLEDGER (Auto_beam_engraver, breathing_sign); -ADD_ACKNOWLEDGER (Auto_beam_engraver, rest); +void +Auto_beam_engraver::boot () +{ + ADD_LISTENER (Auto_beam_engraver, beam_forbid); + ADD_ACKNOWLEDGER (Auto_beam_engraver, stem); + ADD_ACKNOWLEDGER (Auto_beam_engraver, bar_line); + ADD_ACKNOWLEDGER (Auto_beam_engraver, beam); + ADD_ACKNOWLEDGER (Auto_beam_engraver, breathing_sign); + ADD_ACKNOWLEDGER (Auto_beam_engraver, rest); +} + ADD_TRANSLATOR (Auto_beam_engraver, /* doc */ "Generate beams based on measure characteristics and observed" @@ -548,9 +569,98 @@ ADD_TRANSLATOR (Auto_beam_engraver, "autoBeaming " "baseMoment " "beamExceptions " + "beamHalfMeasure " "beatStructure " "subdivideBeams ", /* write */ "" ); + +class Grace_auto_beam_engraver : public Auto_beam_engraver +{ + TRANSLATOR_DECLARATIONS (Grace_auto_beam_engraver); + TRANSLATOR_INHERIT (Auto_beam_engraver); + +private: + Moment last_grace_start_; // Full starting time of last grace group + Moment last_grace_position_; // Measure position of same + virtual void process_music (); + virtual bool is_same_grace_state (Moment, Moment); + virtual bool test_moment (Direction, Moment, Moment); +}; + +Grace_auto_beam_engraver::Grace_auto_beam_engraver (Context *c) + : Auto_beam_engraver (c) +{ + last_grace_start_.main_part_.set_infinite (-1); + // grace_part_ is zero -> test_moment is false, last_grace_position_ + // not considered. +} + +bool +Grace_auto_beam_engraver::is_same_grace_state (Moment, Moment) +{ + // This is for ignoring interspersed grace notes in main note + // beaming. We never want to ignore something inside of grace note + // beaming, so return true. + return true; +} + +void +Grace_auto_beam_engraver::process_music () +{ + Moment now = now_mom (); + // Update last_grace_start_ and last_grace_position_ only when the + // main time advances. + if (now.main_part_ > last_grace_start_.main_part_) + { + last_grace_start_ = now; + last_grace_position_ = measure_position (context ()); + } + + Auto_beam_engraver::process_music (); +} + +bool +Grace_auto_beam_engraver::test_moment (Direction dir, Moment test_mom, Moment) +{ + // If no grace group started this main moment, we have no business + // beaming. Same if we have left the original main time step. + if (!last_grace_start_.grace_part_ + || last_grace_position_.main_part_ != test_mom.main_part_) + return false; + // Autobeam start only when at the start of the grace group. + if (dir == START) + return last_grace_position_ == test_mom; + // Autobeam end only when the grace part is finished. + return !test_mom.grace_part_; +} + +void +Grace_auto_beam_engraver::boot () +{ + ADD_LISTENER (Grace_auto_beam_engraver, beam_forbid); + ADD_ACKNOWLEDGER (Grace_auto_beam_engraver, stem); + ADD_ACKNOWLEDGER (Grace_auto_beam_engraver, bar_line); + ADD_ACKNOWLEDGER (Grace_auto_beam_engraver, beam); + ADD_ACKNOWLEDGER (Grace_auto_beam_engraver, breathing_sign); + ADD_ACKNOWLEDGER (Grace_auto_beam_engraver, rest); +} + +ADD_TRANSLATOR (Grace_auto_beam_engraver, + /* doc */ + "Generates one autobeam group across an entire grace phrase. " + " As usual, any manual beaming or @code{\\noBeam} will block" + " autobeaming, just like setting the context property" + " @samp{autoBeaming} to @code{##f}.", + + /* create */ + "Beam ", + + /* read */ + "autoBeaming ", + + /* write */ + "" + );