X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frhythmic-head.cc;h=1ea09cce717e1c93f7e379947bf2b2917719e7a0;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=9e07b8ceea305a567a72e35ea1b34088787cfe01;hpb=7aabfb20c46e0a1de41698ddc6859ccd3a6dea85;p=lilypond.git diff --git a/lily/rhythmic-head.cc b/lily/rhythmic-head.cc index 9e07b8ceea..1ea09cce71 100644 --- a/lily/rhythmic-head.cc +++ b/lily/rhythmic-head.cc @@ -3,56 +3,56 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2003 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys */ #include "rhythmic-head.hh" + #include "warn.hh" #include "rest.hh" #include "stem.hh" #include "staff-symbol-referencer.hh" #include "item.hh" - -Item* -Rhythmic_head::get_dots (Grob*me) +Item * +Rhythmic_head::get_dots (Grob *me) { - SCM s = me->get_grob_property ("dot"); + SCM s = me->get_object ("dot"); return unsmob_item (s); } -Item* -Rhythmic_head::get_stem (Grob*me) +Item * +Rhythmic_head::get_stem (Grob *me) { - SCM s = me->get_grob_property ("stem"); + SCM s = me->get_object ("stem"); return unsmob_item (s); } int -Rhythmic_head::dot_count (Grob*me) +Rhythmic_head::dot_count (Grob *me) { return get_dots (me) - ? gh_scm2int (get_dots (me)->get_grob_property ("dot-count")) : 0; + ? scm_to_int (get_dots (me)->get_property ("dot-count")) : 0; } void -Rhythmic_head::set_dots (Grob*me,Item *dot) +Rhythmic_head::set_dots (Grob *me, Item *dot) { - me->set_grob_property ("dot", dot->self_scm ()); + me->set_object ("dot", dot->self_scm ()); } - - int -Rhythmic_head::duration_log (Grob*me) +Rhythmic_head::duration_log (Grob *me) { - SCM s = me->get_grob_property ("duration-log"); - return gh_number_p (s) ? gh_scm2int (s) : 0; + SCM s = me->get_property ("duration-log"); + return scm_is_number (s) ? scm_to_int (s) : 0; } - - -ADD_INTERFACE (Rhythmic_head,"rhythmic-head-interface", - "Note head or rest", - "dot stem duration-log"); - +ADD_INTERFACE (Rhythmic_head, + "Note head or rest.", + + /* properties */ + "dot " + "duration-log " + "stem " + );