From: Han-Wen Nienhuys Date: Sat, 9 Oct 2004 13:45:35 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: pre-paper-layout~3 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ed9862d117b627c0438d6c11d1bb3ef103abbc47;p=lilypond.git *** empty log message *** --- diff --git a/ChangeLog b/ChangeLog index ef01edc548..edede6c420 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,8 +2,6 @@ * lily/*.cc: use robust_scm2moment() where appropriate. - * lily/tuplet-engraver.cc (try_music): - * lily/moment.cc (robust_scm2moment): new function. * scm/titling.scm (default-score-title): remove caps for piece. diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index 0e8aa35979..186c923de4 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -188,7 +188,7 @@ Auto_beam_engraver::test_moment (Direction dir, Moment test_mom) /* end beam at end of beat */ if (dir == STOP) { - moment = robust_scm2moment (get_property ("beatLength"), moment) + moment = robust_scm2moment (get_property ("beatLength"), moment); } /* second guess: property generic time exception */ diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc index 96e4afb2e7..65e830441b 100644 --- a/lily/bar-number-engraver.cc +++ b/lily/bar-number-engraver.cc @@ -47,7 +47,7 @@ Bar_number_engraver::process_music () if (scm_is_string (wb)) { - Moment mp (robust_scm2moment (get_property ("measurePosition"),Moment (0)); + Moment mp (robust_scm2moment (get_property ("measurePosition"),Moment (0))); if (mp.main_part_ == Rational (0)) { SCM bn = get_property ("currentBarNumber"); diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc index 07c45a7813..727f329dd3 100644 --- a/lily/beam-engraver.cc +++ b/lily/beam-engraver.cc @@ -143,7 +143,7 @@ Beam_engraver::process_music () set_melisma (true); prev_start_ev_ = start_ev_; beam_ = make_spanner ("Beam", start_ev_->self_scm ()); - Moment mp (robust_scm2moment (get_property ("measurePosition"), Moment (0)); + Moment mp (robust_scm2moment (get_property ("measurePosition"), Moment (0))); beam_start_location_ = mp; beam_start_mom_ = now_mom (); diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index 41b5448fcd..7e38969eb0 100644 --- a/lily/chord-tremolo-engraver.cc +++ b/lily/chord-tremolo-engraver.cc @@ -124,7 +124,6 @@ Chord_tremolo_engraver::process_music () beam_ = make_spanner ("Beam", repeat_->self_scm ()); beam_->set_property ("chord-tremolo", SCM_BOOL_T); - SCM smp = beam_start_location_ = robust_scm2moment (get_property ("measurePosition"), Moment (0)); } } diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc index d752115505..08b4dda385 100644 --- a/lily/multi-measure-rest-engraver.cc +++ b/lily/multi-measure-rest-engraver.cc @@ -175,7 +175,7 @@ Multi_measure_rest_engraver::stop_translation_timestep () - Moment mp(robust_scm2moment (get_property ("measurePosition"), Moment (0)); + Moment mp(robust_scm2moment (get_property ("measurePosition"), Moment (0))); if (last_rest_) { @@ -196,9 +196,9 @@ Multi_measure_rest_engraver::start_translation_timestep () bar_seen_ = false; - Moment mp(robust_scm2moment (get_property ("measurePosition"), Moment (0)); + Moment mp (robust_scm2moment (get_property ("measurePosition"), Moment (0))); - Moment now =now_mom (); + Moment now = now_mom (); if (mmrest_ && now.main_part_ != last_main_moment_ && mp.main_part_ == Rational (0))