/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2005--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
#include "music.hh"
#include "duration.hh"
+#include "program-option.hh"
#include "warn.hh"
LY_DEFINE (ly_music_length, "ly:music-length",
LY_DEFINE (ly_event_p, "ly:event?",
1, 0, 0, (SCM obj),
- "Is @var{obj} an event object?")
+ "Is @var{obj} a proper (non-rhythmic) event object?")
{
if (Music *m = unsmob_music (obj))
{
- return scm_from_bool (m->is_mus_type ("event"));
+ return scm_from_bool (m->is_mus_type ("post-event"));
}
return SCM_BOOL_F;
}
1, 0, 0, (SCM lst),
"Is @var{lst} a list of music objects?")
{
- if (scm_list_p (lst) == SCM_BOOL_T)
- while (scm_is_pair (lst))
- {
- if (!unsmob_music (scm_car (lst)))
- return SCM_BOOL_F;
- lst = scm_cdr (lst);
- }
+ if (!ly_is_list (lst))
+ return SCM_BOOL_F;
+
+ while (scm_is_pair (lst))
+ {
+ if (!unsmob_music (scm_car (lst)))
+ return SCM_BOOL_F;
+ lst = scm_cdr (lst);
+ }
return SCM_BOOL_T;
}
LY_DEFINE (ly_music_deep_copy, "ly:music-deep-copy",
1, 0, 0, (SCM m),
- "Copy @var{m} and all sub expressions of@tie{}@var{m}.")
+ "Copy @var{m} and all sub expressions of@tie{}@var{m}."
+ " @var{m} may be an arbitrary type; cons cells and music"
+ " are copied recursively.")
{
- SCM copy = m;
if (unsmob_music (m))
+ return unsmob_music (m)->clone ()->unprotect ();
+ if (scm_is_pair (m))
{
- Music *mcopy = unsmob_music (m)->clone ();
- copy = mcopy->unprotect ();
+ SCM copy = SCM_EOL;
+ do
+ {
+ copy = scm_cons (ly_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, ly_music_deep_copy (m));
+ SCM last_cons = copy;
+ copy = scm_reverse_x (copy, SCM_EOL);
+ scm_set_cdr_x (last_cons, ly_music_deep_copy (m));
+ return copy;
}
- else if (scm_is_pair (m))
- copy = scm_cons (ly_music_deep_copy (scm_car (m)),
- ly_music_deep_copy (scm_cdr (m)));
- return copy;
+ return m;
}
LY_DEFINE (ly_music_transpose, "ly:music-transpose",
LY_ASSERT_SMOB (Pitch, p, 2);
Music *sc = unsmob_music (m);
- Pitch *sp = unsmob_pitch (p);
+ Pitch *sp = Pitch::unsmob (p);
sc->transpose (*sp);
// SCM_UNDEFINED ?
"Compress music object@tie{}@var{m} by moment @var{factor}.")
{
LY_ASSERT_TYPE (unsmob_music, m, 1);
- LY_ASSERT_TYPE (unsmob_moment, factor, 2);
+ LY_ASSERT_TYPE (Moment::unsmob, factor, 2);
Music *sc = unsmob_music (m);
- sc->compress (*unsmob_moment (factor));
+ sc->compress (*Moment::unsmob (factor));
return sc->self_scm ();
}
+LY_DEFINE (ly_make_music_relative_x, "ly:make-music-relative!",
+ 2, 0, 0, (SCM music, SCM pitch),
+ "Make @var{music} relative to @var{pitch},"
+ " return final pitch.")
+{
+ LY_ASSERT_TYPE (unsmob_music, music, 1);
+ LY_ASSERT_TYPE (Pitch::unsmob, pitch, 2);
+
+ Pitch start = *Pitch::unsmob (pitch);
+ Music *m = unsmob_music (music);
+ Pitch last = m->to_relative_octave (start);
+
+ return last.smobbed_copy ();
+}
+
LY_DEFINE (ly_music_duration_length, "ly:music-duration-length", 1, 0, 0,
(SCM mus),
"Extract the duration field from @var{mus} and return the"
LY_ASSERT_TYPE (unsmob_music, mus, 1);
Music *m = unsmob_music (mus);
- Duration *d = unsmob_duration (m->get_property ("duration"));
+ Duration *d = Duration::unsmob (m->get_property ("duration"));
Moment len;
if (d)
LY_ASSERT_SMOB (Moment, fact, 2);
Music *m = unsmob_music (mus);
- Moment *f = unsmob_moment (fact);
+ Moment *f = Moment::unsmob (fact);
- Duration *d = unsmob_duration (m->get_property ("duration"));
+ Duration *d = Duration::unsmob (m->get_property ("duration"));
if (d)
m->set_property ("duration", d->compressed (f->main_part_).smobbed_copy ());
return SCM_UNSPECIFIED;
" pitch @var{pit}.")
{
SCM newlist = SCM_EOL;
- Pitch *p = unsmob_pitch (pit);
+ Pitch *p = Pitch::unsmob (pit);
for (SCM s = l; scm_is_pair (s); s = scm_cdr (s))
{