X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frhythmic-head.cc;h=1030f5e13bba3fa46988966a4499791b3b5732fe;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=9e354bde2f0e4108e337be94bc8766019620f418;hpb=163503e56aa0c03d41d37fd083bdb96a6a473a11;p=lilypond.git

diff --git a/lily/rhythmic-head.cc b/lily/rhythmic-head.cc
index 9e354bde2f..1030f5e13b 100644
--- a/lily/rhythmic-head.cc
+++ b/lily/rhythmic-head.cc
@@ -1,69 +1,70 @@
 /*
-  rhythmic-head.cc -- implement Rhythmic_head
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 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 "stem.hh"
 #include "staff-symbol-referencer.hh"
+#include "stem.hh"
+#include "warn.hh"
 
-
-Dots*
-Rhythmic_head::dots_l () const
-{
-  SCM s = get_elt_property ("dot");
-  return dynamic_cast<Dots*> (unsmob_element (s));
-}
-
-int
-Rhythmic_head::balltype_i () const
+Item *
+Rhythmic_head::get_dots (Grob *me)
 {
-  SCM s = get_elt_property ("duration-log");
-  
-  return gh_number_p (s) ? gh_scm2int (s) : 0;
+  SCM s = me->get_object ("dot");
+  return Item::unsmob (s);
 }
 
-Stem*
-Rhythmic_head::stem_l () const
+Item *
+Rhythmic_head::get_stem (Grob *me)
 {
-  SCM s = get_elt_property ("stem");
-  return dynamic_cast<Stem*> (unsmob_element (s));
+  SCM s = me->get_object ("stem");
+  return Item::unsmob (s);
 }
 
 int
-Rhythmic_head::dots_i () const
+Rhythmic_head::dot_count (Grob *me)
 {
-  return dots_l () ? dots_l ()->dots_i_ : 0;
+  return get_dots (me)
+         ? robust_scm2int (get_dots (me)->get_property ("dot-count"), 0) : 0;
 }
-  
+
 void
-Rhythmic_head::do_post_processing ()
+Rhythmic_head::set_dots (Grob *me, Item *dot)
 {
-  if (Dots *d = dots_l ())
-    {
-      Staff_symbol_referencer_interface si (d);
-      Staff_symbol_referencer_interface me (d);      
-      si.set_position(int (me.position_f ()));
-    }
+  me->set_object ("dot", dot->self_scm ());
 }
 
-
-void
-Rhythmic_head::add_dots (Dots *dot_l)
+int
+Rhythmic_head::duration_log (Grob *me)
 {
-  set_elt_property ("dot", dot_l->self_scm_);
-  dot_l->add_dependency (this);  
+  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 "
+              );