release: 1.2.12

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

diff --git a/lily/rhythmic-head.cc b/lily/rhythmic-head.cc
index e188abe59e590b39f476142243bebaabfe773584..2f1a10197d4be7a4586e8f3952ae5ebcf6968943 100644 (file)
--- a/lily/rhythmic-head.cc
+++ b/lily/rhythmic-head.cc
@@ -1,5 +1,5 @@
 /*
-  rhythmic-head.cc -- implement 
+  rhythmic-head.cc -- implement Rhythmic_head
 
   source file of the GNU LilyPond music typesetter
 
@@ -14,22 +14,40 @@
 #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_)
-    {
-      assert (false);
-    }
   if (dots_l_)
     {
-      dots_l_->no_dots_i_ = dots_i_;
+      dots_l_->position_i_ = int (position_f ());
     }
 }
 
+void
+Rhythmic_head::do_pre_processing ()
+{
+  translate_axis (position_i_ * staff_line_leading_f () /2.0, Y_AXIS);
+  position_i_ = 0;
+}
+
+Real
+Rhythmic_head::position_f () const
+{
+  return position_i_ +  Staff_symbol_referencer::position_f ();
+}
+
+
 void
 Rhythmic_head::add_dots (Dots *dot_l)
 {
@@ -37,18 +55,18 @@ Rhythmic_head::add_dots (Dots *dot_l)
   dot_l->add_dependency (this);  
 }
 
-
 Rhythmic_head::Rhythmic_head ()
 {
   dots_l_ =0;
   balltype_i_ =0;
-  dots_i_ = 0;
   stem_l_ =0;
+  position_i_ =0;
 }
 
 void
 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_ = dynamic_cast<Dots *> (n) ;
   else if (o == stem_l_)
@@ -60,7 +78,7 @@ void
 Rhythmic_head::do_print () const
 {
 #ifndef NPRINT
-  DOUT << "balltype = "<< balltype_i_ << "dots = " << dots_i_;
+  DEBUG_OUT << "balltype = "<< balltype_i_ << "dots = " << dots_i ();
 #endif
 }