release: 1.3.4

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

diff --git a/lily/rhythmic-head.cc b/lily/rhythmic-head.cc
index 99e2f526804ffef93c3a98c70959f4fa8a440b6f..0698b0c3cf2578626f19e5926c92ad06fff8d5db 100644 (file)
--- a/lily/rhythmic-head.cc
+++ b/lily/rhythmic-head.cc
@@ -1,9 +1,9 @@
 /*
-  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@stack.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "rhythmic-head.hh"
@@ -14,53 +14,57 @@
 #include "rest.hh"
 #include "dots.hh"
 #include "axis-group-element.hh"
-#include "p-score.hh"
+#include "paper-score.hh"
+#include "stem.hh"
 
+
+
+int
+Rhythmic_head::dots_i () const
+{
+  return dots_l_ ? dots_l_->dots_i_ : 0;
+}
+  
 void
-Rhythmic_head::do_add_processing ()
+Rhythmic_head::do_post_processing ()
 {
-  if (dots_i_ && !dots_l_)
-    {
-      Dots *d = new Dots;
-      add (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_;
+      dots_l_->set_position(int (position_f ()));
     }
 }
 
+
 void
-Rhythmic_head::add (Dots *dot_l)
+Rhythmic_head::add_dots (Dots *dot_l)
 {
   dots_l_ = dot_l;  
   dot_l->add_dependency (this);  
 }
 
-
 Rhythmic_head::Rhythmic_head ()
 {
   dots_l_ =0;
   balltype_i_ =0;
-  dots_i_ = 0;
+  stem_l_ =0;
 }
 
 void
-Rhythmic_head::do_substitute_dependent (Score_elem*o,Score_elem*n)
+Rhythmic_head::do_substitute_element_pointer (Score_element*o,Score_element*n)
 {
+  Staff_symbol_referencer::do_substitute_element_pointer (o,n);
   if (o == dots_l_)
-    dots_l_ = n ? (Dots*)n->item () :0;
+    dots_l_ = dynamic_cast<Dots *> (n) ;
+  else if (o == stem_l_)
+    stem_l_ = dynamic_cast<Stem*>(n);
 }
 
-IMPLEMENT_IS_TYPE_B1(Rhythmic_head, Item);
+
 void
 Rhythmic_head::do_print () const
 {
 #ifndef NPRINT
-  DOUT << "balltype = "<< balltype_i_ << "dots = " << dots_i_;
+  DEBUG_OUT << "balltype = "<< balltype_i_ << "dots = " << dots_i ();
 #endif
 }