* lily/paper-outputter.cc (output_expr):

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

diff --git a/lily/rhythmic-head.cc b/lily/rhythmic-head.cc
index b9bf752f71c5a50a0371df10b1912972aba055ce..02ed3bd664bf15f27611cdd833aebf537d7f29a5 100644 (file)
--- a/lily/rhythmic-head.cc
+++ b/lily/rhythmic-head.cc
@@ -3,11 +3,11 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "rhythmic-head.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "rest.hh"
 #include "stem.hh"
 #include "staff-symbol-referencer.hh"
@@ -15,42 +15,38 @@
 
 
 Item*
-Rhythmic_head::dots_l (Grob*me) 
+Rhythmic_head::get_dots (Grob*me) 
 {
-  SCM s = me->get_grob_property ("dot");
+  SCM s = me->get_property ("dot");
   return unsmob_item (s);
 }
 
-int
-Rhythmic_head::balltype_i (Grob*me) 
-{
-  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) 
+Rhythmic_head::get_stem (Grob*me) 
 {
-  SCM s = me->get_grob_property ("stem");
+  SCM s = me->get_property ("stem");
   return unsmob_item (s);
 }
 
 int
 Rhythmic_head::dot_count (Grob*me) 
 {
-  return dots_l (me)
-    ? gh_scm2int (dots_l (me)->get_grob_property ("dot-count")) : 0;
+  return get_dots (me)
+    ? gh_scm2int (get_dots (me)->get_property ("dot-count")) : 0;
 }
 
 void
-Rhythmic_head::set_dots (Grob*me,Item *dot_l)
+Rhythmic_head::set_dots (Grob*me,Item *dot)
 {
-  me->set_grob_property ("dot", dot_l->self_scm ());
+  me->set_property ("dot", dot->self_scm ());
 }
 
-
-
-
+int
+Rhythmic_head::duration_log (Grob*me) 
+{
+  SCM s = me->get_property ("duration-log");
+  return gh_number_p (s) ? gh_scm2int (s) : 0;
+}
 
 ADD_INTERFACE (Rhythmic_head,"rhythmic-head-interface",
   "Note head or rest",