* buildscripts/guile-gnome.sh: Build without gcc libtool version

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

diff --git a/lily/note-column.cc b/lily/note-column.cc
index b4a0efa6d9d7ec54132d7edfd3b182d93da5e813..75117699b422f16d6ccad086c2e15d8f7fc05485 100644 (file)
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -11,7 +11,7 @@
 #include "note-column.hh"
 #include "stem.hh"
 #include "warn.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "group-interface.hh"
 #include "staff-symbol-referencer.hh"
 #include "rest.hh"
@@ -35,8 +35,8 @@ Note_column::shift_compare (Grob *const &p1, Grob *const&p2)
   SCM s1 = p1->get_property ("horizontal-shift");
   SCM s2 = p2->get_property ("horizontal-shift");
 
-  int h1 = (ly_number_p (s1))?  ly_scm2int (s1) :0;
-  int h2 = (ly_number_p (s2)) ? ly_scm2int (s2):0;
+  int h1 = (ly_c_number_p (s1))?  ly_scm2int (s1) :0;
+  int h2 = (ly_c_number_p (s2)) ? ly_scm2int (s2):0;
   return h1 - h2;
 }
 
@@ -55,7 +55,7 @@ Note_column::head_positions_interval (Grob *me)
   iv.set_empty ();
 
   SCM h = me->get_property ("note-heads");
-  for (; ly_pair_p (h); h = ly_cdr (h))
+  for (; ly_c_pair_p (h); h = ly_cdr (h))
     {
       Grob *se = unsmob_grob (ly_car (h));
       
@@ -71,7 +71,7 @@ Note_column::dir (Grob*  me)
   Grob *stem = unsmob_grob (me->get_property ("stem"));
   if (stem && Stem::has_interface (stem))
     return Stem::get_direction (stem);
-  else if (ly_pair_p (me->get_property ("note-heads")))
+  else if (ly_c_pair_p (me->get_property ("note-heads")))
     return (Direction)sign (head_positions_interval (me).center ());
 
   programming_error ("Note column without heads and stem!");
@@ -100,7 +100,7 @@ Note_column::add_head (Grob*me,Grob *h)
   bool both = false;
   if (Rest::has_interface (h))
     {
-      if (ly_pair_p (me->get_property ("note-heads")))
+      if (ly_c_pair_p (me->get_property ("note-heads")))
        both = true;
       else
        me->set_property ("rest", h->self_scm ());
@@ -126,7 +126,7 @@ void
 Note_column::translate_rests (Grob*me, int dy)
 {
   Grob * r = unsmob_grob (me->get_property ("rest"));
-  if (r && !ly_number_p (r->get_property ("staff-position")))
+  if (r && !ly_c_number_p (r->get_property ("staff-position")))
     {
       r->translate_axis (dy * Staff_symbol_referencer::staff_space (r)/2.0, Y_AXIS);
     }
@@ -158,7 +158,7 @@ Note_column::accidentals (Grob *me)
 {
   SCM heads = me->get_property ("note-heads");
   Grob * acc = 0;
-  for (;ly_pair_p (heads); heads =ly_cdr (heads))
+  for (;ly_c_pair_p (heads); heads =ly_cdr (heads))
     {
       Grob * h = unsmob_grob (ly_car (heads));
       acc = h ? unsmob_grob (h->get_property ("accidental-grob")) : 0;