X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic.cc;h=fefeda054dbe86d8beeba3a5a3aaa94fab817a57;hb=7e72a1e50e94a7f9738d62599de79fe7745f600c;hp=053275cc1f4dfda7b0421d5a91b1def08c9c6c1e;hpb=cec6dfa6bf0fb931eb7f42b1ee44ca2ec19a9f34;p=lilypond.git diff --git a/lily/music.cc b/lily/music.cc index 053275cc1f..fefeda054d 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -3,60 +3,393 @@ source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys + (c) 1997--2004 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" + -MInterval -Music::time_int() const +SCM ly_deep_mus_copy (SCM); + +bool +Music::internal_is_music_type (SCM k)const { - return MInterval (0,0); + SCM ifs = get_mus_property ("types"); + + return scm_memq (k, ifs) != SCM_BOOL_F; } -void -Music::print() const +String +Music::name () const +{ + SCM nm = get_mus_property ("name"); + if (gh_symbol_p (nm)) + { + return ly_symbol2string (nm); + } + else + { + return classname (this); + } +} + + + +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. + */ + smobify_self (); + mutable_property_alist_ = ly_deep_mus_copy (m.mutable_property_alist_); + set_spot (*m.origin ()); +} + +Music::Music () { -#ifndef NPRINT - if (! check_debug) - return ; - DOUT << name() << "{"; - if (translator_type_str_) - DOUT << translator_type_str_ << " = " << translator_id_str_; - do_print(); - DOUT << "}\n"; -#endif + 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) +{ + 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; +} + +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 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 -Music::transpose (Melodic_req const*) +print_alist (SCM a, SCM port) { + /* + SCM_EOL -> catch malformed lists. + */ + for (SCM s = a; gh_pair_p (s); s = ly_cdr (s)) + { + scm_display (ly_caar (s), port); + scm_puts (" = ", port); + scm_write (ly_cdar (s), port); + scm_puts ("\n", port); + } +} + +int +Music::print_smob (SCM s, SCM p, scm_print_state*) +{ + scm_puts ("#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 p) +{ + 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::translate (Moment) +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::do_print() const +Music::transpose (Pitch delta) { + SCM elt = get_mus_property ("element"); + + if (Music* m = unsmob_music (elt)) + m->transpose (delta); + + transpose_music_list (get_mus_property ("elements"), delta); } -IMPLEMENT_IS_TYPE_B(Music); +IMPLEMENT_TYPE_P (Music, "ly:music?"); +IMPLEMENT_SMOBS (Music); +IMPLEMENT_DEFAULT_EQUAL_P (Music); +/****************************/ + +SCM +Music::internal_get_mus_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); +} + +void +Music::internal_set_mus_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); +} + +#include "main.hh" + +void +Music::set_spot (Input ip) +{ + set_mus_property ("origin", make_input (ip)); +} + +Input* +Music::origin () const +{ + Input *ip = unsmob_input (get_mus_property ("origin")); + return ip ? ip : & dummy_input_global; +} + + +Music::~Music () +{ + +} + +LY_DEFINE(ly_music_length, + "ly: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}.\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"); + + return sc->internal_get_mus_property (sym); +} + +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"); + + bool ok = type_check_assignment (sym, val, ly_symbol2scm ("music-type?")); + if (ok) + { + sc->internal_set_mus_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}.") +{ + Music * m = unsmob_music (mus); + SCM_ASSERT_TYPE(m, mus, SCM_ARG1, __FUNCTION__ ,"music"); -Music::Music() + const char * 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" +) +{ + 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; +} + +// 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"); + + 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.") +{ + 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_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}") { - parent_music_l_ =0; + 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 ? } -IMPLEMENT_IS_TYPE_B1(Change_reg,Music) + +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); +}