Run `make grand-replace'.

[lilypond.git] / lily / rhythmic-head.cc

diff --git a/lily/rhythmic-head.cc b/lily/rhythmic-head.cc
index b9bf752f71c5a50a0371df10b1912972aba055ce..1ea09cce717e1c93f7e379947bf2b2917719e7a0 100644 (file)
--- a/lily/rhythmic-head.cc
+++ b/lily/rhythmic-head.cc
@@ -3,56 +3,56 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "rhythmic-head.hh"
-#include "debug.hh"
+
+#include "warn.hh"
 #include "rest.hh"
 #include "stem.hh"
 #include "staff-symbol-referencer.hh"
 #include "item.hh"
 
-
-Item*
-Rhythmic_head::dots_l (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);
 }
 
-int
-Rhythmic_head::balltype_i (Grob*me) 
+Item *
+Rhythmic_head::get_stem (Grob *me)
 {
-  SCM s = me->get_grob_property ("duration-log");
-  return gh_number_p (s) ? gh_scm2int (s) <? 2 : 0;
-}
-
-Item*
-Rhythmic_head::stem_l (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 dots_l (me)
-    ? gh_scm2int (dots_l (me)->get_grob_property ("dot-count")) : 0;
+  return get_dots (me)
+    ? scm_to_int (get_dots (me)->get_property ("dot-count")) : 0;
 }
 
 void
-Rhythmic_head::set_dots (Grob*me,Item *dot_l)
+Rhythmic_head::set_dots (Grob *me, Item *dot)
 {
-  me->set_grob_property ("dot", dot_l->self_scm ());
+  me->set_object ("dot", dot->self_scm ());
 }
 
+int
+Rhythmic_head::duration_log (Grob *me)
+{
+  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 "
+              );