source file of the GNU LilyPond music typesetter
- (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "main.hh"
#include "pitch.hh"
#include "ly-smobs.icc"
-SCM
-ly_deep_mus_copy (SCM m)
+
+
+bool
+Music::internal_is_music_type (SCM k)const
{
- if (unsmob_music (m))
+ SCM ifs = get_property ("types");
+
+ return scm_memq (k, ifs) != SCM_BOOL_F;
+}
+
+String
+Music::name () const
+{
+ SCM nm = get_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,
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)
return SCM_EOL;
}
-void
-Music::compress (Moment)
-{
-}
-
-
-
Moment
-Music::length_mom () const
+Music::get_length () const
{
- SCM l = get_mus_property ("length");
+ SCM l = get_property ("length");
if (unsmob_moment (l))
return *unsmob_moment (l);
else if (gh_procedure_p (l))
Moment
Music::start_mom () const
{
- SCM l = get_mus_property ("start-moment-function");
+ SCM l = get_property ("start-moment-function");
if (gh_procedure_p (l))
{
SCM res = gh_call1 (l, self_scm ());
/*
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);
{
scm_puts ("#<Music ", p);
Music* m = unsmob_music (s);
- scm_puts (classname (m),p);
- print_alist (m->mutable_property_alist_, p);
- print_alist (m->immutable_property_alist_, p);
+ SCM nm = m->get_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_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)
{
- Pitch *p = unsmob_pitch (get_mus_property ("pitch"));
- if (!p)
- return ;
+ SCM elt = get_property ("element");
- Pitch np = *p;
- np.transpose (delta);
-
- if (abs (np.alteration_) > 2)
- {
- warning (_f ("Transposition by %s makes accidental larger than two",
- delta.string ()));
- }
+ if (Music* m = unsmob_music (elt))
+ m->transpose (delta);
- set_mus_property ("pitch", np.smobbed_copy ());
+ transpose_music_list (get_property ("elements"), delta);
}
-IMPLEMENT_TYPE_P (Music, "music?");
+
+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)
}
void
-Music::internal_set_mus_property (SCM s, SCM v)
+Music::internal_set_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);
}
-
-
#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"));
+ Input *ip = unsmob_input (get_property ("origin"));
return ip ? ip : & dummy_input_global;
}
}
-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_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_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");
- 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,
+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__, "grob");
+ 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);
+ sc->internal_set_property (sym, val);
}
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.
+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 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 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 containing the mutable properties of @var{mus}.\n"
+ "The immutable properties are not available; they should be initialized\n"
+ "by the @code{make-music} 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,
+LY_DEFINE(ly_music_list_p,"ly: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)
}
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"));
+
+ SCM rv = scm_call_1 (make_music_proc, sym);
+
+ /*
+ UGH.
+ */
+ scm_gc_protect_object (rv);
+ return unsmob_music (rv);
+}
+