*** empty log message ***

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

diff --git a/lily/sequential-iterator.cc b/lily/sequential-iterator.cc
index 9c88c4e88aa49e175da2763599e0aae5b4c2db27..d822c61b86f91b02d8361e2b377211dd5ee6d238 100644 (file)
--- a/lily/sequential-iterator.cc
+++ b/lily/sequential-iterator.cc
@@ -6,9 +6,10 @@
   (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "sequential-iterator.hh"
+
 #include "translator-group.hh"
 #include "context.hh"
-#include "sequential-iterator.hh"
 #include "music-list.hh"
 #include "grace-fixup.hh"
 
@@ -23,8 +24,8 @@
   Invariant for the data structure.
 
 
-  if (gh_pair_p (cursor_))
-    iter_->music_ == unsmob_music (ly_car (cursor_))
+  if (scm_is_pair (cursor_))
+    iter_->music_ == unsmob_music (scm_car (cursor_))
   else
     iter_ == 0;
 
@@ -85,9 +86,9 @@ create_grace_fixup_list (SCM cursor)
   Grace_fixup *head = 0;
   Grace_fixup **tail = &head;
 
-  for (; gh_pair_p (cursor); cursor = ly_cdr (cursor))
+  for (; scm_is_pair (cursor); cursor = scm_cdr (cursor))
     {
-      Music *mus = unsmob_music (ly_car (cursor));
+      Music *mus = unsmob_music (scm_car (cursor));
       Moment s = mus->start_mom ();
       Moment l = mus->get_length () - s;
 
@@ -123,9 +124,9 @@ Sequential_iterator::construct_children ()
   cursor_ = get_music_list ();
 
   iter_ = 0;
-  if (gh_pair_p (cursor_))
+  if (scm_is_pair (cursor_))
     {
-      Music *m = unsmob_music (ly_car (cursor_));
+      Music *m = unsmob_music (scm_car (cursor_));
       iter_ = unsmob_iterator (get_iterator (m));
     }
   
@@ -153,7 +154,7 @@ Sequential_iterator::construct_children ()
 void
 Sequential_iterator::next_element (bool)
 {
-  Moment len =iter_->music_get_length () - iter_->music_start_mom ();
+  Moment len = iter_->music_get_length () - iter_->music_start_mom ();
   assert (!grace_fixups_  || grace_fixups_->start_ >= here_mom_);
   
   if (len.main_part_
@@ -170,7 +171,7 @@ Sequential_iterator::next_element (bool)
   else if (len.grace_part_ && !len.main_part_)
     {
       last_mom_ = here_mom_;
-      here_mom_.grace_part_ =0;
+      here_mom_.grace_part_ = 0;
     }
   else
     {
@@ -185,11 +186,11 @@ Sequential_iterator::next_element (bool)
       here_mom_ += len;
     }
   
-  cursor_ = ly_cdr (cursor_);
+  cursor_ = scm_cdr (cursor_);
 
   iter_->quit ();
-  if (gh_pair_p (cursor_))
-    iter_ = unsmob_iterator (get_iterator (unsmob_music (ly_car (cursor_))));
+  if (scm_is_pair (cursor_))
+    iter_ = unsmob_iterator (get_iterator (unsmob_music (scm_car (cursor_))));
   else
     iter_ = 0;
 }