X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic.cc;h=161bf21ab79caf7144ddd4771727fc13e5d2da2f;hb=eb81c44025904ff450116c8c64a901d891617c23;hp=d87be5881ecd96a30b079f08ba20e81cebe9bd68;hpb=db065d490d62852eb1d3aaa9339863b181071152;p=lilypond.git diff --git a/lily/music.cc b/lily/music.cc index d87be5881e..161bf21ab7 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -3,53 +3,47 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ -#include "main.hh" +#include "duration.hh" #include "input-smob.hh" -#include "music.hh" +#include "ly-smobs.icc" +#include "main.hh" #include "music-list.hh" -#include "warn.hh" +#include "music.hh" #include "pitch.hh" -#include "ly-smobs.icc" +#include "score.hh" +#include "warn.hh" -SCM -ly_deep_mus_copy (SCM m) +bool +Music::internal_is_music_type (SCM k) const { - if (unsmob_music (m)) + SCM ifs = get_property ("types"); + + return scm_c_memq (k, ifs) != SCM_BOOL_F; +} + +String +Music::name () const +{ + SCM nm = get_property ("name"); + if (ly_c_symbol_p (nm)) { - SCM ss = unsmob_music (m)->clone ()->self_scm (); - scm_gc_unprotect_object (ss); - return ss; + return ly_symbol2string (nm); } - else if (gh_pair_p (m)) + else { - return gh_cons (ly_deep_mus_copy (ly_car (m)), ly_deep_mus_copy (ly_cdr (m))); + return classname (this); } - else - return m; } - - - -void -Music::add_music_type (SCM sym) -{ - assert (gh_symbol_p (sym)); - - SCM types= get_mus_property ("types"); - types = scm_cons (sym, types); - set_mus_property ("types", types); -} - -bool -Music::is_music_type (SCM k)const +Music::Music () { - SCM ifs = get_mus_property ("types"); - - return scm_memq (k, ifs) != SCM_BOOL_F; + self_scm_ = SCM_EOL; + immutable_property_alist_ = SCM_EOL; + mutable_property_alist_ = SCM_EOL; + smobify_self (); } Music::Music (Music const &m) @@ -58,84 +52,72 @@ Music::Music (Music const &m) mutable_property_alist_ = SCM_EOL; self_scm_ = SCM_EOL; - /* - First we smobify_self, then we copy over the stuff. If we don't, - stack vars that hold the copy might be optimized away, meaning - that they won't be protected from GC. - */ + /* First we smobify_self, then we copy over the stuff. If we don't, + stack vars that hold the copy might be optimized away, meaning + that they won't be protected from GC. */ smobify_self (); mutable_property_alist_ = ly_deep_mus_copy (m.mutable_property_alist_); set_spot (*m.origin ()); - - add_music_type (ly_symbol2scm ("general-music")); } +Music::~Music () +{ +} +ADD_MUSIC (Music); -Music::Music () +SCM +Music::get_property_alist (bool m) const { - self_scm_ = SCM_EOL; - immutable_property_alist_ = SCM_EOL; - mutable_property_alist_ = SCM_EOL; - smobify_self (); + return (m) ? mutable_property_alist_ : immutable_property_alist_; } - SCM Music::mark_smob (SCM m) { - Music * mus = (Music *)SCM_CELL_WORD_1 (m); + Music *mus = (Music*) SCM_CELL_WORD_1 (m); scm_gc_mark (mus->immutable_property_alist_); scm_gc_mark (mus->mutable_property_alist_); return SCM_EOL; } -void -Music::compress (Moment) -{ -} - - - Moment -Music::length_mom () const +Music::get_length () const { - SCM l = get_mus_property ("length"); - if (unsmob_moment (l)) - return *unsmob_moment (l); - else if (gh_procedure_p (l)) + SCM lst = get_property ("length"); + if (unsmob_moment (lst)) + return *unsmob_moment (lst); + else if (ly_c_procedure_p (lst)) { - SCM res = gh_call1 (l, self_scm ()); + SCM res = scm_call_1 (lst, self_scm ()); return *unsmob_moment (res); } - + return 0; } Moment Music::start_mom () const { - SCM l = get_mus_property ("start-moment-function"); - if (gh_procedure_p (l)) + SCM lst = get_property ("start-moment-function"); + if (ly_c_procedure_p (lst)) { - SCM res = gh_call1 (l, self_scm ()); + SCM res = scm_call_1 (lst, self_scm ()); return *unsmob_moment (res); } - Moment m ; + Moment m; return m; } void print_alist (SCM a, SCM port) { - /* - SCM_EOL -> catch malformed lists. - */ - for (SCM s = a; gh_pair_p (s); s = ly_cdr (s)) + /* SCM_EOL -> catch malformed lists. */ + for (SCM s = a; ly_c_pair_p (s); s = ly_cdr (s)) { scm_display (ly_caar (s), port); - scm_puts (" = ", port); + scm_puts (" = ", port); scm_write (ly_cdar (s), port); scm_puts ("\n", port); } @@ -146,61 +128,72 @@ Music::print_smob (SCM s, SCM p, scm_print_state*) { scm_puts ("#mutable_property_alist_, p); - print_alist (m->immutable_property_alist_, p); - + SCM nm = m->get_property ("name"); + if (ly_c_symbol_p (nm) || ly_c_string_p (nm)) + scm_display (nm, p); + else + scm_puts (classname (m),p); + + /* Printing properties takes a lot of time, especially during backtraces. + For inspecting, it is better to explicitly use an inspection + function. */ + scm_puts (">",p); return 1; } Pitch -Music::to_relative_octave (Pitch m) +Music::to_relative_octave (Pitch p) { - return m; + SCM elt = get_property ("element"); + + if (Music *m = unsmob_music (elt)) + p = m->to_relative_octave (p); + + p = music_list_to_relative (get_property ("elements"), p, false); + return p; } +void +Music::compress (Moment factor) +{ + SCM elt = get_property ("element"); + + if (Music *m = unsmob_music (elt)) + m->compress (factor); + + compress_music_list (get_property ("elements"), factor); +} void Music::transpose (Pitch delta) { - Pitch *p = unsmob_pitch (get_mus_property ("pitch")); - if (!p) - return ; + SCM elt = get_property ("element"); - Pitch np = *p; - np.transpose (delta); - - if (abs (np.alteration_) > 2) - { - warning (_f ("Transposition by %s makes accidental larger than two", - delta.string ())); - } + if (Music* m = unsmob_music (elt)) + m->transpose (delta); - set_mus_property ("pitch", np.smobbed_copy ()); + transpose_music_list (get_property ("elements"), delta); } -IMPLEMENT_TYPE_P (Music, "music?"); - +IMPLEMENT_TYPE_P (Music, "ly:music?"); IMPLEMENT_SMOBS (Music); IMPLEMENT_DEFAULT_EQUAL_P (Music); -/****************************/ - SCM -Music::internal_get_mus_property (SCM sym) const +Music::internal_get_property (SCM sym) const { SCM s = scm_sloppy_assq (sym, mutable_property_alist_); if (s != SCM_BOOL_F) return ly_cdr (s); s = scm_sloppy_assq (sym, immutable_property_alist_); - return (s == SCM_BOOL_F) ? SCM_EOL : ly_cdr (s); + return (s == SCM_BOOL_F) ? SCM_EOL : ly_cdr (s); } void -Music::internal_set_mus_property (SCM s, SCM v) +Music::internal_set_property (SCM s, SCM v) { if (internal_type_checking_global_b) if (!type_check_assignment (s, v, ly_symbol2scm ("music-type?"))) @@ -209,125 +202,198 @@ Music::internal_set_mus_property (SCM s, SCM v) mutable_property_alist_ = scm_assq_set_x (mutable_property_alist_, s, v); } - - -#include "main.hh" - void Music::set_spot (Input ip) { - set_mus_property ("origin", make_input (ip)); + set_property ("origin", make_input (ip)); } Input* Music::origin () const { - Input *ip = unsmob_input (get_mus_property ("origin")); - return ip ? ip : & dummy_input_global; + Input *ip = unsmob_input (get_property ("origin")); + return ip ? ip : & dummy_input_global; } +int +Music::duration_log () const +{ + if (is_mus_type ("rhythmic-event")) + return unsmob_duration (get_property ("duration"))->duration_log (); + return 0; +} -Music::~Music () +Music* +make_music_by_name (SCM sym) { - + SCM make_music_proc = ly_scheme_function ("make-music"); + SCM rv = scm_call_1 (make_music_proc, sym); + + /* UGH. */ + scm_gc_protect_object (rv); + return unsmob_music (rv); +} + +LY_DEFINE (ly_music_length, "ly:music-length", + 1, 0, 0, (SCM mus), + "Get the length of music expression @var{mus}, and return as a @code{Moment} object.") +{ + Music *sc = unsmob_music (mus); + SCM_ASSERT_TYPE (sc, mus, SCM_ARG1, __FUNCTION__, "music"); + return sc->get_length ().smobbed_copy (); } -LY_DEFINE(ly_get_mus_property, - "ly-get-mus-property", 2, 0, 0, (SCM mus, SCM sym), - "Get the property @var{sym} of music expression @var{mus}.") +LY_DEFINE (ly_music_property, + "ly:music-property", 2, 0, 0, (SCM mus, SCM sym), + "Get the property @var{sym} of music expression @var{mus}.\n" + "If @var{sym} is undefined, return @code{' ()}.\n" ) { Music * sc = unsmob_music (mus); - SCM_ASSERT_TYPE(sc, mus, SCM_ARG1, __FUNCTION__, "music"); - SCM_ASSERT_TYPE(gh_symbol_p (sym), sym, SCM_ARG2, __FUNCTION__, "symbol"); + SCM_ASSERT_TYPE (sc, mus, SCM_ARG1, __FUNCTION__, "music"); + SCM_ASSERT_TYPE (ly_c_symbol_p (sym), sym, SCM_ARG2, __FUNCTION__, "symbol"); - return sc->internal_get_mus_property (sym); + return sc->internal_get_property (sym); } -LY_DEFINE(ly_set_mus_property, - "ly-set-mus-property!", 3, 0, 0, - (SCM mus, SCM sym, SCM val), +LY_DEFINE (ly_music_set_property, "ly:music-set-property!", + 3, 0, 0, (SCM mus, SCM sym, SCM val), "Set property @var{sym} in music expression @var{mus} to @var{val}.") { Music * sc = unsmob_music (mus); - SCM_ASSERT_TYPE(sc, mus, SCM_ARG1, __FUNCTION__, "music"); - SCM_ASSERT_TYPE(gh_symbol_p (sym), sym, SCM_ARG2, __FUNCTION__, "symbol"); + SCM_ASSERT_TYPE (sc, mus, SCM_ARG1, __FUNCTION__, "music"); + SCM_ASSERT_TYPE (ly_c_symbol_p (sym), sym, SCM_ARG2, __FUNCTION__, "symbol"); bool ok = type_check_assignment (sym, val, ly_symbol2scm ("music-type?")); if (ok) { - sc->internal_set_mus_property (sym, val); + sc->internal_set_property (sym, val); } - + return SCM_UNSPECIFIED; } - -LY_DEFINE(ly_music_name, "ly-music-name", 1, 0, 0, - (SCM mus), - "Return the name of @var{music}.") +LY_DEFINE (ly_music_name, "ly:music-name", + 1, 0, 0, (SCM mus), + "Return the name of @var{music}.") { - Music * m = unsmob_music (mus); - SCM_ASSERT_TYPE(m, mus, SCM_ARG1, __FUNCTION__ ,"music"); - - const char * nm = classname (m); + Music *m = unsmob_music (mus); + SCM_ASSERT_TYPE (m, mus, SCM_ARG1, __FUNCTION__ ,"music"); + + char const *nm = classname (m); return scm_makfrom0str (nm); } - - -// to do property args -LY_DEFINE(ly_extended_make_music, - "ly-make-bare-music", 2, 0, 0, (SCM type, SCM props), - " -Make a music object/expression of type @var{type}, init with -@var{props}. Warning: this interface will likely change in the near -future. - -Music is the data type that music expressions are stored in. The data -type does not yet offer many manipulations. - -WARNING: deprecated; use make-music-by-name. -") +/* todo: property args */ +LY_DEFINE (ly_extended_make_music, "ly:make-bare-music", + 2, 0, 0, (SCM type, SCM props), + "Make a C++ music object of type @var{type}, initialize with\n" + "@var{props}. \n\n" + "" + "This function is for internal use, and is only called by " + "@code{make-music}, which is the preferred interface " + "for creating music objects. " + ) { - SCM_ASSERT_TYPE(gh_string_p (type), type, SCM_ARG1, __FUNCTION__, "string"); - + SCM_ASSERT_TYPE (ly_c_string_p (type), type, SCM_ARG1, __FUNCTION__, "string"); SCM s = make_music (ly_scm2string (type))->self_scm (); unsmob_music (s)->immutable_property_alist_ = props; scm_gc_unprotect_object (s); return s; } -LY_DEFINE(ly_music_list_p,"music-list?", 1, 0, 0, - (SCM l),"Type predicate: return true if @var{l} is a list of music objects.") +/* todo: property args */ +LY_DEFINE (ly_music_mutable_properties, "ly:music-mutable-properties", + 1, 0, 0, (SCM mus), + "Return an alist containing the mutable properties of @var{mus}.\n" + "The immutable properties are not available, since " + "they are constant and initialized by the " + "@code{make-music} function.\n") { - if (scm_list_p (l) != SCM_BOOL_T) - return SCM_BOOL_F; + Music *m = unsmob_music (mus); + SCM_ASSERT_TYPE (m, mus, SCM_ARG1, __FUNCTION__, "music"); + return m->get_property_alist (true); +} - while (gh_pair_p (l)) +LY_DEFINE (ly_music_list_p,"ly:music-list?", + 1, 0, 0, (SCM lst), + "Type predicate: return true if @var{lst} is a list " + "of music objects.") +{ + if (scm_list_p (lst) == SCM_BOOL_T) + while (ly_c_pair_p (lst)) + { + if (!unsmob_music (ly_car (lst))) + return SCM_BOOL_F; + lst = ly_cdr (lst); + } + + return SCM_BOOL_T; +} + +LY_DEFINE (ly_deep_mus_copy, "ly:music-deep-copy", + 1, 0, 0, (SCM m), + "Copy @var{m} and all sub expressions of @var{m}") +{ + SCM copy = m; + if (unsmob_music (m)) { - if (!unsmob_music (gh_car (l))) - return SCM_BOOL_F; - l =gh_cdr (l); + copy = unsmob_music (m)->clone ()->self_scm (); + scm_gc_unprotect_object (copy); } - return SCM_BOOL_T; + else if (ly_c_pair_p (m)) + copy = scm_cons (ly_deep_mus_copy (ly_car (m)), + ly_deep_mus_copy (ly_cdr (m))); + return copy; } -ADD_MUSIC(Music); +LY_DEFINE (ly_music_transpose, "ly:music-transpose", + 2, 0, 0, (SCM m, SCM p), + "Transpose @var{m} such that central C is mapped to @var{p}. " + "Return @var{m}.") +{ + Music * sc = unsmob_music (m); + Pitch * sp = unsmob_pitch (p); + SCM_ASSERT_TYPE (sc, m, SCM_ARG1, __FUNCTION__, "music"); + SCM_ASSERT_TYPE (sp, p, SCM_ARG2, __FUNCTION__, "pitch"); + + sc->transpose (*sp); + // SCM_UNDEFINED ? + return sc->self_scm (); +} -SCM make_music_proc; +/* + TODO: should take moment factor? + */ +LY_DEFINE (ly_music_compress, "ly:music-compress", + 2, 0, 0, (SCM m, SCM factor), + "Compress music object @var{m} by moment @var{factor}." + ) +{ + Music * sc = unsmob_music (m); + SCM_ASSERT_TYPE (sc, m, SCM_ARG1, __FUNCTION__, "music"); + SCM_ASSERT_TYPE (unsmob_moment (factor), factor, SCM_ARG2, __FUNCTION__, "moment"); + + sc->compress (*unsmob_moment (factor)); + return sc->self_scm (); +} -Music* -make_music_by_name (SCM sym) +LY_DEFINE (ly_music_scorify, "ly:music-scorify", + 1, 0, 0, + (SCM music), + "Return MUSIC encapsulated in SCORE.") { - if (!make_music_proc) - make_music_proc = scm_primitive_eval (ly_symbol2scm ("make-music-by-name")); - - SCM rv = scm_call_1 (make_music_proc, sym); - - /* - UGH. - */ - scm_gc_protect_object (rv); - return unsmob_music (rv); +#if 0 + SCM_ASSERT_TYPE (ly_c_music_p (music), music, SCM_ARG1, __FUNCTION__, "music"); +#endif + Score *score = new Score; + + /* URG? */ + SCM check_funcs = ly_scheme_function ("toplevel-music-functions"); + for (; ly_c_pair_p (check_funcs); check_funcs = ly_cdr (check_funcs)) + music = scm_call_1 (ly_car (check_funcs), music); + + score->music_ = music; + scm_gc_unprotect_object (score->self_scm ()); + return score->self_scm (); }