X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frhythmic-head.cc;h=d1442794270318d6e31f5040d7ca410ff3c090ee;hb=0c9726a0d0093db2e31ec9ba80a7f9df150a5827;hp=3f4d67d74b484c74f698bdfd4f51f203a169cb80;hpb=61c4b07cddc6231c3ca4b45a0aa86d27e25110b9;p=lilypond.git

diff --git a/lily/rhythmic-head.cc b/lily/rhythmic-head.cc
index 3f4d67d74b..d144279427 100644
--- a/lily/rhythmic-head.cc
+++ b/lily/rhythmic-head.cc
@@ -1,76 +1,70 @@
 /*
-  rhythmic-head.cc -- implement 
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "rhythmic-head.hh"
-#include "debug.hh"
-#include "molecule.hh"
-#include "paper-def.hh"
-#include "lookup.hh"
+
+#include "item.hh"
 #include "rest.hh"
-#include "dots.hh"
-#include "axis-group-element.hh"
-#include "paper-score.hh"
+#include "staff-symbol-referencer.hh"
 #include "stem.hh"
+#include "warn.hh"
 
-void
-Rhythmic_head::do_add_processing ()
+Item *
+Rhythmic_head::get_dots (Grob *me)
 {
-  if (dots_i_ && !dots_l_)
-    {
-      assert (false);
-    }
-  if (dots_l_)
-    {
-      dots_l_->dots_i_ = dots_i_;
-    }
+  SCM s = me->get_object ("dot");
+  return unsmob_item (s);
 }
 
-void
-Rhythmic_head::do_post_processing ()
+Item *
+Rhythmic_head::get_stem (Grob *me)
 {
-  if (dots_l_)
-    {
-      dots_l_->position_i_ = position_i_;
-    }
+  SCM s = me->get_object ("stem");
+  return unsmob_item (s);
 }
 
-
-void
-Rhythmic_head::add_dots (Dots *dot_l)
+int
+Rhythmic_head::dot_count (Grob *me)
 {
-  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;
-  position_i_ =0;
+  return get_dots (me)
+         ? robust_scm2int (get_dots (me)->get_property ("dot-count"), 0) : 0;
 }
 
 void
-Rhythmic_head::do_substitute_element_pointer (Score_element*o,Score_element*n)
+Rhythmic_head::set_dots (Grob *me, Item *dot)
 {
-  if (o == dots_l_)
-    dots_l_ = dynamic_cast<Dots *> (n) ;
-  else if (o == stem_l_)
-    stem_l_ = dynamic_cast<Stem*>(n);
+  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.",
+
+               /* properties */
+               "dot "
+               "duration-log "
+               "glissando-skip "
+               "stem "
+              );