X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic.cc;h=40d913266a9ae8551d1cccec448801a6d663866e;hb=d765f3af45be51f15da55cf570a4b172200e1035;hp=e3272b1989b56acbfdaefefcf99e88a4cf6a1b7b;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git diff --git a/lily/music.cc b/lily/music.cc index e3272b1989..40d913266a 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -3,13 +3,14 @@ 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" -#include "debug.hh" +#include "warn.hh" #include "pitch.hh" #include "ly-smobs.icc" @@ -19,41 +20,56 @@ 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 () +{ + 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_; - SCM c =ly_deep_mus_copy (m.mutable_property_alist_); - mutable_property_alist_ = c; + 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. + */ smobify_self (); - + mutable_property_alist_ = ly_deep_mus_copy (m.mutable_property_alist_); set_spot (*m.origin ()); } -Music::Music(SCM l) +Music::Music (SCM l) { + self_scm_ = SCM_EOL; immutable_property_alist_ = l; mutable_property_alist_ = SCM_EOL; smobify_self (); } + 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; @@ -71,34 +87,51 @@ Music::length_mom () const { SCM l = get_mus_property ("length"); if (unsmob_moment (l)) - return *unsmob_moment(l); + return *unsmob_moment (l); else if (gh_procedure_p (l)) { - SCM res = gh_call1(l, self_scm( )); - return *unsmob_moment(res); + SCM res = gh_call1 (l, 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 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)) + /* + SCM_EOL -> catch malformed lists. + */ + for (SCM s = a; s != SCM_EOL; 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); } } int -Music::print_smob(SCM s, SCM p, scm_print_state*) +Music::print_smob (SCM s, SCM p, scm_print_state*) { scm_puts ("#mutable_property_alist_, p); print_alist (m->immutable_property_alist_, p); @@ -115,83 +148,62 @@ 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_) > 2) + { + warning (_f ("Transposition by %s makes accidental larger than two", + delta.string ())); + } + + set_mus_property ("pitch", np.smobbed_copy ()); } -IMPLEMENT_TYPE_P(Music, "music?"); -IMPLEMENT_UNSMOB(Music,music); -IMPLEMENT_SMOBS(Music); -IMPLEMENT_DEFAULT_EQUAL_P(Music); +IMPLEMENT_TYPE_P (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_); + 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; + return (s == SCM_BOOL_F) ? SCM_EOL : ly_cdr (s); } void -Music::set_mus_property (const char* k, SCM v) +Music::internal_set_mus_property (SCM s, SCM v) { - SCM s = ly_symbol2scm (k); - set_mus_property (s, v); -} + if (internal_type_checking_global_b) + if (!type_check_assignment (s, v, ly_symbol2scm ("music-type?"))) + abort (); -void -Music::set_immutable_mus_property (const char*k, SCM v) -{ - SCM s = ly_symbol2scm (k); - set_immutable_mus_property (s, v); + mutable_property_alist_ = scm_assq_set_x (mutable_property_alist_, s, v); } -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) -{ - 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_mus_property ("origin", make_input (ip)); } - - Input* Music::origin () const { @@ -200,62 +212,86 @@ Music::origin () const } - - - Music::~Music () { } -SCM -ly_get_mus_property (SCM mus, SCM sym) +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}.") { 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__, "music"); + SCM_ASSERT_TYPE(gh_symbol_p (sym), sym, SCM_ARG2, __FUNCTION__, "symbol"); + return sc->internal_get_mus_property (sym); +} -SCM -ly_set_mus_property (SCM mus, SCM sym, SCM val) +LY_DEFINE(ly_set_mus_property, + "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__, "music"); + SCM_ASSERT_TYPE(gh_symbol_p (sym), sym, SCM_ARG2, __FUNCTION__, "symbol"); - if (!gh_symbol_p (sym)) + bool ok = type_check_assignment (sym, val, ly_symbol2scm ("music-type?")); + if (ok) { - warning (_("ly_set_mus_property (): Not a symbol")); - scm_write (mus, scm_current_error_port ()); - - return SCM_UNSPECIFIED; + sc->internal_set_mus_property (sym, val); } + + return SCM_UNSPECIFIED; +} - if (sc) - { - sc->set_mus_property (sym, val); - } - else - { - warning (_("ly_set_mus_property (): not of type Music")); - scm_write (mus, scm_current_error_port ()); - } - return SCM_UNSPECIFIED; +// 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. + + + +Music is the data type that music expressions are stored in. The data +type does not yet offer many manipulations. +") +{ + SCM_ASSERT_TYPE(gh_string_p (type), type, SCM_ARG1, __FUNCTION__, "string"); + + SCM s = make_music (ly_scm2string (type))->self_scm (); + 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}.") +{ + Music * m = unsmob_music (mus); + SCM_ASSERT_TYPE(m, mus, SCM_ARG1, __FUNCTION__ ,"music"); + + const char * nm = classname (m); + return scm_makfrom0str (nm); } -static void -init_functions () +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.") { - 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); + if (scm_list_p (l) != SCM_BOOL_T) + return SCM_BOOL_F; + + while (gh_pair_p (l)) + { + if (!unsmob_music (gh_car (l))) + return SCM_BOOL_F; + l =gh_cdr (l); + } + return SCM_BOOL_T; } -ADD_SCM_INIT_FUNC(musicscm,init_functions); +ADD_MUSIC(Music); +