release: 1.5.29

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

diff --git a/lily/rhythmic-head.cc b/lily/rhythmic-head.cc
index ab9e7396dc53b2f37cdc66c6c6ff6972f3b393a4..16e482d957cffb52aa533ec62d66d9c2266b2495 100644 (file)
--- a/lily/rhythmic-head.cc
+++ b/lily/rhythmic-head.cc
@@ -1,66 +1,62 @@
 /*
-  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--2002 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 "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::dots_l (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_grob_property ("dot");
+  return unsmob_item (s);
 }
 
-void
-Rhythmic_head::add_dots (Dots *dot_l)
+int
+Rhythmic_head::balltype_i (Grob*me) 
 {
-  dots_l_ = dot_l;  
-  dot_l->add_dependency (this);  
+  SCM s = me->get_grob_property ("duration-log");
+  return gh_number_p (s) ? gh_scm2int (s) <? 2 : 0;
 }
 
+Item*
+Rhythmic_head::stem_l (Grob*me) 
+{
+  SCM s = me->get_grob_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;
+  return dots_l (me)
+    ? gh_scm2int (dots_l (me)->get_grob_property ("dot-count")) : 0;
 }
 
 void
-Rhythmic_head::do_substitute_dependent (Score_element*o,Score_element*n)
+Rhythmic_head::set_dots (Grob*me,Item *dot_l)
 {
-  if (o == dots_l_)
-    dots_l_ = n ? (Dots*)n->access_Item () :0;
+  me->set_grob_property ("dot", dot_l->self_scm ());
 }
 
-IMPLEMENT_IS_TYPE_B1(Rhythmic_head, Item);
+
 void
-Rhythmic_head::do_print () const
+Rhythmic_head::set_interface (Grob*me)
 {
-#ifndef NPRINT
-  DOUT << "balltype = "<< balltype_i_ << "dots = " << dots_i_;
-#endif
+  me->set_interface (ly_symbol2scm ("rhythmic-head-interface"));
 }
 
+bool
+Rhythmic_head::has_interface (Grob*me)
+{
+  return me &&  me->has_interface (ly_symbol2scm ("rhythmic-head-interface"));
+}