X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-sequence.cc;h=db5bdb95f6ca83cac5fffc18b7d2532e0bd6d06a;hb=252ec5e71b5e121734a9c9897245137cb07e4a1f;hp=1d967a3dde51731c1480fe88e7d64418c80d2b3e;hpb=28f232d1315559f8150eda01e9fb898886af9fd0;p=lilypond.git diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc index 1d967a3dde..db5bdb95f6 100644 --- a/lily/music-sequence.cc +++ b/lily/music-sequence.cc @@ -1,64 +1,47 @@ -/* - 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" -#include "input.hh" +/* + This file is part of LilyPond, the GNU music typesetter. -SCM -Music_sequence::music_list ()const -{ - return get_mus_property ("elements"); -} + Copyright (C) 1998--2012 Han-Wen Nienhuys -/* - 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 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. -Music_sequence::Music_sequence ( ) - : Music () -{ -} + 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. -void -Music_sequence::transpose (Pitch rq) -{ - transpose_list (music_list (), rq); -} + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ + +#include "music-sequence.hh" + +#include "warn.hh" +#include "program-option.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,104 +49,200 @@ Music_sequence::cumulative_length (SCM l) last_len.grace_part_ = Rational (0); cumulative += last_len; - return cumulative; + return cumulative; } -Pitch -Music_sequence::to_relative_octave (Pitch p) -{ - return do_relative_octave (p, false); -} - - 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, 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 first; - 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 ++) - first = last; - } + if (Music *m = unsmob_music (scm_car (s))) + { + last = m->to_relative_octave (last); + if (!count++) + first = last; + } } - if (ret_first && first != last) - { - String str = _("Changing relative definition causes pitch change."); - str += "\nWas: " + first.to_string () - + "Will be: " + last.to_string () + "\n"; - - origin()->warning (str); - } - return last; + 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 (); +} + +MAKE_SCHEME_CALLBACK (Music_sequence, repeated_chord_relative_callback, 2); +SCM +Music_sequence::repeated_chord_relative_callback (SCM music, SCM pitch) +{ + Music *me = unsmob_music (music); + Music *repeated_chord = unsmob_music (me->get_property ("element")); + Music *original_chord = unsmob_music (me->get_property ("original-chord")); + + /* A repeated chord octave is not computed from the previous pitch, + * (this function `pitch' argument), but from the original chord, so + * that repeated chords have the same octave have the original chord, + * even though other simple notes have been entered meanwhile. + */ + assert (repeated_chord); + Pitch *p = 0; + /* Get the original chord first pitch */ + if (original_chord) + { + for (SCM s = original_chord->get_property ("elements"); scm_is_pair (s); s = scm_cdr (s)) + { + if (Music *m = unsmob_music (scm_car (s))) + { + p = unsmob_pitch (m->get_property ("pitch")); + if (p) + break; + } + } + } + /* Use the `pitch' argument if no pitch found in original chord. */ + if (! p) + p = unsmob_pitch (pitch); + + /* Change the first note pitch to -1, to avoid octaviation. Indeed, + * the first pitch should be the same as the original chord first + * pitch. */ + for (SCM s = repeated_chord->get_property ("elements"); scm_is_pair (s); s = scm_cdr (s)) + { + if (Music *m = unsmob_music (scm_car (s))) + { + Pitch *first_pitch = unsmob_pitch (m->get_property ("pitch")); + if (first_pitch) + { + Pitch new_pitch = Pitch (-1, + first_pitch->get_notename (), + first_pitch->get_alteration ()); + m->set_property ("pitch", new_pitch.smobbed_copy ()); + break; + } + } + } + music_list_to_relative (repeated_chord->get_property ("elements"), *p, true).smobbed_copy (); + /* Return `pitch' instead of the repeated chord first pitch, + * because `pitch' is the last explicitly entered pitch */ + return pitch; +}