X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpercent-repeat-engraver.cc;h=008081f138f4ee897e2814cf062d04d9292801ac;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=dab7129e5ef4deb957434a14f8462097e50a7aa8;hpb=d929a664c85112ffecaa16c5e114d6f75cf002e2;p=lilypond.git diff --git a/lily/percent-repeat-engraver.cc b/lily/percent-repeat-engraver.cc index dab7129e5e..008081f138 100644 --- a/lily/percent-repeat-engraver.cc +++ b/lily/percent-repeat-engraver.cc @@ -1,24 +1,29 @@ /* - new-chord-tremolo-engraver.cc -- implement Chord_tremolo_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2000--2014 Han-Wen Nienhuys , Erik Sandberg - (c) 2000--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. -#include "score-engraver.hh" + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ -#include "bar-line.hh" +#include "engraver.hh" #include "global-context.hh" #include "international.hh" #include "item.hh" -#include "misc.hh" -#include "percent-repeat-iterator.hh" -#include "repeated-music.hh" -#include "score-context.hh" #include "side-position-interface.hh" #include "spanner.hh" +#include "stream-event.hh" #include "warn.hh" #include "translator.icc" @@ -26,45 +31,29 @@ class Percent_repeat_engraver : public Engraver { void typeset_perc (); + public: TRANSLATOR_DECLARATIONS (Percent_repeat_engraver); - + protected: - Music *repeat_; + Stream_event *percent_event_; - /// moment (global time) where beam started. + // moment (global time) where percent started Moment start_mom_; + // moment (global time) where percent should end Moment stop_mom_; - /// location within measure where beam started. - Moment beam_start_location_; - Moment next_moment_; - Moment body_length_; - - enum Repeat_sign_type - { - UNKNOWN, - MEASURE, - DOUBLE_MEASURE, - }; - Repeat_sign_type repeat_sign_type_; - - Item *double_percent_; - Item *double_percent_counter_; - Spanner *percent_; Spanner *percent_counter_; - Spanner *finished_percent_; - Spanner *finished_percent_counter_; - int count_; - int total_count_; -protected: + Grob *first_command_column_; + Moment command_moment_; + virtual void finalize (); - virtual bool try_music (Music *); + DECLARE_TRANSLATOR_LISTENER (percent); - void stop_translation_timestep (); void start_translation_timestep (); + void stop_translation_timestep (); void process_music (); }; @@ -72,206 +61,126 @@ Percent_repeat_engraver::Percent_repeat_engraver () { percent_ = 0; percent_counter_ = 0; + percent_event_ = 0; - finished_percent_ = 0; - finished_percent_counter_ = 0; - - double_percent_ = 0; - double_percent_counter_ = 0; - - repeat_ = 0; - count_ = 0; - total_count_ = 0; + first_command_column_ = 0; + command_moment_ = Moment (-1); } -bool -Percent_repeat_engraver::try_music (Music *m) +void +Percent_repeat_engraver::start_translation_timestep () { - if (m->is_mus_type ("repeated-music") - && m->get_property ("iterator-ctor") - == Percent_repeat_iterator::constructor_proc - && !repeat_) + if (now_mom ().main_part_ != command_moment_.main_part_) { - body_length_ = Repeated_music::body_get_length (m); - total_count_ = Repeated_music::repeat_count (m); - - Moment now = now_mom (); - start_mom_ = now; - stop_mom_ = start_mom_ + Moment (total_count_) * body_length_; - next_moment_ = start_mom_; - next_moment_ += body_length_; - - Moment meas_len (robust_scm2moment (get_property ("measureLength"), - Moment (1))); - - if (meas_len == body_length_) - repeat_sign_type_ = MEASURE; - else if (Moment (2) * meas_len == body_length_) - repeat_sign_type_ = DOUBLE_MEASURE; - else - return false; - - - repeat_ = m; - - Global_context *global = get_global_context (); - for (int i = 1; i < total_count_; i++) - { - Moment m = next_moment_ + Moment (i) * body_length_; - global->add_moment_to_process (m); - - /* bars between % too. */ - if (repeat_sign_type_ == DOUBLE_MEASURE) - global->add_moment_to_process (m - meas_len); - } - - if (repeat_sign_type_ == DOUBLE_MEASURE) - next_moment_ += meas_len; + first_command_column_ + = unsmob_grob (get_property ("currentCommandColumn")); + command_moment_ = now_mom (); + } - count_ = 1; - return true; + if (stop_mom_.main_part_ == now_mom ().main_part_) + { + if (percent_) + typeset_perc (); + percent_event_ = 0; } +} - return false; +IMPLEMENT_TRANSLATOR_LISTENER (Percent_repeat_engraver, percent); +void +Percent_repeat_engraver::listen_percent (Stream_event *ev) +{ + if (!percent_event_) + { + Moment body_length = get_event_length (ev); + start_mom_ = now_mom (); + stop_mom_ = now_mom () + body_length; + get_global_context ()->add_moment_to_process (stop_mom_); + percent_event_ = ev; + } + else + { + /* + print a warning: no assignment happens because + percent_event_ != 0 + */ + ASSIGN_EVENT_ONCE (percent_event_, ev); + } } void Percent_repeat_engraver::process_music () { - if (repeat_ && now_mom ().main_part_ == next_moment_.main_part_) + if (percent_event_ + && now_mom ().main_part_ == start_mom_.main_part_) { - count_ ++; - if (repeat_sign_type_ == MEASURE) - { - finished_percent_ = percent_; - finished_percent_counter_ = percent_counter_; - - typeset_perc (); - percent_ = make_spanner ("PercentRepeat", repeat_->self_scm ()); - - Grob *col = unsmob_grob (get_property ("currentCommandColumn")); - percent_->set_bound (LEFT, col); - - if (total_count_ > 2 - && to_boolean (get_property ("countPercentRepeats"))) - { - percent_counter_ - = make_spanner ("PercentRepeatCounter", repeat_->self_scm ()); - - SCM text = scm_number_to_string (scm_from_int (count_), - scm_from_int (10)); - percent_counter_->set_property ("text", text); - percent_counter_->set_bound (LEFT, col); - Side_position_interface::add_support (percent_counter_, - percent_); - percent_counter_->set_parent (percent_, Y_AXIS); - } - } - else if (repeat_sign_type_ == DOUBLE_MEASURE) - { - double_percent_ = make_item ("DoublePercentRepeat", repeat_->self_scm ()); - - if (total_count_ > 2 - && to_boolean (get_property ("countPercentRepeats"))) - { - double_percent_counter_ - = make_item ("DoublePercentRepeatCounter", - repeat_->self_scm()); - - SCM text = scm_number_to_string (scm_from_int (count_), - scm_from_int (10)); - double_percent_counter_->set_property ("text", text); - - Side_position_interface::add_support (double_percent_counter_, - double_percent_); - double_percent_counter_->set_parent (double_percent_, Y_AXIS); - double_percent_counter_->set_parent (double_percent_, X_AXIS); - } - - /* forbid breaks on a % line. Should forbid all breaks, really. */ - context ()->get_score_context ()->set_property ("forbidBreak", SCM_BOOL_T); - } - next_moment_ = next_moment_ + body_length_; - next_moment_.grace_part_ = Rational (0); + if (percent_) + typeset_perc (); + + percent_ = make_spanner ("PercentRepeat", percent_event_->self_scm ()); + + Grob *col = first_command_column_; + percent_->set_bound (LEFT, col); + + SCM count = percent_event_->get_property ("repeat-count"); + if (count != SCM_EOL && to_boolean (get_property ("countPercentRepeats")) + && check_repeat_count_visibility (context (), count)) + { + percent_counter_ = make_spanner ("PercentRepeatCounter", + percent_event_->self_scm ()); + + SCM text = scm_number_to_string (count, scm_from_int (10)); + percent_counter_->set_property ("text", text); + percent_counter_->set_bound (LEFT, col); + Side_position_interface::add_support (percent_counter_, percent_); + percent_counter_->set_parent (percent_, Y_AXIS); + } + else + percent_counter_ = 0; } } void Percent_repeat_engraver::finalize () { - typeset_perc (); if (percent_) { - repeat_->origin ()->warning (_ ("unterminated percent repeat")); + percent_event_->origin ()->warning (_ ("unterminated percent repeat")); percent_->suicide (); - percent_counter_->suicide(); + percent_counter_->suicide (); } } void Percent_repeat_engraver::typeset_perc () { - if (finished_percent_) - { - Grob *col = unsmob_grob (get_property ("currentCommandColumn")); - - finished_percent_->set_bound (RIGHT, col); - finished_percent_ = 0; + Grob *col = first_command_column_; - if (finished_percent_counter_) - finished_percent_counter_->set_bound (RIGHT, col); - - finished_percent_counter_ = 0; - } - - double_percent_ = 0; - double_percent_counter_ = 0; -} + percent_->set_bound (RIGHT, col); + percent_ = 0; -void -Percent_repeat_engraver::start_translation_timestep () -{ - if (stop_mom_.main_part_ == now_mom ().main_part_) - { - if (percent_) - { - finished_percent_ = percent_; - finished_percent_counter_ = percent_counter_; - - typeset_perc (); - } - repeat_ = 0; - percent_ = 0; - - percent_counter_ = 0; - repeat_sign_type_ = UNKNOWN; - } + if (percent_counter_) + percent_counter_->set_bound (RIGHT, col); + percent_counter_ = 0; } void Percent_repeat_engraver::stop_translation_timestep () { - typeset_perc (); } ADD_TRANSLATOR (Percent_repeat_engraver, - /* doc */ - "Make whole bar and double bar repeats.", - - /* create */ - "PercentRepeat " - "DoublePercentRepeat " - "PercentRepeatCounter " - "DoublePercentRepeatCounter", - - /* accept */ - "repeated-music", - - /* read */ - "measureLength " - "currentCommandColumn " - "countPercentRepeats", - - /* write */ - "forbidBreak " - ); + /* doc */ + "Make whole measure repeats.", + + /* create */ + "PercentRepeat " + "PercentRepeatCounter ", + + /* read */ + "countPercentRepeats " + "currentCommandColumn " + "repeatCountVisibility ", + + /* write */ + "" + );