release: 1.5.13

[lilypond.git] / lily / simple-spacer.cc

diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc
index 9a28be14cab856a77e1bc743723301cad2315ed4..e787fd091b92ae0c7f3ff31e721c5ec7d156814f 100644 (file)
--- a/lily/simple-spacer.cc
+++ b/lily/simple-spacer.cc
@@ -182,11 +182,11 @@ Simple_spacer::add_columns (Link_array<Grob> cols)
           !gh_pair_p (spring_params) && gh_pair_p (s);
           s = ly_cdr (s))
        {
-         Grob *other = unsmob_grob (gh_caar (s));
+         Grob *other = unsmob_grob (ly_caar (s));
          if (other != cols[i+1])
            continue;
 
-         spring_params = gh_cdar (s);
+         spring_params = ly_cdar (s);
        }
 
       Spring_description desc;
@@ -223,11 +223,11 @@ Simple_spacer::add_columns (Link_array<Grob> cols)
       for (SCM s = Spaceable_grob::get_minimum_distances (cols[i]);
           gh_pair_p (s); s = ly_cdr (s))
        {
-         Grob * other = unsmob_grob (gh_caar (s));
+         Grob * other = unsmob_grob (ly_caar (s));
          int oi = cols.find_i (other);
          if (oi >= 0)
            {
-             add_rod (i, oi, gh_scm2double (gh_cdar (s)));
+             add_rod (i, oi, gh_scm2double (ly_cdar (s)));
            }
        }
     }