X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-sequence.cc;h=dde9b653c9a3b6d84542b2de321f61e41b9c66ab;hb=55d9ad39acee4288ee0d36230f70110b02546ab3;hp=1c8e0a235299b297237ac0dc58381e778eacaeef;hpb=7aabfb20c46e0a1de41698ddc6859ccd3a6dea85;p=lilypond.git diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc index 1c8e0a2352..dde9b653c9 100644 --- a/lily/music-sequence.cc +++ b/lily/music-sequence.cc @@ -1,64 +1,49 @@ -/* - music-sequence.cc -- implement Music_sequence - - source file of the GNU LilyPond music typesetter - - (c) 1998--2003 Han-Wen Nienhuys - - */ -#include "music-list.hh" -#include "warn.hh" -#include "pitch.hh" +/* + This file is part of LilyPond, the GNU music typesetter. + Copyright (C) 1998--2012 Han-Wen Nienhuys -SCM -Music_sequence::music_list ()const -{ - return get_mus_property ("elements"); -} + 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. -/* - Ugh this sucks. Linear. do not use. - */ -void -Music_sequence::append_music (Music *m) -{ - set_mus_property ("elements", - gh_append2 (music_list (), gh_cons (m->self_scm (), SCM_EOL))); - scm_gc_unprotect_object (m->self_scm ()); -} + 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. -Music_sequence::Music_sequence ( ) - : Music () -{ -} + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ -void -Music_sequence::transpose (Pitch rq) -{ - transpose_list (music_list (), rq); -} +#include "music-sequence.hh" + +#include "warn.hh" +#include "program-option.hh" +#include "duration.hh" +#include "moment.hh" +#include "music.hh" +#include "input.hh" void -Music_sequence::transpose_list (SCM l, Pitch rq) +transpose_music_list (SCM lst, Pitch rq) { - for (SCM s = l; gh_pair_p (s); s = ly_cdr (s)) - unsmob_music (ly_car (s))->transpose (rq); + for (SCM s = lst; scm_is_pair (s); s = scm_cdr (s)) + unsmob_music (scm_car (s))->transpose (rq); } Moment -Music_sequence::cumulative_length (SCM l) +Music_sequence::cumulative_length (SCM l) { Moment cumulative; - Moment last_len; + Moment last_len; - for (SCM s = l; gh_pair_p (s); s = ly_cdr (s)) + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) { - Moment l = unsmob_music (ly_car (s))->get_length (); + Moment l = unsmob_music (scm_car (s))->get_length (); if (last_len.grace_part_ && l.main_part_) - { - last_len.grace_part_ = Rational (0); - } + last_len.grace_part_ = Rational (0); cumulative += last_len; last_len = l; } @@ -66,99 +51,158 @@ Music_sequence::cumulative_length (SCM l) last_len.grace_part_ = Rational (0); cumulative += last_len; - return cumulative; -} - -Pitch -Music_sequence::to_relative_octave (Pitch p) -{ - return do_relative_octave (p, false); + return cumulative; } - Moment Music_sequence::maximum_length (SCM l) { Moment dur = 0; - for (SCM s = l; gh_pair_p (s); s = ly_cdr (s)) + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) { - Music * m = unsmob_music (ly_car (s)); - Moment l = m->get_length (); - dur = dur >? l; + Music *m = unsmob_music (scm_car (s)); + if (!m) + programming_error ("Music sequence should have music elements"); + else + { + Moment l = m->get_length (); + dur = max (dur, l); + } } return dur; } +MAKE_SCHEME_CALLBACK (Music_sequence, maximum_length_callback, 1); +SCM +Music_sequence::maximum_length_callback (SCM m) +{ + Music *me = unsmob_music (m); + return maximum_length (me->get_property ("elements")).smobbed_copy (); +} + +MAKE_SCHEME_CALLBACK (Music_sequence, event_chord_length_callback, 1); +SCM +Music_sequence::event_chord_length_callback (SCM m) +{ + Music *me = unsmob_music (m); + Duration *d = unsmob_duration (me->get_property ("duration")); + // Preset duration is used in chord repetitions. + if (d) { + Moment mom = d->get_length (); + return mom.smobbed_copy (); + } + return maximum_length (me->get_property ("elements")).smobbed_copy (); +} + +MAKE_SCHEME_CALLBACK (Music_sequence, cumulative_length_callback, 1); +SCM +Music_sequence::cumulative_length_callback (SCM m) +{ + Music *me = unsmob_music (m); + return cumulative_length (me->get_property ("elements")).smobbed_copy (); +} + +MAKE_SCHEME_CALLBACK (Music_sequence, minimum_start_callback, 1); +SCM +Music_sequence::minimum_start_callback (SCM m) +{ + Music *me = unsmob_music (m); + return minimum_start (me->get_property ("elements")).smobbed_copy (); +} + +MAKE_SCHEME_CALLBACK (Music_sequence, first_start_callback, 1); +SCM +Music_sequence::first_start_callback (SCM m) +{ + Music *me = unsmob_music (m); + return first_start (me->get_property ("elements")).smobbed_copy (); +} Pitch -Music_sequence::do_relative_octave (Pitch p, bool ret_first) +music_list_to_relative (SCM l, Pitch p, bool ret_first) { - Pitch retval; - int count=0; + Pitch first = p; + int count = 0; Pitch last = p; - for (SCM s = music_list (); gh_pair_p (s); s = ly_cdr (s)) + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) { - Music *m = unsmob_music (ly_car (s)); - if (!m) - { - programming_error ("Music_sequence should only contain music!"); - } - else - { - last = m->to_relative_octave (last); - if (!count ++) - retval = last; - } + if (Music *m = unsmob_music (scm_car (s))) + { + last = m->to_relative_octave (last); + if (!count++) + first = last; + } } - if (!ret_first) - retval = last; - - return retval; + return (ret_first) ? first : last; } void -Music_sequence::compress (Moment m) +compress_music_list (SCM l, Moment m) { - compress_list (music_list (), m); + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) + unsmob_music (scm_car (s))->compress (m); } -void -Music_sequence::compress_list (SCM l, Moment m) +Moment +Music_sequence::minimum_start (SCM l) { - for (SCM s = l; gh_pair_p (s); s = ly_cdr (s)) - unsmob_music (ly_car (s))->compress (m); -} + Moment m; -ADD_MUSIC (Music_sequence); + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) + m = min (m, unsmob_music (scm_car (s))->start_mom ()); + return m; +} Moment -Music_sequence::minimum_start (SCM l) +Music_sequence::first_start (SCM l) { - Moment m; - - for (SCM s = l; gh_pair_p (s); s = ly_cdr (s)) + + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) { - m = m start_mom (); + Music *mus = unsmob_music (scm_car (s)); + Moment start = mus->start_mom (); + if (mus->get_length ().to_bool () || start.to_bool ()) + return start; } - return m; + return Moment (); } -Moment -Music_sequence::first_start (SCM l) +MAKE_SCHEME_CALLBACK (Music_sequence, simultaneous_relative_callback, 2); +SCM +Music_sequence::simultaneous_relative_callback (SCM music, SCM pitch) { - Moment m; - - for (SCM s = l; gh_pair_p (s); s = ly_cdr (s)) + Music *me = unsmob_music (music); + Pitch p = *unsmob_pitch (pitch); + + SCM elts = me->get_property ("elements"); + SCM copied = SCM_EOL; + if (lily_1_8_relative) + copied = ly_music_deep_copy (elts); + + Pitch retval = music_list_to_relative (elts, p, false); + + if (lily_1_8_relative) { - Music * mus = unsmob_music (ly_car (s)); - Moment l = mus->get_length (); - Moment s = mus->start_mom (); - if (l.to_bool () || s.to_bool ()) - return s; + + Pitch retval_1_8 = music_list_to_relative (copied, p, true); + if (retval_1_8 != retval) + lily_1_8_compatibility_used = true; + + retval = retval_1_8; } - return m; + + return retval.smobbed_copy (); } +MAKE_SCHEME_CALLBACK (Music_sequence, event_chord_relative_callback, 2); +SCM +Music_sequence::event_chord_relative_callback (SCM music, SCM pitch) +{ + Music *me = unsmob_music (music); + Pitch p = *unsmob_pitch (pitch); + return music_list_to_relative (me->get_property ("elements"), + p, true).smobbed_copy (); +}