X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frhythmic-head.cc;h=1ea09cce717e1c93f7e379947bf2b2917719e7a0;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=b6a83b6d438ca5a33b91d0ebaebff7874ba391f5;hpb=c21d49df60cb97801ab33ab8a1bad6f2c81cd820;p=lilypond.git

diff --git a/lily/rhythmic-head.cc b/lily/rhythmic-head.cc
index b6a83b6d43..1ea09cce71 100644
--- a/lily/rhythmic-head.cc
+++ b/lily/rhythmic-head.cc
@@ -3,74 +3,56 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.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"
 
-
-Dots*
-Rhythmic_head::dots_l () const
+Item *
+Rhythmic_head::get_dots (Grob *me)
 {
-  SCM s = get_elt_pointer ("dot");
-  return dynamic_cast<Dots*> (unsmob_element (s));
+  SCM s = me->get_object ("dot");
+  return unsmob_item (s);
 }
 
-int
-Rhythmic_head::balltype_i () const
+Item *
+Rhythmic_head::get_stem (Grob *me)
 {
-  SCM s = get_elt_property ("duration-log");
-  
-  return gh_number_p (s) ? gh_scm2int (s) : 0;
-}
-
-Stem*
-Rhythmic_head::stem_l () const
-{
-  SCM s = get_elt_pointer ("stem");
-  return dynamic_cast<Stem*> (unsmob_element (s));
+  SCM s = me->get_object ("stem");
+  return unsmob_item (s);
 }
 
 int
-Rhythmic_head::dot_count () const
+Rhythmic_head::dot_count (Grob *me)
 {
-  return dots_l ()
-    ? gh_scm2int (dots_l ()->get_elt_property ("dot-count")) : 0;
+  return get_dots (me)
+    ? scm_to_int (get_dots (me)->get_property ("dot-count")) : 0;
 }
-  
-GLUE_SCORE_ELEMENT(Rhythmic_head,after_line_breaking);
-SCM
-Rhythmic_head::member_after_line_breaking ()
-{
-  if (Dots *d = dots_l ())
-    {
-      Staff_symbol_referencer_interface si (d);
-      Staff_symbol_referencer_interface me (d);      
-      si.set_position(int (me.position_f ()));
-    }
-
-  return SCM_UNDEFINED;
-}
-
 
 void
-Rhythmic_head::add_dots (Dots *dot_l)
+Rhythmic_head::set_dots (Grob *me, Item *dot)
 {
-  set_elt_pointer ("dot", dot_l->self_scm_);
-  dot_l->add_dependency (this);  
+  me->set_object ("dot", dot->self_scm ());
 }
 
-
-Rhythmic_head::Rhythmic_head (SCM s)
-  : Item (s)
+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,
+	       "Note head or rest.",
+	       
+	       /* properties */
+	       "dot "
+	       "duration-log "
+	       "stem "
+	       );