X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest-engraver.cc;h=9f460dd981871ea7ab640838d49b5dc71aaf1dd1;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=05ac7aed3254b9f3a6e617adf4dcabebe4301d27;hpb=f2c2c5c43858f323e4708f83fd97e0f38017c275;p=lilypond.git diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc index 05ac7aed32..9f460dd981 100644 --- a/lily/multi-measure-rest-engraver.cc +++ b/lily/multi-measure-rest-engraver.cc @@ -1,16 +1,33 @@ /* - multi_measure_rest-engraver.cc -- implement Multi_measure_rest_engraver + This file is part of LilyPond, the GNU music typesetter. - (c) 1998--2005 Jan Nieuwenhuizen - Han-Wen Nienhuys + Copyright (C) 1998--2014 Jan Nieuwenhuizen + 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 "multi-measure-rest.hh" #include "paper-column.hh" -#include "engraver-group-engraver.hh" +#include "engraver-group.hh" #include "side-position-interface.hh" #include "staff-symbol-referencer.hh" +#include "stream-event.hh" #include "moment.hh" +#include "spanner.hh" + +#include "translator.icc" /** The name says it all: make multi measure rests @@ -21,15 +38,16 @@ public: TRANSLATOR_DECLARATIONS (Multi_measure_rest_engraver); protected: - virtual bool try_music (Music *); - PRECOMPUTED_VIRTUAL void process_music (); - PRECOMPUTED_VIRTUAL void stop_translation_timestep (); - PRECOMPUTED_VIRTUAL void start_translation_timestep (); + void process_music (); + void stop_translation_timestep (); + void start_translation_timestep (); virtual void finalize (); + DECLARE_TRANSLATOR_LISTENER (multi_measure_rest); + DECLARE_TRANSLATOR_LISTENER (multi_measure_text); private: - Music *rest_ev_; - Link_array text_events_; + Stream_event *rest_ev_; + vector text_events_; int start_measure_; Rational last_main_moment_; Moment stop_moment_; @@ -39,8 +57,8 @@ private: Spanner *last_rest_; Spanner *mmrest_; - Link_array numbers_; - Link_array last_numbers_; + vector numbers_; + vector last_numbers_; }; Multi_measure_rest_engraver::Multi_measure_rest_engraver () @@ -49,7 +67,7 @@ Multi_measure_rest_engraver::Multi_measure_rest_engraver () /* For the start of a score. - */ + */ bar_seen_ = true; start_measure_ = 0; mmrest_ = 0; @@ -57,22 +75,25 @@ Multi_measure_rest_engraver::Multi_measure_rest_engraver () rest_ev_ = 0; } -bool -Multi_measure_rest_engraver::try_music (Music *event) +IMPLEMENT_TRANSLATOR_LISTENER (Multi_measure_rest_engraver, multi_measure_rest); +void +Multi_measure_rest_engraver::listen_multi_measure_rest (Stream_event *ev) { - if (event->is_mus_type ("multi-measure-rest-event")) - { - rest_ev_ = event; - stop_moment_ = now_mom () + rest_ev_->get_length (); + /* FIXME: Should use ASSIGN_EVENT_ONCE. Can't do that yet because of + the kill-mm-rests hack in part-combine-iterator. */ + rest_ev_ = ev; + stop_moment_ = now_mom () + get_event_length (rest_ev_, now_mom ()); + /* + if (ASSIGN_EVENT_ONCE (rest_ev_, ev)) + stop_moment_ = now_mom () + get_event_length (rest_ev_); + */ +} - return true; - } - else if (event->is_mus_type ("multi-measure-text-event")) - { - text_events_.push (event); - return true; - } - return false; +IMPLEMENT_TRANSLATOR_LISTENER (Multi_measure_rest_engraver, multi_measure_text); +void +Multi_measure_rest_engraver::listen_multi_measure_text (Stream_event *ev) +{ + text_events_.push_back (ev); } void @@ -84,54 +105,51 @@ Multi_measure_rest_engraver::process_music () mmrest_ = make_spanner ("MultiMeasureRest", rest_ev_->self_scm ()); Spanner *sp - = make_spanner ("MultiMeasureRestNumber", rest_ev_->self_scm ()); - numbers_.push (sp); + = make_spanner ("MultiMeasureRestNumber", rest_ev_->self_scm ()); + numbers_.push_back (sp); if (text_events_.size ()) - { - for (int i = 0; i < text_events_.size (); i++) - { - - Music *e = text_events_[i]; - Spanner *sp - = make_spanner ("MultiMeasureRestText", e->self_scm ()); - SCM t = e->get_property ("text"); - SCM dir = e->get_property ("direction"); - sp->set_property ("text", t); - if (is_direction (dir)) - sp->set_property ("direction", dir); - - numbers_.push (sp); - } - - /* - Stack different scripts. - */ - Direction d = DOWN; - do - { - Grob *last = 0; - for (int i = 0; i < numbers_.size (); i++) - { - if (scm_int2num (d) == numbers_[i]->get_property ("direction")) - { - if (last) - Side_position_interface::add_support (numbers_[i], last); - last = numbers_[i]; - } - } - } - while (flip (&d) != DOWN); - } - - for (int i = 0; i < numbers_.size (); i++) - { - Side_position_interface::add_support (numbers_[i], mmrest_); - numbers_[i]->set_parent (mmrest_, Y_AXIS); - } + { + for (vsize i = 0; i < text_events_.size (); i++) + { + Stream_event *e = text_events_[i]; + Spanner *sp + = make_spanner ("MultiMeasureRestText", e->self_scm ()); + SCM t = e->get_property ("text"); + SCM dir = e->get_property ("direction"); + sp->set_property ("text", t); + if (is_direction (dir)) + sp->set_property ("direction", dir); + + numbers_.push_back (sp); + } + + /* + Stack different scripts. + */ + for (DOWN_and_UP (d)) + { + Grob *last = 0; + for (vsize i = 0; i < numbers_.size (); i++) + { + if (scm_from_int (d) == numbers_[i]->get_property ("direction")) + { + if (last) + Side_position_interface::add_support (numbers_[i], last); + last = numbers_[i]; + } + } + } + } + + for (vsize i = 0; i < numbers_.size (); i++) + { + Side_position_interface::add_support (numbers_[i], mmrest_); + numbers_[i]->set_parent (mmrest_, Y_AXIS); + } start_measure_ - = scm_to_int (get_property ("currentBarNumber")); + = scm_to_int (get_property ("internalBarNumber")); } bar_seen_ = bar_seen_ || scm_is_string (get_property ("whichBar")); @@ -141,12 +159,13 @@ void Multi_measure_rest_engraver::stop_translation_timestep () { /* We cannot do this earlier, as breakableSeparationItem is not yet - there. */ + there. + + Actually, we no longer use breakableSeparationItem -- should this be moved? + -- jneem */ if (bar_seen_) { - Grob *cmc = unsmob_grob (get_property ("breakableSeparationItem")); - if (!cmc) - cmc = unsmob_grob (get_property ("currentCommandColumn")); + Grob *cmc = unsmob_grob (get_property ("currentCommandColumn")); /* Ugh, this is a kludge - need this for multi-measure-rest-grace.ly */ last_command_item_ = dynamic_cast (cmc); @@ -155,20 +174,20 @@ Multi_measure_rest_engraver::stop_translation_timestep () if (last_command_item_ && (mmrest_ || last_rest_)) { if (last_rest_) - { - add_bound_item (last_rest_, last_command_item_); - for (int i = 0; i < last_numbers_.size (); i++) - add_bound_item (last_numbers_[i], last_command_item_); - } + { + add_bound_item (last_rest_, last_command_item_); + for (vsize i = 0; i < last_numbers_.size (); i++) + add_bound_item (last_numbers_[i], last_command_item_); + } if (mmrest_) - { - add_bound_item (mmrest_, last_command_item_); - for (int i = 0; i < numbers_.size (); i++) - add_bound_item (numbers_[i], last_command_item_); + { + add_bound_item (mmrest_, last_command_item_); + for (vsize i = 0; i < numbers_.size (); i++) + add_bound_item (numbers_[i], last_command_item_); - last_command_item_ = 0; - } + last_command_item_ = 0; + } } Moment mp (robust_scm2moment (get_property ("measurePosition"), Moment (0))); @@ -186,9 +205,7 @@ void Multi_measure_rest_engraver::start_translation_timestep () { if (now_mom ().main_part_ >= stop_moment_.main_part_) - { - rest_ev_ = 0; - } + rest_ev_ = 0; Moment mp (robust_scm2moment (get_property ("measurePosition"), Moment (0))); @@ -200,42 +217,35 @@ Multi_measure_rest_engraver::start_translation_timestep () last_rest_ = mmrest_; last_numbers_ = numbers_; - int cur = scm_to_int (get_property ("currentBarNumber")); + int cur = scm_to_int (get_property ("internalBarNumber")); int num = cur - start_measure_; /* - We can't plug a markup directly into the grob, since the - measure-count determines the formatting of the mmrest. + We can't plug a markup directly into the grob, since the + measure-count determines the formatting of the mmrest. */ - last_rest_->set_property ("measure-count", scm_int2num (num)); - - SCM sml = get_property ("measureLength"); - Rational ml = (unsmob_moment (sml)) ? unsmob_moment (sml)->main_part_ : Rational (1); - if (ml >= Rational (2)) - { - last_rest_->set_property ("use-breve-rest", SCM_BOOL_T); - } + last_rest_->set_property ("measure-count", scm_from_int (num)); mmrest_ = 0; numbers_.clear (); Grob *last = last_numbers_.size () ? last_numbers_[0] : 0; if (last && last->get_property ("text") == SCM_EOL) - { - SCM thres = get_property ("restNumberThreshold"); - int t = 1; - if (scm_is_number (thres)) - t = scm_to_int (thres); - - if (num <= t) - last->suicide (); - else - { - SCM text - = scm_number_to_string (scm_int2num (num), scm_from_int (10)); - last->set_property ("text", text); - } - } + { + SCM thres = get_property ("restNumberThreshold"); + int t = 1; + if (scm_is_number (thres)) + t = scm_to_int (thres); + + if (num <= t) + last->suicide (); + else + { + SCM text + = scm_number_to_string (scm_from_int (num), scm_from_int (10)); + last->set_property ("text", text); + } + } } last_main_moment_ = now.main_part_; @@ -246,15 +256,24 @@ Multi_measure_rest_engraver::finalize () { } -#include "translator.icc" - ADD_TRANSLATOR (Multi_measure_rest_engraver, - /* descr */ - "Engraves multi-measure rests that are produced with @code{R}. Reads " - "measurePosition and currentBarNumber to determine what number to print " - "over the MultiMeasureRest. Reads measureLength to determine if it " - "should use a whole rest or a breve rest to represent 1 measure ", - /* creats*/ "MultiMeasureRest MultiMeasureRestNumber MultiMeasureRestText", - /* accepts */ "multi-measure-rest-event multi-measure-text-event", - /* reads */ "currentBarNumber restNumberThreshold breakableSeparationItem currentCommandColumn measurePosition measureLength", - /* write */ ""); + /* doc */ + "Engrave multi-measure rests that are produced with" + " @samp{R}. It reads @code{measurePosition} and" + " @code{internalBarNumber} to determine what number to print" + " over the @ref{MultiMeasureRest}.", + + /* create */ + "MultiMeasureRest " + "MultiMeasureRestNumber " + "MultiMeasureRestText ", + + /* read */ + "internalBarNumber " + "restNumberThreshold " + "currentCommandColumn " + "measurePosition ", + + /* write */ + "" + );