X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frhythmic-head.cc;h=7c177452cf290383e9ee96f6086d596e785ce119;hb=34e6d3d79f3b5fc6188a20f9a2a5c0d34b2c81c8;hp=2f1a10197d4be7a4586e8f3952ae5ebcf6968943;hpb=1a71119277d04b287b3a976c526adba6500239c6;p=lilypond.git

diff --git a/lily/rhythmic-head.cc b/lily/rhythmic-head.cc
index 2f1a10197d..7c177452cf 100644
--- a/lily/rhythmic-head.cc
+++ b/lily/rhythmic-head.cc
@@ -3,82 +3,52 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 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"
 
-
-
-int
-Rhythmic_head::dots_i () const
-{
-  return dots_l_ ? dots_l_->dots_i_ : 0;
-}
-  
-void
-Rhythmic_head::do_post_processing ()
+Item *
+Rhythmic_head::get_dots (Grob *me)
 {
-  if (dots_l_)
-    {
-      dots_l_->position_i_ = int (position_f ());
-    }
+  SCM s = me->get_property ("dot");
+  return unsmob_item (s);
 }
 
-void
-Rhythmic_head::do_pre_processing ()
+Item *
+Rhythmic_head::get_stem (Grob *me)
 {
-  translate_axis (position_i_ * staff_line_leading_f () /2.0, Y_AXIS);
-  position_i_ = 0;
+  SCM s = me->get_property ("stem");
+  return unsmob_item (s);
 }
 
-Real
-Rhythmic_head::position_f () const
+int
+Rhythmic_head::dot_count (Grob *me)
 {
-  return position_i_ +  Staff_symbol_referencer::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)
 {
-  dots_l_ = dot_l;  
-  dot_l->add_dependency (this);  
+  me->set_property ("dot", dot->self_scm ());
 }
 
-Rhythmic_head::Rhythmic_head ()
-{
-  dots_l_ =0;
-  balltype_i_ =0;
-  stem_l_ =0;
-  position_i_ =0;
-}
-
-void
-Rhythmic_head::do_substitute_element_pointer (Score_element*o,Score_element*n)
+int
+Rhythmic_head::duration_log (Grob *me)
 {
-  Staff_symbol_referencer::do_substitute_element_pointer (o,n);
-  if (o == dots_l_)
-    dots_l_ = dynamic_cast<Dots *> (n) ;
-  else if (o == stem_l_)
-    stem_l_ = dynamic_cast<Stem*>(n);
+  SCM s = me->get_property ("duration-log");
+  return scm_is_number (s) ? scm_to_int (s) : 0;
 }
 
-
-void
-Rhythmic_head::do_print () const
-{
-#ifndef NPRINT
-  DEBUG_OUT << "balltype = "<< balltype_i_ << "dots = " << dots_i ();
-#endif
-}
+ADD_INTERFACE (Rhythmic_head, "rhythmic-head-interface",
+	       "Note head or rest",
+	       "dot stem duration-log");