* lily/include/lily-guile.hh: many new ly_ functions. Thanks to

[lilypond.git] / lily / volta-engraver.cc

diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc
index d0bf95641940341f2635a16432e8a09aa7f4f47b..1dca3edef95cd832e333c9335d7937a720b0c22a 100644 (file)
--- a/lily/volta-engraver.cc
+++ b/lily/volta-engraver.cc
@@ -82,7 +82,7 @@ Volta_engraver::staff_eligible ()
        volta engraver in score context or somesuch.
        
       */
-      if (!gh_pair_p (staffs))
+      if (!ly_pair_p (staffs))
        {
          programming_error ("Huh? Volta engraver can't find staffs?");
          return false;
@@ -106,13 +106,13 @@ Volta_engraver::process_music ()
     
   bool  end = false;
   start_string_ = SCM_EOL;
-  while (gh_pair_p (cs))
+  while (ly_pair_p (cs))
     {
       SCM c = ly_car (cs);
 
-      if (gh_pair_p (c)
+      if (ly_pair_p (c)
          && ly_car (c) == ly_symbol2scm ("volta")
-         && gh_pair_p (ly_cdr (c)))
+         && ly_pair_p (ly_cdr (c)))
        {
          if (ly_cadr (c) ==  SCM_BOOL_F)
            end = true;
@@ -146,7 +146,7 @@ Volta_engraver::process_music ()
     }
 
   if (volta_span_ && 
-      (gh_string_p (start_string_) || gh_pair_p (start_string_)))
+      (ly_string_p (start_string_) || ly_pair_p (start_string_)))
     {
       warning (_ ("Already have a volta spanner.  Stopping that one prematurely."));
       
@@ -161,7 +161,7 @@ Volta_engraver::process_music ()
     }
 
   if (!volta_span_ && 
-      (gh_string_p (start_string_) || gh_pair_p (start_string_)))
+      (ly_string_p (start_string_) || ly_pair_p (start_string_)))
     {
       started_mom_ = now_mom () ;