/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2014 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
{
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;
length_callback_ = m.length_callback_;
start_callback_ = m.start_callback_;
- /// why?
+ /// why?
set_spot (*m.origin ());
}
Music::get_length () const
{
SCM lst = get_property ("length");
- if (unsmob_moment (lst))
- return *unsmob_moment (lst);
+ if (Moment::unsmob (lst))
+ return *Moment::unsmob (lst);
if (ly_is_procedure (length_callback_))
{
SCM res = scm_call_1 (length_callback_, self_scm ());
- return *unsmob_moment (res);
+ return *Moment::unsmob (res);
}
return Moment (0);
if (ly_is_procedure (lst))
{
SCM res = scm_call_1 (lst, self_scm ());
- return *unsmob_moment (res);
+ return *Moment::unsmob (res);
}
Moment m;
}
}
-
Pitch
Music::generic_to_relative_octave (Pitch last)
{
SCM elt = get_property ("element");
- Pitch *old_pit = unsmob_pitch (get_property ("pitch"));
+ Pitch *old_pit = Pitch::unsmob (get_property ("pitch"));
if (old_pit)
{
Pitch new_pit = *old_pit;
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 ());
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;
}
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 = Pitch::unsmob (scm_call_2 (callback, self_scm (),
+ last.smobbed_copy ()));
return *p;
}
m->compress (factor);
compress_music_list (get_property ("elements"), factor);
- Duration *d = unsmob_duration (get_property ("duration"));
+ Duration *d = Duration::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)
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 ();
- }
+
+ if (Pitch *p = Pitch::unsmob (val))
+ {
+ 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))
- new_val = ly_transpose_key_alist (val, delta.smobbed_copy ());
+ {
+ 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);
+ scm_set_cdr_x (entry, new_val);
}
}
// 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 ());
{
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));
}
Music::duration_length_callback (SCM m)
{
Music *me = unsmob_music (m);
- Duration *d = unsmob_duration (me->get_property ("duration"));
+ Duration *d = Duration::unsmob (me->get_property ("duration"));
Moment mom;
if (d)
Music *
unsmob_music (SCM m)
{
- return dynamic_cast<Music*> (unsmob_prob (m));
+ return dynamic_cast<Music *> (Prob::unsmob (m));
}
-
projects / lilypond.git / blobdiff