(Vertical spacing):

[lilypond.git] / lily / part-combine-iterator.cc

diff --git a/lily/part-combine-iterator.cc b/lily/part-combine-iterator.cc
index a40151ee1566d1fed6200b866485230a704f1a36..0afb18d819d0b1f0f52b813754a760cba1d5b4b5 100644 (file)
--- a/lily/part-combine-iterator.cc
+++ b/lily/part-combine-iterator.cc
@@ -370,7 +370,7 @@ Part_combine_iterator::process (Moment m)
   Moment now = get_outlet ()->now_mom ();
   Moment *splitm = 0;
   
-  for (; is_pair (split_list_); split_list_ = ly_cdr (split_list_))
+  for (; ly_c_pair_p (split_list_); split_list_ = ly_cdr (split_list_))
     {
       splitm = unsmob_moment (ly_caar (split_list_));
       if (splitm && *splitm + start_moment_ > now)
@@ -392,10 +392,10 @@ Part_combine_iterator::process (Moment m)
        solo1 ();
       else if (tag == ly_symbol2scm ("solo2"))
        solo2 ();
-      else if (is_symbol (tag))
+      else if (ly_c_symbol_p (tag))
        {
          String s =  "Unknown split directive: "
-           + (is_symbol (tag) ? ly_symbol2string (tag) : String ("not a symbol")); 
+           + (ly_c_symbol_p (tag) ? ly_symbol2string (tag) : String ("not a symbol")); 
          programming_error (s);
        }
     }