X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic.cc;h=ae75ff795273da024d404a76d144f10da52613bd;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=3dbbe123e522067d8aee92a31c0b872fffdcb84e;hpb=e42585017a01fd02f6353b994cf0c87b03a7bb2e;p=lilypond.git diff --git a/lily/music.cc b/lily/music.cc index 3dbbe123e5..ae75ff7952 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--2015 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" @@ -13,11 +24,11 @@ #include "duration.hh" #include "input.hh" #include "international.hh" -#include "ly-smobs.icc" #include "main.hh" #include "music-sequence.hh" #include "score.hh" #include "warn.hh" +#include "lily-imports.hh" /* Music is anything that has (possibly zero) duration and supports @@ -31,15 +42,18 @@ Music::internal_is_music_type (SCM k) const { SCM ifs = get_property ("types"); - return scm_c_memq (k, ifs) != SCM_BOOL_F; + return scm_is_true (scm_c_memq (k, ifs)); } -Music::Music (SCM init) - : Prob (ly_symbol2scm ("Music"), init) +Preinit_Music::Preinit_Music () { length_callback_ = SCM_EOL; start_callback_ = SCM_EOL; - +} + +Music::Music (SCM init) + : Prob (ly_symbol2scm ("Music"), init) +{ length_callback_ = get_property ("length-callback"); if (!ly_is_procedure (length_callback_)) length_callback_ = duration_length_callback_proc; @@ -57,14 +71,13 @@ Music::derived_mark () const SCM Music::copy_mutable_properties () const { - return ly_music_deep_copy (mutable_property_alist_); + return music_deep_copy (mutable_property_alist_); } 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) @@ -73,7 +86,7 @@ Music::Music (Music const &m) length_callback_ = m.length_callback_; start_callback_ = m.start_callback_; - /// why? + /// why? set_spot (*m.origin ()); } @@ -81,13 +94,13 @@ Moment Music::get_length () const { SCM lst = get_property ("length"); - if (unsmob_moment (lst)) - return *unsmob_moment (lst); + if (unsmob (lst)) + return *unsmob (lst); if (ly_is_procedure (length_callback_)) { SCM res = scm_call_1 (length_callback_, self_scm ()); - return *unsmob_moment (res); + return *unsmob (res); } return Moment (0); @@ -100,7 +113,7 @@ Music::start_mom () const if (ly_is_procedure (lst)) { SCM res = scm_call_1 (lst, self_scm ()); - return *unsmob_moment (res); + return *unsmob (res); } Moment m; @@ -120,12 +133,11 @@ print_alist (SCM a, SCM port) } } - Pitch Music::generic_to_relative_octave (Pitch last) { SCM elt = get_property ("element"); - Pitch *old_pit = unsmob_pitch (get_property ("pitch")); + Pitch *old_pit = unsmob (get_property ("pitch")); if (old_pit) { Pitch new_pit = *old_pit; @@ -133,25 +145,26 @@ 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 ()); last = new_pit; } - if (Music *m = unsmob_music (elt)) + if (Music *m = unsmob (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; } @@ -162,7 +175,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 (scm_call_2 (callback, self_scm (), + last.smobbed_copy ())); return *p; } @@ -174,74 +188,70 @@ Music::compress (Moment factor) { SCM elt = get_property ("element"); - if (Music *m = unsmob_music (elt)) + if (Music *m = unsmob (elt)) m->compress (factor); compress_music_list (get_property ("elements"), factor); - Duration *d = unsmob_duration (get_property ("duration")); + Duration *d = unsmob (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 ()); } /* - 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) +Prob::transpose (Pitch delta) { - for (SCM s = alist; scm_is_pair (s); s = scm_cdr (s)) + if (to_boolean (get_property ("untransposable"))) + return; + + for (SCM s = mutable_property_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); - if (transposed.get_alteration ().abs () > Rational (1,1)) - { - warning (_f ("transposition by %s makes alteration larger than double", - delta.to_string ())); - } - - 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 (val != new_val) - scm_set_cdr_x (entry , new_val); - } -} - -void -Music::transpose (Pitch delta) -{ - if (to_boolean (get_property ("untransposable"))) - return; - transpose_mutable (mutable_property_alist_, delta); + if (Pitch *p = unsmob (val)) + { + Pitch transposed = p->transposed (delta); + + if (scm_is_eq (prop, ly_symbol2scm ("tonic"))) + transposed = Pitch (-1, transposed.get_notename (), + transposed.get_alteration ()); + + new_val = transposed.smobbed_copy (); + } + else if (scm_is_eq (prop, ly_symbol2scm ("element"))) + { + if (Prob *m = unsmob (val)) + m->transpose (delta); + } + else if (scm_is_eq (prop, ly_symbol2scm ("elements")) + || scm_is_eq (prop, ly_symbol2scm ("articulations"))) + transpose_music_list (val, delta); + else if (scm_is_eq (prop, ly_symbol2scm ("pitch-alist")) + && scm_is_pair (val)) + new_val = ly_transpose_key_alist (val, delta.smobbed_copy ()); + + if (!scm_is_eq (val, new_val)) + scm_set_cdr_x (entry, new_val); + } } void Music::set_spot (Input ip) { - set_property ("origin", make_input (ip)); + set_property ("origin", ip.smobbed_copy ()); } Input * Music::origin () const { - Input *ip = unsmob_input (get_property ("origin")); + Input *ip = unsmob (get_property ("origin")); return ip ? ip : &dummy_input_global; } @@ -251,15 +261,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 + (Lily::ly_make_event_class (class_name), + mutable_property_alist_); Moment length = get_length (); if (length.to_bool ()) e->set_property ("length", length.smobbed_copy ()); @@ -270,11 +280,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 (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)); } @@ -298,11 +307,10 @@ Music::send_to_context (Context *c) Music * make_music_by_name (SCM sym) { - SCM make_music_proc = ly_lily_module_constant ("make-music"); - SCM rv = scm_call_1 (make_music_proc, sym); + SCM rv = Lily::make_music (sym); /* UGH. */ - Music *m = unsmob_music (rv); + Music *m = unsmob (rv); m->protect (); return m; } @@ -311,8 +319,8 @@ MAKE_SCHEME_CALLBACK (Music, duration_length_callback, 1); SCM Music::duration_length_callback (SCM m) { - Music *me = unsmob_music (m); - Duration *d = unsmob_duration (me->get_property ("duration")); + Music *me = unsmob (m); + Duration *d = unsmob (me->get_property ("duration")); Moment mom; if (d) @@ -320,9 +328,39 @@ Music::duration_length_callback (SCM m) return mom.smobbed_copy (); } -Music * -unsmob_music (SCM m) +SCM +music_deep_copy (SCM m) { - return dynamic_cast (unsmob_prob (m)); + if (Music *mus = unsmob (m)) + return mus->clone ()->unprotect (); + if (scm_is_pair (m)) + { + SCM copy = SCM_EOL; + do + { + copy = scm_cons (music_deep_copy (scm_car (m)), copy); + m = scm_cdr (m); + } + while (scm_is_pair (m)); + // Oh, come on, GUILE. Why do you require the second argument + // of scm_reverse_x to be a proper list? That makes no sense. + // return scm_reverse_x (copy, music_deep_copy (m)); + SCM last_cons = copy; + copy = scm_reverse_x (copy, SCM_EOL); + scm_set_cdr_x (last_cons, music_deep_copy (m)); + return copy; + } + return m; } +void +set_origin (SCM m, SCM origin) +{ + while (scm_is_pair (m)) + { + set_origin (scm_car (m), origin); + m = scm_cdr (m); + } + if (Music *mus = unsmob (m)) + mus->set_property ("origin", origin); +}