X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fmusic.cc;fp=lily%2Fmusic.cc;h=7a38d7af41d84851151b65e2c5bcbdaa4cc4e010;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=401e9efafb94fbd47677d0d871689c984632e4ff;hpb=f41973ff763d5972a85995b6d40c864281ec6714;p=lilypond.git diff --git a/lily/music.cc b/lily/music.cc index 401e9efafb..7a38d7af41 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2011 Han-Wen Nienhuys + Copyright (C) 1997--2012 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 @@ -83,7 +83,7 @@ Music::Music (Music const &m) length_callback_ = m.length_callback_; start_callback_ = m.start_callback_; - /// why? + /// why? set_spot (*m.origin ()); } @@ -130,7 +130,6 @@ print_alist (SCM a, SCM port) } } - Pitch Music::generic_to_relative_octave (Pitch last) { @@ -143,16 +142,16 @@ Music::generic_to_relative_octave (Pitch last) SCM check = get_property ("absolute-octave"); if (scm_is_number (check) - && new_pit.get_octave () != scm_to_int (check)) - { - Pitch expected_pit (scm_to_int (check), - new_pit.get_notename (), - new_pit.get_alteration ()); - origin ()->warning (_f ("octave check failed; expected \"%s\", found: \"%s\"", - expected_pit.to_string (), - new_pit.to_string ())); - new_pit = expected_pit; - } + && new_pit.get_octave () != scm_to_int (check)) + { + Pitch expected_pit (scm_to_int (check), + new_pit.get_notename (), + new_pit.get_alteration ()); + origin ()->warning (_f ("octave check failed; expected \"%s\", found: \"%s\"", + expected_pit.to_string (), + new_pit.to_string ())); + new_pit = expected_pit; + } set_property ("pitch", new_pit.smobbed_copy ()); @@ -162,6 +161,7 @@ Music::generic_to_relative_octave (Pitch last) if (Music *m = unsmob_music (elt)) last = m->to_relative_octave (last); + (void) music_list_to_relative (get_property ("articulations"), last, true); last = music_list_to_relative (get_property ("elements"), last, false); return last; } @@ -173,7 +173,7 @@ Music::to_relative_octave (Pitch last) if (ly_is_procedure (callback)) { Pitch *p = unsmob_pitch (scm_call_2 (callback, self_scm (), - last.smobbed_copy ())); + last.smobbed_copy ())); return *p; } @@ -192,11 +192,11 @@ Music::compress (Moment factor) Duration *d = unsmob_duration (get_property ("duration")); if (d) set_property ("duration", - d->compressed (factor.main_part_).smobbed_copy ()); + d->compressed (factor.main_part_).smobbed_copy ()); } /* - This mutates alist. Hence, make sure that it is not shared + This mutates alist. Hence, make sure that it is not shared */ void transpose_mutable (SCM alist, Pitch delta) @@ -209,38 +209,39 @@ transpose_mutable (SCM alist, Pitch delta) SCM new_val = val; if (Pitch *p = unsmob_pitch (val)) - { - Pitch transposed = p->transposed (delta); - if (transposed.get_alteration ().abs () > Rational (1,1)) - { - string delta_str; - if (delta.get_alteration ().abs () > Rational (1, 1)) - delta_str = (delta.normalized ().to_string () - + " " + _ ("(normalized pitch)")); - else - delta_str = delta.to_string (); - - warning (_f ("Transposing %s by %s makes alteration larger than double", - p->to_string (), - delta_str)); - transposed = transposed.normalized (); - } - - new_val = transposed.smobbed_copy (); - } + { + Pitch transposed = p->transposed (delta); + if (transposed.get_alteration ().abs () > Rational (1, 1)) + { + string delta_str; + if (delta.get_alteration ().abs () > Rational (1, 1)) + delta_str = (delta.normalized ().to_string () + + " " + _ ("(normalized pitch)")); + else + delta_str = delta.to_string (); + + warning (_f ("Transposing %s by %s makes alteration larger than double", + p->to_string (), + delta_str)); + transposed = transposed.normalized (); + } + + new_val = transposed.smobbed_copy (); + } else if (prop == ly_symbol2scm ("element")) - { - if (Music *m = unsmob_music (val)) - m->transpose (delta); - } - else if (prop == ly_symbol2scm ("elements")) - transpose_music_list (val, delta); - else if (prop == ly_symbol2scm ("pitch-alist") && - scm_is_pair (val)) - new_val = ly_transpose_key_alist (val, delta.smobbed_copy ()); + { + if (Music *m = unsmob_music (val)) + m->transpose (delta); + } + else if (prop == ly_symbol2scm ("elements") + || prop == ly_symbol2scm ("articulations")) + transpose_music_list (val, delta); + else if (prop == ly_symbol2scm ("pitch-alist") + && scm_is_pair (val)) + new_val = ly_transpose_key_alist (val, delta.smobbed_copy ()); if (val != new_val) - scm_set_cdr_x (entry , new_val); + scm_set_cdr_x (entry, new_val); } } @@ -270,7 +271,7 @@ Music::origin () const ES TODO: This method should probably be reworked or junked. */ Stream_event * -Music::to_event () const +Music::to_event (Context *c) const { SCM class_name = ly_camel_case_2_lisp_identifier (get_property ("name")); @@ -278,7 +279,8 @@ Music::to_event () const if (!internal_is_music_type (class_name)) programming_error ("Not a music type"); - Stream_event *e = new Stream_event (class_name, mutable_property_alist_); + Stream_event *e = new Stream_event (c->make_event_class (class_name), + mutable_property_alist_); Moment length = get_length (); if (length.to_bool ()) e->set_property ("length", length.smobbed_copy ()); @@ -289,11 +291,10 @@ Music::to_event () const { SCM art_ev = SCM_EOL; for (; scm_is_pair (art_mus); art_mus = scm_cdr (art_mus)) - { - Music *m = unsmob_music (scm_car (art_mus)); - SCM ev = m ? m->to_event ()->unprotect () : scm_car (art_mus); - art_ev = scm_cons (ev, art_ev); - } + { + Music *m = unsmob_music (scm_car (art_mus)); + art_ev = scm_cons (m->to_event (c)->unprotect (), art_ev); + } e->set_property ("articulations", scm_reverse_x (art_ev, SCM_EOL)); } @@ -309,7 +310,7 @@ Music::to_event () const void Music::send_to_context (Context *c) { - Stream_event *ev = to_event (); + Stream_event *ev = to_event (c); c->event_source ()->broadcast (ev); ev->unprotect (); }