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

diff --git a/lily/rhythmic-head.cc b/lily/rhythmic-head.cc
index 171c93cb7b..f771c75edc 100644
--- a/lily/rhythmic-head.cc
+++ b/lily/rhythmic-head.cc
@@ -3,70 +3,59 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 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 "lookup.hh"
+
+#include "warn.hh"
 #include "rest.hh"
-#include "dots.hh"
-#include "axis-group-element.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_property ("dot");
-  return dynamic_cast<Dots*> (unsmob_element (s));
+  SCM s = me->get_object ("dot");
+  return unsmob_item (s);
 }
 
-Stem*
-Rhythmic_head::stem_l () const
+Item *
+Rhythmic_head::get_stem (Grob *me)
 {
-  SCM s = get_elt_property ("stem");
-  return dynamic_cast<Stem*> (unsmob_element (s));
+  SCM s = me->get_object ("stem");
+  return unsmob_item (s);
 }
 
 int
-Rhythmic_head::dots_i () const
-{
-  return dots_l () ? dots_l ()->dots_i_ : 0;
-}
-  
-void
-Rhythmic_head::do_post_processing ()
+Rhythmic_head::dot_count (Grob *me)
 {
-  if (dots_l ())
-    {
-      dots_l ()->set_position(int (position_f ()));
-    }
+  return get_dots (me)
+    ? scm_to_int (get_dots (me)->get_property ("dot-count")) : 0;
 }
 
-
 void
-Rhythmic_head::add_dots (Dots *dot_l)
+Rhythmic_head::set_dots (Grob *me, Item *dot)
 {
-  set_elt_property ("dot", dot_l->self_scm_);
-  dot_l->add_dependency (this);  
+  me->set_object ("dot", dot->self_scm ());
 }
 
-Rhythmic_head::Rhythmic_head ()
+int
+Rhythmic_head::duration_log (Grob *me)
 {
-  balltype_i_ =0;
+  SCM s = me->get_property ("duration-log");
+  return scm_is_number (s) ? scm_to_int (s) : 0;
 }
 
+ADD_INTERFACE (Rhythmic_head,
 
+	       "rhythmic-head-interface",
 
-void
-Rhythmic_head::do_print () const
-{
-#ifndef NPRINT
-  DEBUG_OUT << "balltype = "<< balltype_i_ << "dots = " << dots_i ();
-#endif
-}
+	       "Note head or rest",
+	       
+	       "dot "
+	       "duration-log "
+	       "stem "
+	       );