* lily/ambitus-engraver.cc (create_ambitus): change name to

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

diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc
index ff044d676ef7aa04a263681ca2a4757e33fdb5d9..8aab99bc4fa19410f4cd280b988055f8baa81fc2 100644 (file)
--- a/lily/simple-spacer.cc
+++ b/lily/simple-spacer.cc
@@ -212,10 +212,10 @@ Simple_spacer::my_solve_natural_len ()
 void
 Simple_spacer::add_columns (Link_array<Grob> const &icols)
 {
-  Link_array<Grob> cols(icols);
+  Link_array<Grob> cols (icols);
   
   for (int i =  cols.size (); i--;)
-    if (gh_pair_p (cols[i]->get_grob_property ("between-cols")))
+    if (ly_c_pair_p (cols[i]->get_property ("between-cols")))
       {
        loose_cols_.push (cols[i]);
        cols.del (i);
@@ -226,8 +226,8 @@ Simple_spacer::add_columns (Link_array<Grob> const &icols)
     {
       Spring_smob *spring = 0;
 
-      for (SCM s = cols[i]->get_grob_property ("ideal-distances");
-          !spring && gh_pair_p (s);
+      for (SCM s = cols[i]->get_property ("ideal-distances");
+          !spring && ly_c_pair_p (s);
           s = ly_cdr (s))
        {
          Spring_smob *sp = unsmob_spring (ly_car (s));
@@ -245,7 +245,7 @@ Simple_spacer::add_columns (Link_array<Grob> const &icols)
        }
       else
        {
-         programming_error (_f("No spring between column %d and next one",
+         programming_error (_f ("No spring between column %d and next one",
                                Paper_column::get_rank (cols[i])
                                ));
          desc.hooke_ = 1.0;
@@ -254,7 +254,7 @@ Simple_spacer::add_columns (Link_array<Grob> const &icols)
          continue;
        }
 
-      if (!desc.sane_b ())
+      if (!desc.is_sane ())
        {
          programming_error ("Insane spring found. Setting to unit spring.");
 
@@ -285,13 +285,13 @@ Simple_spacer::add_columns (Link_array<Grob> const &icols)
   for (int i=0; i < cols.size () - 1; i++)
     {
       for (SCM s = Spaceable_grob::get_minimum_distances (cols[i]);
-          gh_pair_p (s); s = ly_cdr (s))
+          ly_c_pair_p (s); s = ly_cdr (s))
        {
          Grob * other = unsmob_grob (ly_caar (s));
          int oi = cols.find_index (other);
          if (oi >= 0)
            {
-             add_rod (i, oi, gh_scm2double (ly_cdar (s)));
+             add_rod (i, oi, ly_scm2double (ly_cdar (s)));
            }
        }
     }
@@ -368,12 +368,12 @@ Simple_spacer::solve (Column_x_positions *positions, bool ragged)
   int sz =  positions->cols_.size ();
   for (int i = sz; i--; )
     {
-      SCM p = positions->cols_[i]->get_grob_property( "penalty");
-      if (gh_number_p (p))
+      SCM p = positions->cols_[i]->get_property ( "penalty");
+      if (ly_c_number_p (p))
        {
-         if (gh_scm2double (p) < -9999)
+         if (ly_scm2double (p) < -9999)
            break_satisfy = break_satisfy && (i == 0 || i == sz -1);
-         if (gh_scm2double (p) > 9999)
+         if (ly_scm2double (p) > 9999)
            break_satisfy = break_satisfy && !(i == 0 || i == sz -1);
        }
       
@@ -395,7 +395,7 @@ Spring_description::Spring_description ()
 
 
 bool
-Spring_description::sane_b () const
+Spring_description::is_sane () const
 {
   return (hooke_ > 0) &&  !isinf (ideal_) && !isnan (ideal_);
 }