/*
- 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--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
- (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ 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 <http://www.gnu.org/licenses/>.
*/
#include "music.hh"
{
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;
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)
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;
}
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 (transposed.get_alteration ().abs () > Rational (1,1))
{
- warning (_f ("transposition by %s makes alteration larger than double",
- delta.to_string ()));
+ 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"))
{
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);
- }
+ new_val = ly_transpose_key_alist (val, delta.smobbed_copy ());
- return scm_reverse_x (retval, SCM_EOL);
+ if (val != new_val)
+ scm_set_cdr_x (entry , new_val);
+ }
}
void
if (to_boolean (get_property ("untransposable")))
return;
- mutable_property_alist_ = transpose_mutable (mutable_property_alist_, delta);
+ transpose_mutable (mutable_property_alist_, delta);
}
void
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_);
Moment length = get_length ();
Music *
unsmob_music (SCM m)
{
- return dynamic_cast<Music*> (unsmob_prob (m));
+ return dynamic_cast<Music *> (unsmob_prob (m));
}
-