X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frhythmic-head.cc;h=93349e06fee49a6e50c789a4cbccf202680e23f0;hb=f9214bac21e9926dc3248416f58190c98c4167a9;hp=b2c72a65dd24cace9f40cab956e021d2f55b299a;hpb=615a9212789c2cb2994748c023d0e19f3a83a0fd;p=lilypond.git

diff --git a/lily/rhythmic-head.cc b/lily/rhythmic-head.cc
index b2c72a65dd..93349e06fe 100644
--- a/lily/rhythmic-head.cc
+++ b/lily/rhythmic-head.cc
@@ -1,66 +1,59 @@
 /*
-  rhythmic-head.cc -- implement 
+  rhythmic-head.cc -- implement Rhythmic_head
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 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 "p-score.hh"
+#include "stem.hh"
+#include "staff-symbol-referencer.hh"
+#include "item.hh"
 
-void
-Rhythmic_head::do_add_processing ()
+Item *
+Rhythmic_head::get_dots (Grob *me)
 {
-  if (dots_i_ && !dots_l_)
-    {
-      Dots *d = new Dots;
-      add_dots (d);
-      pscore_l_->typeset_element (d);
-      axis_group_l_a_[Y_AXIS]->add_element (d);
-      axis_group_l_a_[X_AXIS]->add_element (d);
-    }
-  if (dots_l_)
-    {
-      dots_l_->no_dots_i_ = dots_i_;
-    }
+  SCM s = me->get_object ("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_object ("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;
+  return get_dots (me)
+    ? scm_to_int (get_dots (me)->get_property ("dot-count")) : 0;
 }
 
 void
-Rhythmic_head::do_substitute_dependent (Score_element*o,Score_element*n)
+Rhythmic_head::set_dots (Grob *me, Item *dot)
 {
-  if (o == dots_l_)
-    dots_l_ = n ? dynamic_cast<Dots *> (n) :0;
+  me->set_object ("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 scm_is_number (s) ? scm_to_int (s) : 0;
 }
 
+ADD_INTERFACE (Rhythmic_head,
+
+	       "Note head or rest",
+	       
+	       "dot "
+	       "duration-log "
+	       "stem "
+	       );
+