*** empty log message ***

[lilypond.git] / lily / staff-spacing.cc

diff --git a/lily/staff-spacing.cc b/lily/staff-spacing.cc
index 4e0e0497cfbe1a1008eb194684627ade2283ddee..6e4ba374c08ad8a69e12dda922357612ad398eb0 100644 (file)
--- a/lily/staff-spacing.cc
+++ b/lily/staff-spacing.cc
@@ -128,14 +128,14 @@ Staff_spacing::next_notes_correction (Grob *me, Grob * last_grob)
   Real max_corr =0.0;
 
   for (SCM s = me->get_property ("right-items");
-       ly_c_pair_p (s);  s = ly_cdr (s))
+       scm_is_pair (s);  s = scm_cdr (s))
     {
-      Grob * g = unsmob_grob (ly_car (s));
+      Grob * g = unsmob_grob (scm_car (s));
 
       max_corr = max_corr >?  next_note_correction (me, g,  bar_size);
       for (SCM t = g->get_property ("elements");
-          ly_c_pair_p (t); t  = ly_cdr (t))
-       max_corr = max_corr >? next_note_correction (me, unsmob_grob (ly_car (t)), bar_size);
+          scm_is_pair (t); t  = scm_cdr (t))
+       max_corr = max_corr >? next_note_correction (me, unsmob_grob (scm_car (t)), bar_size);
       
     }
   
@@ -152,9 +152,9 @@ Staff_spacing::get_spacing_params (Grob *me, Real * space, Real * fixed)
   Item * me_item  = dynamic_cast<Item*> (me);
     
   for (SCM s = me->get_property ("left-items");
-       ly_c_pair_p (s); s = ly_cdr (s))
+       scm_is_pair (s); s = scm_cdr (s))
     {
-      Grob * cand = unsmob_grob (ly_car (s));
+      Grob * cand = unsmob_grob (scm_car (s));
       if (cand && Separation_item::has_interface (cand))
        separation_item = cand ;
     }
@@ -197,20 +197,20 @@ Staff_spacing::get_spacing_params (Grob *me, Real * space, Real * fixed)
   if (me_item->break_status_dir () == CENTER)
     {
       SCM nndef = scm_sloppy_assq (ly_symbol2scm ("next-note"), alist);
-      if (ly_c_pair_p (nndef))
+      if (scm_is_pair (nndef))
        space_def = nndef;
     }
   
   
-  if (!ly_c_pair_p (space_def))
+  if (!scm_is_pair (space_def))
     {
       programming_error ("Unknown prefatory spacing. "); 
       return; 
     }
 
-  space_def = ly_cdr (space_def);
-  Real distance = scm_to_double (ly_cdr (space_def));
-  SCM type = ly_car (space_def) ;
+  space_def = scm_cdr (space_def);
+  Real distance = scm_to_double (scm_cdr (space_def));
+  SCM type = scm_car (space_def) ;
 
   *fixed = last_ext[RIGHT];
   if (type == ly_symbol2scm ("fixed-space"))