X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fdynamic-align-engraver.cc;h=37f93cd5c4dce99bae0716661f99beee03440d9c;hb=85d4958c021936c64b6ef9d514a6a2b0d269cc58;hp=766b63ed545591bd1087295aa7044ff9d58ea147;hpb=d959f8d548dc073c162c4599cfef2a596f9b66db;p=lilypond.git diff --git a/lily/dynamic-align-engraver.cc b/lily/dynamic-align-engraver.cc index 766b63ed54..37f93cd5c4 100644 --- a/lily/dynamic-align-engraver.cc +++ b/lily/dynamic-align-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2008--2011 Han-Wen Nienhuys + Copyright (C) 2008--2012 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify @@ -34,7 +34,8 @@ class Dynamic_align_engraver : public Engraver { TRANSLATOR_DECLARATIONS (Dynamic_align_engraver); - DECLARE_ACKNOWLEDGER (note_column); + DECLARE_ACKNOWLEDGER (rhythmic_head); + DECLARE_ACKNOWLEDGER (stem); DECLARE_ACKNOWLEDGER (dynamic); DECLARE_ACKNOWLEDGER (footnote_spanner); DECLARE_END_ACKNOWLEDGER (dynamic); @@ -64,7 +65,8 @@ Dynamic_align_engraver::Dynamic_align_engraver () } ADD_ACKNOWLEDGER (Dynamic_align_engraver, dynamic); -ADD_ACKNOWLEDGER (Dynamic_align_engraver, note_column); +ADD_ACKNOWLEDGER (Dynamic_align_engraver, rhythmic_head); +ADD_ACKNOWLEDGER (Dynamic_align_engraver, stem); ADD_ACKNOWLEDGER (Dynamic_align_engraver, footnote_spanner); ADD_END_ACKNOWLEDGER (Dynamic_align_engraver, dynamic); @@ -73,7 +75,7 @@ Dynamic_align_engraver::create_line_spanner (Stream_event *event) { if (!line_) line_ = make_spanner ("DynamicLineSpanner", - event ? event->self_scm () : SCM_EOL); + event ? event->self_scm () : SCM_EOL); } void @@ -83,10 +85,10 @@ Dynamic_align_engraver::acknowledge_end_dynamic (Grob_info info) ended_.push_back (info.spanner ()); /* If the break flag is set, store the current spanner and let new dynamics - * create a new spanner + * create a new spanner */ - bool spanner_broken = current_dynamic_spanner_ == info.spanner () && - to_boolean (current_dynamic_spanner_->get_property ("spanner-broken")); + bool spanner_broken = current_dynamic_spanner_ == info.spanner () + && to_boolean (current_dynamic_spanner_->get_property ("spanner-broken")); if (spanner_broken && line_) { if (ended_line_) @@ -107,7 +109,13 @@ Dynamic_align_engraver::acknowledge_footnote_spanner (Grob_info info) } void -Dynamic_align_engraver::acknowledge_note_column (Grob_info info) +Dynamic_align_engraver::acknowledge_rhythmic_head (Grob_info info) +{ + support_.push_back (info.grob ()); +} + +void +Dynamic_align_engraver::acknowledge_stem (Grob_info info) { support_.push_back (info.grob ()); } @@ -149,7 +157,7 @@ Dynamic_align_engraver::acknowledge_dynamic (Grob_info info) if (cause) { if (Direction d = to_dir (cause->get_property ("direction"))) - set_grob_direction (line_, d); + set_grob_direction (line_, d); } } @@ -158,30 +166,29 @@ Dynamic_align_engraver::set_spanner_bounds (Spanner *line, bool end) { if (!line) return; - Direction d = LEFT; - do + + for (LEFT_and_RIGHT (d)) { - if ((d == LEFT && !line->get_bound (LEFT)) || - (end && d == RIGHT && !line->get_bound (RIGHT))) - { - vector const &spanners - = (d == LEFT) ? started_ : ended_; - - Grob *bound = 0; - if (scripts_.size ()) - bound = scripts_[0]; - else if (spanners.size ()) - bound = spanners[0]->get_bound (d); - else - { - bound = unsmob_grob (get_property ("currentMusicalColumn")); - programming_error ("started DynamicLineSpanner but have no left bound"); - } - - line->set_bound (d, bound); - } + if ((d == LEFT && !line->get_bound (LEFT)) + || (end && d == RIGHT && !line->get_bound (RIGHT))) + { + vector const &spanners + = (d == LEFT) ? started_ : ended_; + + Grob *bound = 0; + if (scripts_.size ()) + bound = scripts_[0]; + else if (spanners.size ()) + bound = spanners[0]->get_bound (d); + else + { + bound = unsmob_grob (get_property ("currentMusicalColumn")); + programming_error ("started DynamicLineSpanner but have no left bound"); + } + + line->set_bound (d, bound); + } } - while (flip (&d) != LEFT); } void @@ -195,9 +202,9 @@ Dynamic_align_engraver::stop_translation_timestep () set::iterator it = running_.find (sp); if (it != running_.end ()) - running_.erase (it); + running_.erase (it); else - started_[i]->programming_error ("lost track of this dynamic spanner"); + started_[i]->programming_error ("lost track of this dynamic spanner"); } bool end = line_ && running_.empty (); @@ -206,11 +213,11 @@ Dynamic_align_engraver::stop_translation_timestep () // is ended now set_spanner_bounds (ended_line_, true); set_spanner_bounds (line_, end); - // If the flag is set to break the spanner after the current child, don't + // If the flag is set to break the spanner after the current child, don't // add any more support points (needed e.g. for style=none, where the // invisible spanner should NOT be shifted since we don't have a line). - bool spanner_broken = current_dynamic_spanner_ && - to_boolean (current_dynamic_spanner_->get_property ("spanner-broken")); + bool spanner_broken = current_dynamic_spanner_ + && to_boolean (current_dynamic_spanner_->get_property ("spanner-broken")); for (vsize i = 0; line_ && !spanner_broken && i < support_.size (); i++) Side_position_interface::add_support (line_, support_[i]); @@ -227,15 +234,15 @@ Dynamic_align_engraver::stop_translation_timestep () } ADD_TRANSLATOR (Dynamic_align_engraver, - /* doc */ - "Align hairpins and dynamic texts on a horizontal line.", + /* doc */ + "Align hairpins and dynamic texts on a horizontal line.", - /* create */ - "DynamicLineSpanner ", + /* create */ + "DynamicLineSpanner ", - /* read */ - "currentMusicalColumn ", + /* read */ + "currentMusicalColumn ", - /* write */ - "" - ); + /* write */ + "" + );