X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest-engraver.cc;h=f8a541cf6f1c6e99698f2fa82fb06a6fa255499e;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=39f9e1e063ee0c4da7296d7fd364bbefc8ff16fe;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc index 39f9e1e063..f8a541cf6f 100644 --- a/lily/multi-measure-rest-engraver.cc +++ b/lily/multi-measure-rest-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1998--2010 Jan Nieuwenhuizen + Copyright (C) 1998--2015 Jan Nieuwenhuizen Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify @@ -47,7 +47,7 @@ protected: private: Stream_event *rest_ev_; - vector text_events_; + vector text_events_; int start_measure_; Rational last_main_moment_; Moment stop_moment_; @@ -57,8 +57,8 @@ private: Spanner *last_rest_; Spanner *mmrest_; - vector numbers_; - vector last_numbers_; + vector numbers_; + vector last_numbers_; }; Multi_measure_rest_engraver::Multi_measure_rest_engraver () @@ -105,53 +105,52 @@ Multi_measure_rest_engraver::process_music () mmrest_ = make_spanner ("MultiMeasureRest", rest_ev_->self_scm ()); Spanner *sp - = make_spanner ("MultiMeasureRestNumber", rest_ev_->self_scm ()); + = make_spanner ("MultiMeasureRestNumber", rest_ev_->self_scm ()); numbers_.push_back (sp); if (text_events_.size ()) - { - 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. - */ - Direction d = DOWN; - do - { - 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]; - } - } - } - while (flip (&d) != DOWN); - } + { + 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); - } + { + Side_position_interface::add_support (numbers_[i], mmrest_); + numbers_[i]->set_parent (mmrest_, Y_AXIS); + numbers_[i]->set_parent (mmrest_, X_AXIS); + } start_measure_ - = scm_to_int (get_property ("internalBarNumber")); + = scm_to_int (get_property ("internalBarNumber")); } bar_seen_ = bar_seen_ || scm_is_string (get_property ("whichBar")); @@ -167,7 +166,7 @@ Multi_measure_rest_engraver::stop_translation_timestep () -- jneem */ if (bar_seen_) { - Grob *cmc = unsmob_grob (get_property ("currentCommandColumn")); + Grob *cmc = Grob::unsmob (get_property ("currentCommandColumn")); /* Ugh, this is a kludge - need this for multi-measure-rest-grace.ly */ last_command_item_ = dynamic_cast (cmc); @@ -176,20 +175,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 (vsize 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 (vsize 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))); @@ -223,36 +222,31 @@ Multi_measure_rest_engraver::start_translation_timestep () 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_from_int (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); - 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_from_int (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_; @@ -264,26 +258,23 @@ Multi_measure_rest_engraver::finalize () } ADD_TRANSLATOR (Multi_measure_rest_engraver, - /* 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}. Reads @code{measureLength}" - " to determine whether it should use a whole rest or a breve" - " rest to represent one measure.", - - /* create */ - "MultiMeasureRest " - "MultiMeasureRestNumber " - "MultiMeasureRestText ", - - /* read */ - "internalBarNumber " - "restNumberThreshold " - "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 */ + "" + );