X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frhythmic-head.cc;h=9e07b8ceea305a567a72e35ea1b34088787cfe01;hb=42392675026a0d14bda19d0a279a6762e4e84cf4;hp=cf188631529d4b35566cb3265218bfa0139895bc;hpb=9c8bcb9a2a1fedb5459e593b18a8c550318e6800;p=lilypond.git

diff --git a/lily/rhythmic-head.cc b/lily/rhythmic-head.cc
index cf18863152..9e07b8ceea 100644
--- a/lily/rhythmic-head.cc
+++ b/lily/rhythmic-head.cc
@@ -3,66 +3,56 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "rhythmic-head.hh"
-#include "debug.hh"
-#include "molecule.hh"
-#include "paper-def.hh"
-#include "lookup.hh"
+#include "warn.hh"
 #include "rest.hh"
-#include "dots.hh"
-#include "paper-score.hh"
 #include "stem.hh"
 #include "staff-symbol-referencer.hh"
 #include "item.hh"
 
 
 Item*
-Rhythmic_head::dots_l (Score_element*me) 
+Rhythmic_head::get_dots (Grob*me) 
 {
-  SCM s = me->get_elt_property ("dot");
-  return dynamic_cast<Item*> (unsmob_element (s));
-}
-
-int
-Rhythmic_head::balltype_i (Score_element*me) 
-{
-  SCM s = me->get_elt_property ("duration-log");
-  
-  return gh_number_p (s) ? gh_scm2int (s) : 0;
+  SCM s = me->get_grob_property ("dot");
+  return unsmob_item (s);
 }
 
 Item*
-Rhythmic_head::stem_l (Score_element*me) 
+Rhythmic_head::get_stem (Grob*me) 
 {
-  SCM s = me->get_elt_property ("stem");
-  return dynamic_cast<Item*> (unsmob_element (s));
+  SCM s = me->get_grob_property ("stem");
+  return unsmob_item (s);
 }
 
 int
-Rhythmic_head::dot_count (Score_element*me) 
+Rhythmic_head::dot_count (Grob*me) 
 {
-  return dots_l (me)
-    ? gh_scm2int (dots_l (me)->get_elt_property ("dot-count")) : 0;
+  return get_dots (me)
+    ? gh_scm2int (get_dots (me)->get_grob_property ("dot-count")) : 0;
 }
 
 void
-Rhythmic_head::set_dots (Score_element*me,Item *dot_l)
+Rhythmic_head::set_dots (Grob*me,Item *dot)
 {
-  me->set_elt_property ("dot", dot_l->self_scm ());
+  me->set_grob_property ("dot", dot->self_scm ());
 }
 
 
-void
-Rhythmic_head::set_interface (Score_element*me)
-{
-  me->set_interface (ly_symbol2scm ("rhythmic-head-interface"));
-}
 
-bool
-Rhythmic_head::has_interface (Score_element*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");
+