X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frhythmic-head.cc;h=f771c75edc910e727b5d44eaa220d0608b3caaff;hb=545a684c5a5022121695b3d77c20fc5ca053dafb;hp=56861ca32fe989f4b32d2856731a57110efe375e;hpb=c5402461ab1d1cdbaa684b0e55d4851f0e28e37a;p=lilypond.git

diff --git a/lily/rhythmic-head.cc b/lily/rhythmic-head.cc
index 56861ca32f..f771c75edc 100644
--- a/lily/rhythmic-head.cc
+++ b/lily/rhythmic-head.cc
@@ -3,66 +3,59 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "rhythmic-head.hh"
-#include "debug.hh"
-#include "molecule.hh"
-#include "paper-def.hh"
-#include "font-metric.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::get_dots (Grob *me)
+{
+  SCM s = me->get_object ("dot");
+  return unsmob_item (s);
+}
 
-Item*
-Rhythmic_head::dots_l (Score_element*me) 
+Item *
+Rhythmic_head::get_stem (Grob *me)
 {
-  SCM s = me->get_elt_property ("dot");
-  return dynamic_cast<Item*> (unsmob_element (s));
+  SCM s = me->get_object ("stem");
+  return unsmob_item (s);
 }
 
 int
-Rhythmic_head::balltype_i (Score_element*me) 
+Rhythmic_head::dot_count (Grob *me)
 {
-  SCM s = me->get_elt_property ("duration-log");
-  
-  return gh_number_p (s) ? gh_scm2int (s) : 0;
+  return get_dots (me)
+    ? scm_to_int (get_dots (me)->get_property ("dot-count")) : 0;
 }
 
-Item*
-Rhythmic_head::stem_l (Score_element*me) 
+void
+Rhythmic_head::set_dots (Grob *me, Item *dot)
 {
-  SCM s = me->get_elt_property ("stem");
-  return dynamic_cast<Item*> (unsmob_element (s));
+  me->set_object ("dot", dot->self_scm ());
 }
 
 int
-Rhythmic_head::dot_count (Score_element*me) 
+Rhythmic_head::duration_log (Grob *me)
 {
-  return dots_l (me)
-    ? gh_scm2int (dots_l (me)->get_elt_property ("dot-count")) : 0;
+  SCM s = me->get_property ("duration-log");
+  return scm_is_number (s) ? scm_to_int (s) : 0;
 }
 
-void
-Rhythmic_head::set_dots (Score_element*me,Item *dot_l)
-{
-  me->set_elt_property ("dot", dot_l->self_scm ());
-}
+ADD_INTERFACE (Rhythmic_head,
 
+	       "rhythmic-head-interface",
 
-void
-Rhythmic_head::set_interface (Score_element*me)
-{
-  me->set_interface (ly_symbol2scm ("rhythmic-head-interface"));
-}
+	       "Note head or rest",
+	       
+	       "dot "
+	       "duration-log "
+	       "stem "
+	       );
 
-bool
-Rhythmic_head::has_interface (Score_element*me)
-{
-  return me &&  me->has_interface (ly_symbol2scm ("rhythmic-head-interface"));
-}