X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fquote-iterator.cc;h=885e1bd3b658ef593f0418a19b66449a881a0e77;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=f222e5a8e4cc47a12f95981700a19be4f30cf169;hpb=cb0b407e567feca71cbc5f9479a06b266c69a26c;p=lilypond.git diff --git a/lily/quote-iterator.cc b/lily/quote-iterator.cc index f222e5a8e4..885e1bd3b6 100644 --- a/lily/quote-iterator.cc +++ b/lily/quote-iterator.cc @@ -178,14 +178,14 @@ Quote_iterator::pending_moment () const Moment m (infty); if (Music_wrapper_iterator::ok ()) - m = std::min (m, Music_wrapper_iterator::pending_moment ()); + m = min (m, Music_wrapper_iterator::pending_moment ()); /* In case event_idx_ < 0, we're not initted yet, and the wrapped music expression determines the starting moment. */ if (quote_ok ()) - m = std::min (m, vector_moment (event_idx_) - start_moment_); + m = min (m, vector_moment (event_idx_) - start_moment_); return m; } @@ -277,8 +277,7 @@ Quote_iterator::process (Moment m) Pitch diff = pitch_interval (mp, qp); ev = ev->clone (); ev->make_transposable (); - - transpose_mutable (ev->get_property_alist (true), diff); + ev->transpose (diff); transposed_musics_ = scm_cons (ev->unprotect (), transposed_musics_); } quote_outlet_.get_context ()->event_source ()->broadcast (ev);