/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2015 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
#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
{
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;
SCM
Music::copy_mutable_properties () const
{
- return ly_music_deep_copy (mutable_property_alist_);
+ return music_deep_copy (mutable_property_alist_);
}
void
Music::get_length () const
{
SCM lst = get_property ("length");
- if (unsmob_moment (lst))
- return *unsmob_moment (lst);
+ if (unsmob<Moment> (lst))
+ return *unsmob<Moment> (lst);
if (ly_is_procedure (length_callback_))
{
SCM res = scm_call_1 (length_callback_, self_scm ());
- return *unsmob_moment (res);
+ return *unsmob<Moment> (res);
}
return Moment (0);
if (ly_is_procedure (lst))
{
SCM res = scm_call_1 (lst, self_scm ());
- return *unsmob_moment (res);
+ return *unsmob<Moment> (res);
}
Moment m;
Music::generic_to_relative_octave (Pitch last)
{
SCM elt = get_property ("element");
- Pitch *old_pit = unsmob_pitch (get_property ("pitch"));
+ Pitch *old_pit = unsmob<Pitch> (get_property ("pitch"));
if (old_pit)
{
Pitch new_pit = *old_pit;
last = new_pit;
}
- if (Music *m = unsmob_music (elt))
+ 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 (),
+ Pitch *p = unsmob<Pitch> (scm_call_2 (callback, self_scm (),
last.smobbed_copy ()));
return *p;
}
{
SCM elt = get_property ("element");
- if (Music *m = unsmob_music (elt))
+ if (Music *m = unsmob<Music> (elt))
m->compress (factor);
compress_music_list (get_property ("elements"), factor);
- Duration *d = unsmob_duration (get_property ("duration"));
+ Duration *d = unsmob<Duration> (get_property ("duration"));
if (d)
set_property ("duration",
d->compressed (factor.main_part_).smobbed_copy ());
/*
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))
+ if (Pitch *p = unsmob<Pitch> (val))
{
Pitch transposed = p->transposed (delta);
- if (transposed.get_alteration ().abs () > Rational (1, 1))
- {
- 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 ();
- }
+
+ if (scm_is_eq (prop, ly_symbol2scm ("tonic")))
+ transposed = Pitch (-1, transposed.get_notename (),
+ transposed.get_alteration ());
new_val = transposed.smobbed_copy ();
}
- else if (prop == ly_symbol2scm ("element"))
+ else if (scm_is_eq (prop, ly_symbol2scm ("element")))
{
- if (Music *m = unsmob_music (val))
+ if (Prob *m = unsmob<Prob> (val))
m->transpose (delta);
}
- else if (prop == ly_symbol2scm ("elements"))
+ else if (scm_is_eq (prop, ly_symbol2scm ("elements"))
+ || scm_is_eq (prop, ly_symbol2scm ("articulations")))
transpose_music_list (val, delta);
- else if (prop == ly_symbol2scm ("pitch-alist")
+ 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 (val != new_val)
+ if (!scm_is_eq (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);
-}
-
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<Input> (get_property ("origin"));
return ip ? ip : &dummy_input_global;
}
if (!internal_is_music_type (class_name))
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 ());
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));
+ 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 *
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<Music> (rv);
m->protect ();
return m;
}
SCM
Music::duration_length_callback (SCM m)
{
- Music *me = unsmob_music (m);
- Duration *d = unsmob_duration (me->get_property ("duration"));
+ Music *me = unsmob<Music> (m);
+ Duration *d = unsmob<Duration> (me->get_property ("duration"));
Moment mom;
if (d)
return mom.smobbed_copy ();
}
-Music *
-unsmob_music (SCM m)
+SCM
+music_deep_copy (SCM m)
{
- return dynamic_cast<Music *> (unsmob_prob (m));
+ if (Music *mus = unsmob<Music> (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<Music> (m))
+ mus->set_property ("origin", origin);
}
projects / lilypond.git / blobdiff