X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic.cc;h=7e6fe2b14fec55a2e17421c447b61111727d6eed;hb=237583408aaf3b2192c388c3183d9c57fb051bd0;hp=7b9e88a7694f210abb882f03dee336282f39cb1e;hpb=8e7c61da2807da363e25c2d80bd0d69616dadea8;p=lilypond.git diff --git a/lily/music.cc b/lily/music.cc index 7b9e88a769..7e6fe2b14f 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2003 Han-Wen Nienhuys */ #include "main.hh" @@ -14,35 +14,38 @@ #include "pitch.hh" #include "ly-smobs.icc" -SCM -ly_deep_mus_copy (SCM m) + +SCM ly_deep_mus_copy (SCM); + +bool +Music::internal_is_music_type (SCM k)const { - if (unsmob_music (m)) + SCM ifs = get_mus_property ("types"); + + return scm_memq (k, ifs) != SCM_BOOL_F; +} + +String +Music::name () const +{ + SCM nm = get_mus_property ("name"); + if (gh_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; } -Music::Music () -{ - 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, @@ -54,14 +57,19 @@ Music::Music (Music const &m) set_spot (*m.origin ()); } - -Music::Music (SCM l) +Music::Music () { - immutable_property_alist_ = l; + self_scm_ = SCM_EOL; + immutable_property_alist_ = SCM_EOL; mutable_property_alist_ = SCM_EOL; smobify_self (); } +SCM +Music::get_property_alist (bool m) const +{ + return (m) ? mutable_property_alist_ : immutable_property_alist_; +} SCM Music::mark_smob (SCM m) @@ -72,15 +80,8 @@ Music::mark_smob (SCM m) 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)) @@ -114,7 +115,7 @@ print_alist (SCM a, SCM port) /* SCM_EOL -> catch malformed lists. */ - for (SCM s = a; s != SCM_EOL; s = ly_cdr (s)) + for (SCM s = a; gh_pair_p (s); s = ly_cdr (s)) { scm_display (ly_caar (s), port); scm_puts (" = ", port); @@ -128,42 +129,65 @@ 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_mus_property ("name"); + if (gh_symbol_p (nm) || gh_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_mus_property ("element"); + + if (Music* m = unsmob_music (elt)) + p = m->to_relative_octave (p); + + p = music_list_to_relative (get_mus_property ("elements"), + p, false); + return p; +} + +void +Music::compress (Moment factor) +{ + SCM elt = get_mus_property ("element"); + + if (Music* m = unsmob_music (elt)) + m->compress (factor); + + compress_music_list (get_mus_property ("elements"), factor); } void Music::transpose (Pitch delta) { - Pitch *p = unsmob_pitch (get_mus_property ("pitch")); - if (!p) - return ; + SCM elt = get_mus_property ("element"); - Pitch np = *p; - np.transpose (delta); - - if (abs (np.alteration_i_) > 2) - { - warning (_f ("Transposition by %s makes accidental larger than two", - delta.str ())); - } + if (Music* m = unsmob_music (elt)) + m->transpose (delta); - set_mus_property ("pitch", np.smobbed_copy ()); + transpose_music_list (get_mus_property ("elements"), delta); } -IMPLEMENT_TYPE_P (Music, "music?"); + +IMPLEMENT_TYPE_P (Music, "ly:music?"); IMPLEMENT_SMOBS (Music); IMPLEMENT_DEFAULT_EQUAL_P (Music); @@ -184,10 +208,9 @@ Music::internal_get_mus_property (SCM sym) const void Music::internal_set_mus_property (SCM s, SCM v) { -#ifndef NDEBUG if (internal_type_checking_global_b) - assert (type_check_assignment (s, v, ly_symbol2scm ("music-type?"))); -#endif + if (!type_check_assignment (s, v, ly_symbol2scm ("music-type?"))) + abort (); mutable_property_alist_ = scm_assq_set_x (mutable_property_alist_, s, v); } @@ -215,25 +238,36 @@ Music::~Music () } +LY_DEFINE(ly_get_music_length, + "ly:get-music-length", 1, 0, 0, (SCM mus), + "Get the length (in musical time) of music expression @var{mus}.") +{ + 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:get-mus-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(gh_symbol_p (sym), sym, SCM_ARG2, __FUNCTION__, "symbol"); return sc->internal_get_mus_property (sym); } LY_DEFINE(ly_set_mus_property, - "ly-set-mus-property", 3, 0, 0, + "ly:set-mus-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__, "grob"); - SCM_ASSERT_TYPE(gh_symbol_p(sym), sym, SCM_ARG2, __FUNCTION__, "symbol"); + SCM_ASSERT_TYPE(sc, mus, SCM_ARG1, __FUNCTION__, "music"); + SCM_ASSERT_TYPE(gh_symbol_p (sym), sym, SCM_ARG2, __FUNCTION__, "symbol"); bool ok = type_check_assignment (sym, val, ly_symbol2scm ("music-type?")); if (ok) @@ -245,37 +279,52 @@ LY_DEFINE(ly_set_mus_property, } -// to do property args -LY_DEFINE(ly_make_music, - "ly-make-music", 1, 0, 0, (SCM type), - " -Make a music object/expression of type @var{name}. Warning: this -interface will likely change in the near future. +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); + return scm_makfrom0str (nm); +} -Music is the data type that music expressions are stored in. The data -type does not yet offer many manipulations. -") +// 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" +) { - SCM_ASSERT_TYPE(gh_string_p(type), type, SCM_ARG1, __FUNCTION__, "string"); - - - SCM s = get_music (ly_scm2string (type))->self_scm (); - scm_gc_unprotect_object (s); + SCM_ASSERT_TYPE(gh_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_name, "ly-music-name", 1, 0, 0, - (SCM mus), - "Return the name of @var{music}.") +// 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" +) { - Music * m = unsmob_music (mus); - SCM_ASSERT_TYPE(m, mus, SCM_ARG1, __FUNCTION__ ,"music"); - - const char * nm = classname (m); - return ly_str02scm (nm); + Music *m = unsmob_music (mus); + 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, @@ -294,3 +343,55 @@ LY_DEFINE(ly_music_list_p,"music-list?", 1, 0, 0, } ADD_MUSIC(Music); + + +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}") +{ + 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; +} + +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); + return sc->self_scm(); // SCM_UNDEFINED ? +} + + +SCM make_music_proc; + + +Music* +make_music_by_name (SCM sym) +{ + 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); +}