X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frhythmic-head.cc;h=93349e06fee49a6e50c789a4cbccf202680e23f0;hb=9e7b53f94e1e3bd7b3f7a14ba11a6cae6c8e9a73;hp=e887235cbfdb124dae5ae6ea3a883934baa69a4c;hpb=ae58654e4a30248bf2db4b42b3e8f4ea2652ab95;p=lilypond.git

diff --git a/lily/rhythmic-head.cc b/lily/rhythmic-head.cc
index e887235cbf..93349e06fe 100644
--- a/lily/rhythmic-head.cc
+++ b/lily/rhythmic-head.cc
@@ -3,52 +3,57 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #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",
+	       
+	       "dot "
+	       "duration-log "
+	       "stem "
+	       );