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

[lilypond.git] / lily / quote-iterator.cc

diff --git a/lily/quote-iterator.cc b/lily/quote-iterator.cc
index 0dc72104854192d25f9d84cf80fec49302307f0f..6ebbe296cd1814c91d8cb8313a9feda4aa56957d 100644 (file)
--- a/lily/quote-iterator.cc
+++ b/lily/quote-iterator.cc
@@ -72,7 +72,7 @@ binsearch_scm_vector (SCM vec, SCM key, bool (*is_less)(SCM a,SCM b))
   {
     int cmp = (lo + hi) / 2;
 
-      SCM when = gh_caar (SCM_VECTOR_REF (vec, cmp));
+      SCM when = ly_caar (SCM_VECTOR_REF (vec, cmp));
       bool result =  (*is_less) (key, when);
       if (result)
           hi = cmp;
@@ -100,7 +100,7 @@ Quote_iterator::construct_children ()
   start_moment_ = now;
   event_vector_ = get_music ()->get_property ("quoted-events");
 
-  if (gh_vector_p (event_vector_))
+  if (ly_vector_p (event_vector_))
     {
       event_idx_ = binsearch_scm_vector (event_vector_, now.smobbed_copy (), &moment_less);
       end_idx_ = binsearch_scm_vector (event_vector_, stop.smobbed_copy (), &moment_less);
@@ -119,7 +119,7 @@ Moment
 Quote_iterator::pending_moment () const
 {
   SCM entry = SCM_VECTOR_REF (event_vector_, event_idx_);
-  return *unsmob_moment (gh_caar (entry)) - start_moment_;
+  return *unsmob_moment (ly_caar (entry)) - start_moment_;
 }
 
 
@@ -133,7 +133,7 @@ Quote_iterator::process (Moment m)
     {
       entry = SCM_VECTOR_REF (event_vector_, event_idx_);
 
-      Moment em = *unsmob_moment (gh_caar (entry));
+      Moment em = *unsmob_moment (ly_caar (entry));
 
       if (em > m)
        return ;
@@ -144,17 +144,17 @@ Quote_iterator::process (Moment m)
       event_idx_++;
     }
 
-  if (gh_pair_p (entry))
+  if (ly_pair_p (entry))
     {
-      Pitch * quote_pitch = unsmob_pitch (gh_cdar (entry));
+      Pitch * quote_pitch = unsmob_pitch (ly_cdar (entry));
       Pitch * me_pitch = unsmob_pitch (get_outlet ()->get_property ("instrumentTransposition"));
       
-      for (SCM s = gh_cdr (entry); gh_pair_p (s); s = gh_cdr (s))
+      for (SCM s = ly_cdr (entry); ly_pair_p (s); s = ly_cdr (s))
        {
-         SCM ev_acc = gh_car (s);
+         SCM ev_acc = ly_car (s);
 
 
-         Music * mus = unsmob_music (gh_car (ev_acc));
+         Music * mus = unsmob_music (ly_car (ev_acc));
          if (mus)
            {
              if (quote_pitch || me_pitch)
@@ -169,7 +169,7 @@ Quote_iterator::process (Moment m)
 
                  SCM copy = ly_deep_mus_copy (mus->self_scm ());
                  mus = unsmob_music (copy);
-                 transposed_musics_ = gh_cons (copy, transposed_musics_);
+                 transposed_musics_ = scm_cons (copy, transposed_musics_);
                  
                  mus->transpose (diff);
                }