(LY_DEFINE): use Scheme style naming for

[lilypond.git] / lily / note-column.cc

diff --git a/lily/note-column.cc b/lily/note-column.cc
index 1d711642a3904dd02705e3893accdae81cfef020..84ac1db2dfbb5f2ca48183edafc1a0ff6b6ce8a2 100644 (file)
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -26,14 +26,14 @@
 bool
 Note_column::has_rests (Grob*me) 
 {
-  return unsmob_grob (me->get_grob_property ("rest"));
+  return unsmob_grob (me->get_property ("rest"));
 }
 
 int
 Note_column::shift_compare (Grob *const &p1, Grob *const&p2)
 {
-  SCM s1 = p1->get_grob_property ("horizontal-shift");
-  SCM s2 = p2->get_grob_property ("horizontal-shift");
+  SCM s1 = p1->get_property ("horizontal-shift");
+  SCM s2 = p2->get_property ("horizontal-shift");
 
   int h1 = (gh_number_p (s1))?  gh_scm2int (s1) :0;
   int h2 = (gh_number_p (s2)) ? gh_scm2int (s2):0;
@@ -43,7 +43,7 @@ Note_column::shift_compare (Grob *const &p1, Grob *const&p2)
 Item *
 Note_column::get_stem (Grob*me) 
 {
-  SCM s = me->get_grob_property ("stem");
+  SCM s = me->get_property ("stem");
   return  unsmob_item (s);
 }
   
@@ -54,7 +54,7 @@ Note_column::head_positions_interval (Grob *me)
 
   iv.set_empty ();
 
-  SCM h = me->get_grob_property ("note-heads");
+  SCM h = me->get_property ("note-heads");
   for (; gh_pair_p (h); h = ly_cdr (h))
     {
       Grob *se = unsmob_grob (ly_car (h));
@@ -68,10 +68,10 @@ Note_column::head_positions_interval (Grob *me)
 Direction
 Note_column::dir (Grob*  me)
 {
-  Grob *stem = unsmob_grob (me->get_grob_property ("stem"));
+  Grob *stem = unsmob_grob (me->get_property ("stem"));
   if (stem && Stem::has_interface (stem))
     return Stem::get_direction (stem);
-  else if (gh_pair_p (me->get_grob_property ("note-heads")))
+  else if (gh_pair_p (me->get_property ("note-heads")))
     return (Direction)sign (head_positions_interval (me).center ());
 
   programming_error ("Note column without heads and stem!");
@@ -82,7 +82,7 @@ Note_column::dir (Grob*  me)
 void
 Note_column::set_stem (Grob*me,Grob * stem)
 {
-  me->set_grob_property ("stem", stem->self_scm ());
+  me->set_property ("stem", stem->self_scm ());
   me->add_dependency (stem);
   Axis_group_interface::add_element (me, stem);
 }
@@ -91,7 +91,7 @@ Note_column::set_stem (Grob*me,Grob * stem)
 Grob*
 Note_column::get_rest (Grob*me)
 {
-  return unsmob_grob (me->get_grob_property ("rest"));
+  return unsmob_grob (me->get_property ("rest"));
 }
   
 void
@@ -100,14 +100,14 @@ Note_column::add_head (Grob*me,Grob *h)
   bool both = false;
   if (Rest::has_interface (h))
     {
-      if (gh_pair_p (me->get_grob_property ("note-heads")))
+      if (gh_pair_p (me->get_property ("note-heads")))
        both = true;
       else
-       me->set_grob_property ("rest", h->self_scm ());
+       me->set_property ("rest", h->self_scm ());
     }
   else if (Note_head::has_interface (h))
     {
-      if (unsmob_grob (me->get_grob_property ("rest")))
+      if (unsmob_grob (me->get_property ("rest")))
        both = true;
       Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-heads"),h);
     }
@@ -125,8 +125,8 @@ Note_column::add_head (Grob*me,Grob *h)
 void
 Note_column::translate_rests (Grob*me, int dy)
 {
-  Grob * r = unsmob_grob (me->get_grob_property ("rest"));
-  if (r && !gh_number_p (r->get_grob_property ("staff-position")))
+  Grob * r = unsmob_grob (me->get_property ("rest"));
+  if (r && !gh_number_p (r->get_property ("staff-position")))
     {
       r->translate_axis (dy * Staff_symbol_referencer::staff_space (r)/2.0, Y_AXIS);
     }
@@ -156,12 +156,12 @@ Note_column::first_head (Grob*me)
 Grob* 
 Note_column::accidentals (Grob *me)
 {
-  SCM heads = me->get_grob_property ("note-heads");
+  SCM heads = me->get_property ("note-heads");
   Grob * acc = 0;
   for (;gh_pair_p (heads); heads =gh_cdr (heads))
     {
       Grob * h = unsmob_grob (gh_car (heads));
-      acc = h ? unsmob_grob (h->get_grob_property ("accidental-grob")) : 0;
+      acc = h ? unsmob_grob (h->get_property ("accidental-grob")) : 0;
       if (acc)
        break;
     }