X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fmusic.cc;h=ca9f2c028afdc02cf2c65359e4de75cb5de698af;hb=24ac85edabed266d1de42c12971f4e81b4475d7d;hp=b9944608c11f771b059d37c76ed38f4cc4df0470;hpb=26231d3ddddc67a5d8dce11d25d7d7c9109bde3e;p=lilypond.git diff --git a/lily/music.cc b/lily/music.cc index b9944608c1..ca9f2c028a 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -3,49 +3,35 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ -#include "main.hh" -#include "input-smob.hh" #include "music.hh" + +#include "duration.hh" +#include "input-smob.hh" +#include "ly-smobs.icc" +#include "main.hh" #include "music-list.hh" -#include "warn.hh" #include "pitch.hh" -#include "ly-smobs.icc" - -SCM -ly_deep_mus_copy (SCM m) -{ - if (unsmob_music (m)) - { - SCM ss = unsmob_music (m)->clone ()->self_scm (); - scm_gc_unprotect_object (ss); - return ss; - } - else if (gh_pair_p (m)) - { - return gh_cons (ly_deep_mus_copy (ly_car (m)), ly_deep_mus_copy (ly_cdr (m))); - } - else - return m; -} +#include "score.hh" +#include "warn.hh" bool -Music::internal_is_music_type (SCM k)const +Music::internal_is_music_type (SCM k) const { - SCM ifs = get_mus_property ("types"); + SCM ifs = get_property ("types"); - return scm_memq (k, ifs) != SCM_BOOL_F; + return scm_c_memq (k, ifs) != SCM_BOOL_F; } String -Music::name ()const +Music::name () const { - SCM nm = get_mus_property ("name"); - if (gh_string_p (nm)) + SCM nm = get_property ("name"); + if (scm_is_symbol (nm)) { - return ly_scm2string (nm); + return ly_symbol2string (nm); } else { @@ -53,41 +39,34 @@ Music::name ()const } } -void -Music::transpose (Pitch) -{ -} - -void -Music::compress (Moment) +Music::Music () { + self_scm_ = SCM_EOL; + immutable_property_alist_ = SCM_EOL; + mutable_property_alist_ = SCM_EOL; + smobify_self (); } - Music::Music (Music const &m) { immutable_property_alist_ = m.immutable_property_alist_; 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_); + mutable_property_alist_ = ly_music_deep_copy (m.mutable_property_alist_); set_spot (*m.origin ()); } -Music::Music () +Music::~Music () { - self_scm_ = SCM_EOL; - immutable_property_alist_ = SCM_EOL; - mutable_property_alist_ = SCM_EOL; - smobify_self (); } +ADD_MUSIC (Music); + SCM Music::get_property_alist (bool m) const { @@ -97,7 +76,7 @@ Music::get_property_alist (bool m) const 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; @@ -106,43 +85,41 @@ Music::mark_smob (SCM m) Moment 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; scm_is_pair (s); s = scm_cdr (s)) { - scm_display (ly_caar (s), port); - scm_puts (" = ", port); - scm_write (ly_cdar (s), port); + scm_display (scm_caar (s), port); + scm_puts (" = ", port); + scm_write (scm_cdar (s), port); scm_puts ("\n", port); } } @@ -152,182 +129,286 @@ 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 (scm_is_symbol (nm) || scm_is_string (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) +{ + for (SCM s = this->get_property_alist (true); scm_is_pair (s); s = scm_cdr (s)) + { + SCM entry = scm_car (s); + SCM val = scm_cdr (entry); + + if (Pitch * p = unsmob_pitch (val)) + { + Pitch transposed = p->transposed (delta); + scm_set_cdr_x (entry, transposed.smobbed_copy ()); + + if (abs (transposed.get_alteration ()) > DOUBLE_SHARP) + { + warning (_f ("Transposition by %s makes alteration larger than two", + delta.to_string ())); + } + } + } + + SCM elt = get_property ("element"); + + if (Music* m = unsmob_music (elt)) + m->transpose (delta); -IMPLEMENT_TYPE_P (Music, "music?"); + transpose_music_list (get_property ("elements"), delta); +} +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); + return scm_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 : scm_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?"))) abort (); - mutable_property_alist_ = scm_assq_set_x (mutable_property_alist_, s, 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* +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); -Music::~Music () + /* 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 (scm_is_symbol (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 (scm_is_symbol (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\n" -"@var{props}. Warning: this interface will likely change in the near\n" -"future.\n" -"\n" -"Music is the data type that music expressions are stored in. The data\n" -"type does not yet offer many manipulations.\n" -"\n" -"WARNING: only for internal use. Please use make-music-by-name. \n" -) +/* 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 (scm_is_string (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; } -// to do property args -LY_DEFINE(ly_get_mutable_properties, - "ly-get-mutable-properties", 1, 0, 0, (SCM mus), -"Return an alist signifying the mutable properties of @var{mus}.\n" -"The immutable properties are not available; they should be initialized\n" -"by the functions make-music-by-name function.\n" -) +/* 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") { Music *m = unsmob_music (mus); - SCM_ASSERT_TYPE(m, mus, SCM_ARG1, __FUNCTION__, "music"); - + SCM_ASSERT_TYPE (m, mus, SCM_ARG1, __FUNCTION__, "music"); return m->get_property_alist (true); } -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.") +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 (l) != SCM_BOOL_T) - return SCM_BOOL_F; + 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); + } + + return SCM_BOOL_T; +} - while (gh_pair_p (l)) +LY_DEFINE (ly_music_deep_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 (scm_is_pair (m)) + copy = scm_cons (ly_music_deep_copy (scm_car (m)), + ly_music_deep_copy (scm_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", + 2, 0, 0, + (SCM music, SCM parser), + "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); +#if 0 + SCM_ASSERT_TYPE (ly_c_music_p (music), music, SCM_ARG1, __FUNCTION__, "music"); +#endif + Score *score = new Score; - /* - UGH. - */ - scm_gc_protect_object (rv); - return unsmob_music (rv); + score->set_music (music, parser); + + scm_gc_unprotect_object (score->self_scm ()); + return score->self_scm (); }