X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic.cc;h=351051e6a624c13684030eafe17ce824976d88e1;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=1253e728603178c3d308e170597458adb87c2968;hpb=3465d3e1c1d2b87f7a1adc5c7c1dfe868c754e57;p=lilypond.git diff --git a/lily/music.cc b/lily/music.cc index 1253e72860..351051e6a6 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -1,9 +1,20 @@ /* - music.cc -- implement Music + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2014 Han-Wen Nienhuys - (c) 1997--2006 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 "music.hh" @@ -16,7 +27,6 @@ #include "ly-smobs.icc" #include "main.hh" #include "music-sequence.hh" -#include "pitch.hh" #include "score.hh" #include "warn.hh" @@ -40,7 +50,7 @@ Music::Music (SCM init) { length_callback_ = SCM_EOL; start_callback_ = SCM_EOL; - + length_callback_ = get_property ("length-callback"); if (!ly_is_procedure (length_callback_)) length_callback_ = duration_length_callback_proc; @@ -64,8 +74,7 @@ Music::copy_mutable_properties () const void Music::type_check_assignment (SCM s, SCM v) const { - if (!::type_check_assignment (s, v, ly_symbol2scm ("music-type?"))) - abort (); + ::type_check_assignment (s, v, ly_symbol2scm ("music-type?")); } Music::Music (Music const &m) @@ -74,7 +83,7 @@ Music::Music (Music const &m) length_callback_ = m.length_callback_; start_callback_ = m.start_callback_; - /// why? + /// why? set_spot (*m.origin ()); } @@ -121,7 +130,6 @@ print_alist (SCM a, SCM port) } } - Pitch Music::generic_to_relative_octave (Pitch last) { @@ -134,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 ()); @@ -153,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; } @@ -163,7 +172,8 @@ Music::to_relative_octave (Pitch last) SCM callback = get_property ("to-relative-callback"); if (ly_is_procedure (callback)) { - Pitch *p = unsmob_pitch (scm_call_2 (callback, self_scm (), last.smobbed_copy ())); + Pitch *p = unsmob_pitch (scm_call_2 (callback, self_scm (), + last.smobbed_copy ())); return *p; } @@ -181,48 +191,48 @@ Music::compress (Moment factor) compress_music_list (get_property ("elements"), factor); Duration *d = unsmob_duration (get_property ("duration")); if (d) - set_property ("duration", d->compressed (factor.main_part_).smobbed_copy ()); + set_property ("duration", + d->compressed (factor.main_part_).smobbed_copy ()); } /* -TODO: make transposition non-destructive + This mutates alist. Hence, make sure that it is not shared */ -SCM +void transpose_mutable (SCM alist, Pitch delta) { - SCM retval = SCM_EOL; - for (SCM s = alist; scm_is_pair (s); s = scm_cdr (s)) { SCM entry = scm_car (s); SCM prop = scm_car (entry); SCM val = scm_cdr (entry); + SCM new_val = val; if (Pitch *p = unsmob_pitch (val)) - { - Pitch transposed = p->transposed (delta); - scm_set_cdr_x (entry, transposed.smobbed_copy ()); - - if (abs (transposed.get_alteration ()) > DOUBLE_SHARP) - { - warning (_f ("transposition by %s makes alteration larger than double", - delta.to_string ())); - } - } + { + Pitch transposed = p->transposed (delta); + + if (prop == ly_symbol2scm ("tonic")) + transposed = Pitch (-1, transposed.get_notename (), + transposed.get_alteration ()); + + 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)) - entry = scm_cons (prop, ly_transpose_key_alist (val, delta.smobbed_copy ())); - retval = scm_cons (entry, retval); + { + 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); } - - return scm_reverse_x (retval, SCM_EOL); } void @@ -231,7 +241,7 @@ Music::transpose (Pitch delta) if (to_boolean (get_property ("untransposable"))) return; - mutable_property_alist_ = transpose_mutable (mutable_property_alist_, delta); + transpose_mutable (mutable_property_alist_, delta); } void @@ -253,15 +263,15 @@ Music::origin () const Stream_event * Music::to_event () const { - SCM class_name = ly_camel_case_to_lisp_identifier (get_property ("name")); + SCM class_name = ly_camel_case_2_lisp_identifier (get_property ("name")); // catch programming mistakes. if (!internal_is_music_type (class_name)) - { - programming_error ("Not a music type"); - } + programming_error ("Not a music type"); - Stream_event *e = new Stream_event (class_name, mutable_property_alist_); + Stream_event *e = new Stream_event + (scm_call_1 (ly_lily_module_constant ("ly:make-event-class"), class_name), + mutable_property_alist_); Moment length = get_length (); if (length.to_bool ()) e->set_property ("length", length.smobbed_copy ()); @@ -272,11 +282,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 ()->unprotect (), art_ev); + } e->set_property ("articulations", scm_reverse_x (art_ev, SCM_EOL)); } @@ -325,6 +334,5 @@ Music::duration_length_callback (SCM m) Music * unsmob_music (SCM m) { - return dynamic_cast (unsmob_prob (m)); + return dynamic_cast (unsmob_prob (m)); } -