release: 1.5.29

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

diff --git a/lily/rhythmic-head.cc b/lily/rhythmic-head.cc
index 9c8cb00b501f354aa2bff6b427c8cb9380d331fd..16e482d957cffb52aa533ec62d66d9c2266b2495 100644 (file)
--- a/lily/rhythmic-head.cc
+++ b/lily/rhythmic-head.cc
@@ -3,65 +3,60 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 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 "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::dots_l (Grob*me) 
 {
-  SCM s = me->get_elt_property ("dot");
-  return dynamic_cast<Item*> (unsmob_element (s));
+  SCM s = me->get_grob_property ("dot");
+  return unsmob_item (s);
 }
 
 int
-Rhythmic_head::balltype_i (Score_element*me) 
+Rhythmic_head::balltype_i (Grob*me) 
 {
-  SCM s = me->get_elt_property ("duration-log");
-  
-  return gh_number_p (s) ? gh_scm2int (s) : 0;
+  SCM s = me->get_grob_property ("duration-log");
+  return gh_number_p (s) ? gh_scm2int (s) <? 2 : 0;
 }
 
 Item*
-Rhythmic_head::stem_l (Score_element*me) 
+Rhythmic_head::stem_l (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;
+    ? gh_scm2int (dots_l (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_l)
 {
-  me->set_elt_property ("dot", dot_l->self_scm_);
+  me->set_grob_property ("dot", dot_l->self_scm ());
 }
 
 
 void
-Rhythmic_head::set_interface (Score_element*me)
+Rhythmic_head::set_interface (Grob*me)
 {
   me->set_interface (ly_symbol2scm ("rhythmic-head-interface"));
 }
 
 bool
-Rhythmic_head::has_interface (Score_element*me)
+Rhythmic_head::has_interface (Grob*me)
 {
   return me &&  me->has_interface (ly_symbol2scm ("rhythmic-head-interface"));
 }