X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic.cc;h=5d7e57754bcc4cd4f22a4026bbab6abec290b739;hb=2210b90dc27efb3abd756dfccd9048785130ad4a;hp=2718004d2b84c57896b19d6f0b4e74358f241bdd;hpb=e520d35df0268554fabe100fcdbe26946c693031;p=lilypond.git diff --git a/lily/music.cc b/lily/music.cc index 2718004d2b..5d7e57754b 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -3,9 +3,10 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ +#include "main.hh" #include "input-smob.hh" #include "music.hh" #include "music-list.hh" @@ -19,18 +20,25 @@ ly_deep_mus_copy (SCM m) if (unsmob_music (m)) { SCM ss = unsmob_music (m)->clone ()->self_scm (); - scm_unprotect_object (ss); + scm_gc_unprotect_object (ss); return ss; } else if (gh_pair_p (m)) { - return gh_cons (ly_deep_mus_copy (gh_car (m)), ly_deep_mus_copy (gh_cdr (m))); + return gh_cons (ly_deep_mus_copy (ly_car (m)), ly_deep_mus_copy (ly_cdr (m))); } 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_; @@ -50,6 +58,7 @@ Music::Music (SCM l) smobify_self (); } + SCM Music::mark_smob (SCM m) { @@ -81,14 +90,28 @@ Music::length_mom () const return 0; } +Moment +Music::start_mom () const +{ + SCM l = get_mus_property ("start-moment-function"); + if (gh_procedure_p (l)) + { + SCM res = gh_call1 (l, self_scm ()); + return *unsmob_moment (res); + } + + Moment m ; + return m; +} + void print_alist (SCM a, SCM port) { - for (SCM s = a; gh_pair_p (s); s = gh_cdr (s)) + for (SCM s = a; gh_pair_p (s); s = ly_cdr (s)) { - scm_display (gh_caar (s), port); + scm_display (ly_caar (s), port); scm_puts (" = ", port); - scm_write (gh_cdar (s), port); + scm_write (ly_cdar (s), port); scm_puts ("\n", port); } } @@ -115,72 +138,50 @@ Music::to_relative_octave (Pitch m) void -Music::transpose (Pitch) +Music::transpose (Pitch delta) { + Pitch *p = unsmob_pitch (get_mus_property ("pitch")); + if (!p) + return ; + + Pitch np = *p; + np.transpose (delta); + + if (abs (np.alteration_i_) > 2) + { + warning (_f ("Transposition by %s makes accidental larger than two", + delta.str ())); + } + + set_mus_property ("pitch", np.smobbed_copy ()); } IMPLEMENT_TYPE_P (Music, "music?"); -IMPLEMENT_UNSMOB (Music,music); + IMPLEMENT_SMOBS (Music); IMPLEMENT_DEFAULT_EQUAL_P (Music); /****************************/ SCM -Music::get_mus_property (const char *nm) const -{ - SCM sym = ly_symbol2scm (nm); - return get_mus_property (sym); -} - -SCM -Music::get_mus_property (SCM sym) const +Music::internal_get_mus_property (SCM sym) const { SCM s = scm_sloppy_assq (sym, mutable_property_alist_); if (s != SCM_BOOL_F) - return gh_cdr (s); + return ly_cdr (s); s = scm_sloppy_assq (sym, immutable_property_alist_); - return (s == SCM_BOOL_F) ? SCM_EOL : gh_cdr (s); -} - -/* - Remove the value associated with KEY, and return it. The result is - that a next call will yield SCM_EOL (and not the underlying - `basic' property. -*/ -SCM -Music::remove_mus_property (const char* key) -{ - SCM val = get_mus_property (key); - if (val != SCM_EOL) - set_mus_property (key, SCM_EOL); - return val; -} - -void -Music::set_mus_property (const char* k, SCM v) -{ - SCM s = ly_symbol2scm (k); - set_mus_property (s, v); -} - -void -Music::set_immutable_mus_property (const char*k, SCM v) -{ - SCM s = ly_symbol2scm (k); - set_immutable_mus_property (s, v); + return (s == SCM_BOOL_F) ? SCM_EOL : ly_cdr (s); } void -Music::set_immutable_mus_property (SCM s, SCM v) -{ - immutable_property_alist_ = gh_cons (gh_cons (s,v), mutable_property_alist_); - mutable_property_alist_ = scm_assq_remove_x (mutable_property_alist_, s); -} -void -Music::set_mus_property (SCM s, SCM v) +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 + mutable_property_alist_ = scm_assq_set_x (mutable_property_alist_, s, v); } @@ -192,8 +193,6 @@ Music::set_spot (Input ip) set_mus_property ("origin", make_input (ip)); } - - Input* Music::origin () const { @@ -202,9 +201,6 @@ Music::origin () const } - - - Music::~Music () { @@ -214,17 +210,11 @@ SCM ly_get_mus_property (SCM mus, SCM sym) { Music * sc = unsmob_music (mus); - - if (sc) - { - return sc->get_mus_property (sym); - } - else - { - warning (_ ("ly_get_mus_property (): Not a Music")); - scm_write (mus, scm_current_error_port ()); - } - return SCM_EOL; + SCM_ASSERT_TYPE(sc, mus, SCM_ARG1, __FUNCTION__, "grob"); + SCM_ASSERT_TYPE(gh_symbol_p(sym), sym, SCM_ARG2, __FUNCTION__, "symbol"); + + return sc->internal_get_mus_property (sym); + } @@ -232,25 +222,15 @@ SCM ly_set_mus_property (SCM mus, SCM sym, SCM 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"); - if (!gh_symbol_p (sym)) - { - warning (_ ("ly_set_mus_property (): Not a symbol")); - scm_write (mus, scm_current_error_port ()); - - return SCM_UNSPECIFIED; - } - - if (sc) - { - sc->set_mus_property (sym, val); - } - else + bool ok = type_check_assignment (sym, val, ly_symbol2scm ("music-type?")); + if (ok) { - warning (_ ("ly_set_mus_property (): not of type Music")); - scm_write (mus, scm_current_error_port ()); + sc->internal_set_mus_property (sym, val); } - + return SCM_UNSPECIFIED; } @@ -259,42 +239,48 @@ ly_set_mus_property (SCM mus, SCM sym, SCM val) SCM ly_make_music (SCM type) { - if (!gh_string_p (type)) - { - warning (_ ("ly_make_music (): Not a string")); - scm_write (type, scm_current_error_port ()); + 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); - return SCM_UNSPECIFIED; - } - else - { - SCM s = get_music (ly_scm2string (type))->self_scm (); - scm_unprotect_object (s); - return s; - } + return s; } SCM ly_music_name (SCM mus) { Music * m = unsmob_music (mus); - const char *nm =""; - if (!m) + SCM_ASSERT_TYPE(m, mus, SCM_ARG1, __FUNCTION__ ,"music"); + + const char * nm = classname (m); + return ly_str02scm (nm); +} + +SCM +ly_music_list_p (SCM l) +{ + if (scm_list_p (l) != SCM_BOOL_T) + return SCM_BOOL_F; + + while (gh_pair_p (l)) { - warning (_ ("ly_music_name (): Not a music expression")); - scm_write (mus, scm_current_error_port ()); + if (!unsmob_music (gh_car (l))) + return SCM_BOOL_F; + l =gh_cdr (l); } - else - nm = classname (m); - return ly_str02scm (nm); + return SCM_BOOL_T; } static void init_functions () { - scm_make_gsubr ("ly-get-mus-property", 2, 0, 0, (Scheme_function_unknown)ly_get_mus_property); - scm_make_gsubr ("ly-set-mus-property", 3, 0, 0, (Scheme_function_unknown)ly_set_mus_property); - scm_make_gsubr ("ly-make-music", 1, 0, 0, (Scheme_function_unknown)ly_make_music); - scm_make_gsubr ("ly-music-name", 1, 0, 0, (Scheme_function_unknown)ly_music_name); + scm_c_define_gsubr ("music-list?", 1, 0, 0, (Scheme_function_unknown)ly_music_list_p); + scm_c_define_gsubr ("ly-get-mus-property", 2, 0, 0, (Scheme_function_unknown)ly_get_mus_property); + scm_c_define_gsubr ("ly-set-mus-property", 3, 0, 0, (Scheme_function_unknown)ly_set_mus_property); + scm_c_define_gsubr ("ly-make-music", 1, 0, 0, (Scheme_function_unknown)ly_make_music); + scm_c_define_gsubr ("ly-music-name", 1, 0, 0, (Scheme_function_unknown)ly_music_name); } ADD_SCM_INIT_FUNC (musicscm,init_functions); +ADD_MUSIC(Music);