release: 1.3.110

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

diff --git a/lily/rhythmic-head.cc b/lily/rhythmic-head.cc
index b6a83b6d438ca5a33b91d0ebaebff7874ba391f5..d3ac1a48677b4c1c9550add9734712f4e73589be 100644 (file)
--- a/lily/rhythmic-head.cc
+++ b/lily/rhythmic-head.cc
@@ -8,69 +8,56 @@
 
 #include "rhythmic-head.hh"
 #include "debug.hh"
-#include "molecule.hh"
-#include "paper-def.hh"
-#include "lookup.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::dots_l (Grob*me) 
 {
-  SCM s = get_elt_pointer ("dot");
-  return dynamic_cast<Dots*> (unsmob_element (s));
+  SCM s = me->get_grob_property ("dot");
+  return dynamic_cast<Item*> (unsmob_grob (s));
 }
 
 int
-Rhythmic_head::balltype_i () const
+Rhythmic_head::balltype_i (Grob*me) 
 {
-  SCM s = get_elt_property ("duration-log");
+  SCM s = me->get_grob_property ("duration-log");
   
   return gh_number_p (s) ? gh_scm2int (s) : 0;
 }
 
-Stem*
-Rhythmic_head::stem_l () const
+Item*
+Rhythmic_head::stem_l (Grob*me) 
 {
-  SCM s = get_elt_pointer ("stem");
-  return dynamic_cast<Stem*> (unsmob_element (s));
+  SCM s = me->get_grob_property ("stem");
+  return dynamic_cast<Item*> (unsmob_grob (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 dots_l (me)
+    ? gh_scm2int (dots_l (me)->get_grob_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::set_dots (Grob*me,Item *dot_l)
+{
+  me->set_grob_property ("dot", dot_l->self_scm ());
 }
 
 
 void
-Rhythmic_head::add_dots (Dots *dot_l)
+Rhythmic_head::set_interface (Grob*me)
 {
-  set_elt_pointer ("dot", dot_l->self_scm_);
-  dot_l->add_dependency (this);  
+  me->set_interface (ly_symbol2scm ("rhythmic-head-interface"));
 }
 
-
-Rhythmic_head::Rhythmic_head (SCM s)
-  : Item (s)
+bool
+Rhythmic_head::has_interface (Grob*me)
 {
+  return me &&  me->has_interface (ly_symbol2scm ("rhythmic-head-interface"));
 }