2003 -> 2004

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

diff --git a/lily/rhythmic-head.cc b/lily/rhythmic-head.cc
index 889b9112c7d907667b999e33c0bc4602c49402ac..977777f98be05feae62988e8172d8c37d6eb19fc 100644 (file)
--- a/lily/rhythmic-head.cc
+++ b/lily/rhythmic-head.cc
@@ -3,11 +3,11 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "rhythmic-head.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "rest.hh"
 #include "stem.hh"
 #include "staff-symbol-referencer.hh"
@@ -15,21 +15,14 @@
 
 
 Item*
-Rhythmic_head::dots_l (Grob*me) 
+Rhythmic_head::get_dots (Grob*me) 
 {
   SCM s = me->get_grob_property ("dot");
   return unsmob_item (s);
 }
 
-int
-Rhythmic_head::balltype_i (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) 
+Rhythmic_head::get_stem (Grob*me) 
 {
   SCM s = me->get_grob_property ("stem");
   return unsmob_item (s);
@@ -38,25 +31,28 @@ Rhythmic_head::stem_l (Grob*me)
 int
 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)
+    ? gh_scm2int (get_dots (me)->get_grob_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_grob_property ("dot", dot->self_scm ());
 }
 
 
-void
-Rhythmic_head::set_interface (Grob*me)
-{
-  me->set_interface (ly_symbol2scm ("rhythmic-head-interface"));
-}
 
-bool
-Rhythmic_head::has_interface (Grob*me)
+int
+Rhythmic_head::duration_log (Grob*me) 
 {
-  return me &&  me->has_interface (ly_symbol2scm ("rhythmic-head-interface"));
+  SCM s = me->get_grob_property ("duration-log");
+  return gh_number_p (s) ? gh_scm2int (s) : 0;
 }
+
+
+
+ADD_INTERFACE (Rhythmic_head,"rhythmic-head-interface",
+  "Note head or rest",
+  "dot stem duration-log");
+