source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "input-smob.hh"
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_;
}
-Music::Music()
+Music::Music (SCM l)
{
- immutable_property_alist_ = 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;
{
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
+{
+ Moment m ;
+ return m;
+}
+
+void
+print_alist (SCM a, SCM port)
+{
+ 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*)
+Music::print_smob (SCM s, SCM p, scm_print_state*)
{
scm_puts ("#<Music ", p);
- scm_puts (classname(unsmob_music (s)),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_puts (">",p);
return 1;
}
void
-Music::transpose (Pitch )
+Music::transpose (Pitch)
{
}
+IMPLEMENT_TYPE_P (Music, "music?");
-IMPLEMENT_UNSMOB(Music,music);
-IMPLEMENT_SMOBS(Music);
-IMPLEMENT_DEFAULT_EQUAL_P(Music);
+IMPLEMENT_SMOBS (Music);
+IMPLEMENT_DEFAULT_EQUAL_P (Music);
/****************************/
SCM
Music::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);
+ return (s == SCM_BOOL_F) ? SCM_EOL : ly_cdr (s);
}
/*
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));
}
}
else
{
- warning (_("ly_get_mus_property (): Not a Music"));
+ warning (_ ("ly_get_mus_property (): Not a Music"));
scm_write (mus, scm_current_error_port ());
}
return SCM_EOL;
if (!gh_symbol_p (sym))
{
- warning (_("ly_set_mus_property (): Not a symbol"));
+ warning (_ ("ly_set_mus_property (): Not a symbol"));
scm_write (mus, scm_current_error_port ());
return SCM_UNSPECIFIED;
}
else
{
- warning (_("ly_set_mus_property (): not of type Music"));
+ warning (_ ("ly_set_mus_property (): not of type Music"));
scm_write (mus, scm_current_error_port ());
}
return SCM_UNSPECIFIED;
}
+
+// to do property args
+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 ());
+
+ return SCM_UNSPECIFIED;
+ }
+ else
+ {
+ SCM s = get_music (ly_scm2string (type))->self_scm ();
+ scm_gc_unprotect_object (s);
+ return s;
+ }
+}
+
+SCM
+ly_music_name (SCM mus)
+{
+ Music * m = unsmob_music (mus);
+ const char *nm ="";
+ if (!m)
+ {
+ warning (_ ("ly_music_name (): Not a music expression"));
+ scm_write (mus, scm_current_error_port ());
+ }
+ else
+ nm = classname (m);
+ return ly_str02scm (nm);
+}
+
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_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_SCM_INIT_FUNC (musicscm,init_functions);
+ADD_MUSIC(Music);