X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frhythmic-head.cc;h=02ed3bd664bf15f27611cdd833aebf537d7f29a5;hb=25645986aa3e8d999e901426932c539e8de6a1ca;hp=d329ca93e5e8755cc27ee1bbce906e801c4dcf9f;hpb=ad4297de0246935caa4c51f4e152e20009a6f64e;p=lilypond.git

diff --git a/lily/rhythmic-head.cc b/lily/rhythmic-head.cc
index d329ca93e5..02ed3bd664 100644
--- a/lily/rhythmic-head.cc
+++ b/lily/rhythmic-head.cc
@@ -1,78 +1,54 @@
 /*
-  rhythmic-head.cc -- implement 
+  rhythmic-head.cc -- implement Rhythmic_head
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 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 "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"
 
-void
-Rhythmic_head::do_add_processing ()
-{
-  if (dots_i_ && !dots_l_)
-    {
-      assert (false);
-    }
-  if (dots_l_)
-    {
-      dots_l_->dots_i_ = dots_i_;
-    }
-}
 
-void
-Rhythmic_head::do_post_processing ()
+Item*
+Rhythmic_head::get_dots (Grob*me) 
 {
-  if (dots_l_)
-    {
-      if (stem_l_)
-	dots_l_->resolve_dir_ = stem_l_->dir_;
-      dots_l_->position_i_ = position_i_;
-    }
+  SCM s = me->get_property ("dot");
+  return unsmob_item (s);
 }
 
-
-void
-Rhythmic_head::add_dots (Dots *dot_l)
+Item*
+Rhythmic_head::get_stem (Grob*me) 
 {
-  dots_l_ = dot_l;  
-  dot_l->add_dependency (this);  
+  SCM s = me->get_property ("stem");
+  return unsmob_item (s);
 }
 
-Rhythmic_head::Rhythmic_head ()
+int
+Rhythmic_head::dot_count (Grob*me) 
 {
-  dots_l_ =0;
-  balltype_i_ =0;
-  dots_i_ = 0;
-  stem_l_ =0;
-  position_i_ =0;
+  return get_dots (me)
+    ? gh_scm2int (get_dots (me)->get_property ("dot-count")) : 0;
 }
 
 void
-Rhythmic_head::do_substitute_element_pointer (Score_element*o,Score_element*n)
+Rhythmic_head::set_dots (Grob*me,Item *dot)
 {
-  if (o == dots_l_)
-    dots_l_ = dynamic_cast<Dots *> (n) ;
-  else if (o == stem_l_)
-    stem_l_ = dynamic_cast<Stem*>(n);
+  me->set_property ("dot", dot->self_scm ());
 }
 
-
-void
-Rhythmic_head::do_print () const
+int
+Rhythmic_head::duration_log (Grob*me) 
 {
-#ifndef NPRINT
-  DOUT << "balltype = "<< balltype_i_ << "dots = " << dots_i_;
-#endif
+  SCM s = me->get_property ("duration-log");
+  return gh_number_p (s) ? gh_scm2int (s) : 0;
 }
 
+ADD_INTERFACE (Rhythmic_head,"rhythmic-head-interface",
+  "Note head or rest",
+  "dot stem duration-log");
+