X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-sequence.cc;h=90b5258f1dc915a52b1d77d5dd0d5fa8c30e4fd7;hb=dcf803f51a8621e64670930f89e9e02d845fe598;hp=47927f6cb90244c8851144d09f79e1454573b28c;hpb=a78c70be8951804126d19eb74b344ae1858023e5;p=lilypond.git

diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc
index 47927f6cb9..90b5258f1d 100644
--- a/lily/music-sequence.cc
+++ b/lily/music-sequence.cc
@@ -3,41 +3,18 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "music-list.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "pitch.hh"
-
-
-void
-Music_sequence::truncate (int k)
-{
-  SCM l = get_mus_property ("elements");
-  if (k == 0)
-    {
-      l = SCM_EOL;
-    }
-  else
-    {
-      SCM s = l;
-      k--;
-      for (; gh_pair_p (s) && k--; s = gh_cdr (s))
-	;
-
-      if (gh_pair_p (s))
-	{
-	  gh_set_cdr_x (s, SCM_EOL);
-	}
-    }
-  set_mus_property ("elements", l);
-}
+#include "input.hh"
 
 SCM
 Music_sequence::music_list ()const
 {
-  return get_mus_property ("elements");
+  return get_property ("elements");
 }
 
 /*
@@ -46,135 +23,114 @@ Music_sequence::music_list ()const
 void
 Music_sequence::append_music (Music *m)
 {
-  set_mus_property ("elements",
-		    gh_append2 (music_list (), gh_cons (m->self_scm (), SCM_EOL)));
+  set_property ("elements",
+		    ly_append2 (music_list (), scm_cons (m->self_scm (), SCM_EOL)));
   scm_gc_unprotect_object (m->self_scm ());
 }
 
-Music_sequence::Music_sequence (SCM l)
-  : Music (l)
+Music_sequence::Music_sequence ( )
+  : Music ()
 {
 }
 
 void
-Music_sequence::transpose (Pitch rq)
+transpose_music_list (SCM l,  Pitch rq)
 {
-  for (SCM s = music_list (); gh_pair_p (s);  s = gh_cdr (s))
-    unsmob_music (gh_car (s))->transpose (rq);    
+  for (SCM s = l; ly_c_pair_p (s);  s = ly_cdr (s))
+    unsmob_music (ly_car (s))->transpose (rq);    
 }
 
-
-
-
 Moment
-Music_sequence::cumulative_length () const
+Music_sequence::cumulative_length (SCM l) 
 {
   Moment cumulative;
-  
-  Moment last_len ; 
-  for (SCM s = music_list (); gh_pair_p (s);  s = gh_cdr (s))
+  Moment last_len; 
+
+  for (SCM s = l; ly_c_pair_p (s);  s = ly_cdr (s))
     {
-      Moment l = unsmob_music (gh_car (s))->length_mom ();
-      if (last_len.grace_mom_ && l.main_part_)
+      Moment l = unsmob_music (ly_car (s))->get_length ();
+      if (last_len.grace_part_ && l.main_part_)
 	{
-	  last_len.grace_mom_ = Rational (0);
+	  last_len.grace_part_ = Rational (0);
 	}
       cumulative += last_len;
       last_len = l;
     }
 
-  last_len.grace_mom_ = Rational (0);
+  last_len.grace_part_ = Rational (0);
   cumulative += last_len;
-  
-  return  cumulative;
-}
 
-Pitch
-Music_sequence::to_relative_octave (Pitch p)
-{
-  return do_relative_octave (p, false);
+  return  cumulative;
 }
 
-
 Moment
-Music_sequence::maximum_length () const
+Music_sequence::maximum_length (SCM l)
 {
   Moment dur = 0;
-  for (SCM s = music_list (); gh_pair_p (s);  s = gh_cdr (s))
-    dur = dur >? unsmob_music (gh_car (s))->length_mom ();
+  for (SCM s = l; ly_c_pair_p (s);  s = ly_cdr (s))
+    {
+      Music * m = unsmob_music (ly_car (s));
+      Moment l = m->get_length ();
+      dur = dur >? l;
+    }
 
   return dur;
 }
-int
-Music_sequence::length_i () const
-{
-  return scm_ilength (music_list ());
-}
 
 Pitch
-Music_sequence::do_relative_octave (Pitch p, bool ret_first)
+music_list_to_relative (SCM l,Pitch p, bool ret_first)
 {
-  Pitch retval;
+  Pitch first = p;
   int count=0;
 
   Pitch last = p;
-  for (SCM s = music_list (); gh_pair_p (s);  s = gh_cdr (s))
+  for (SCM s = l; ly_c_pair_p (s);  s = ly_cdr (s))
     {
-      last = unsmob_music (gh_car (s))->to_relative_octave (last);
-      if (!count ++)
-	retval = last;
+      if (Music *m = unsmob_music (ly_car (s)))
+	{
+	  last = m->to_relative_octave (last);
+	  if (!count ++)
+	    first = last;
+	}
     }
 
-  if (!ret_first)
-    retval = last;
-  
-  return retval;
+  return  (ret_first)?  first : last;
 }
 
+
 void
-Music_sequence::compress (Moment m)
+compress_music_list (SCM l, Moment m)
 {
-  for (SCM s = music_list (); gh_pair_p (s);  s = gh_cdr (s))
-    unsmob_music (gh_car (s))->compress (m);
+  for (SCM s = l; ly_c_pair_p (s);  s = ly_cdr (s))
+    unsmob_music (ly_car (s))->compress (m);
 }
 
 ADD_MUSIC (Music_sequence);
 
-Music_sequence::Music_sequence ()
-  : Music (SCM_EOL)
-{
-  
-}
-
 Moment
-Music_sequence::minimum_start () const
+Music_sequence::minimum_start (SCM l)
 {
   Moment m;
   
-  for (SCM s = music_list (); gh_pair_p (s);  s = gh_cdr (s))
+  for (SCM s = l; ly_c_pair_p (s);  s = ly_cdr (s))
     {
-      m = m <? unsmob_music (gh_car (s))->start_mom ();
+      m = m <? unsmob_music (ly_car (s))->start_mom ();
     }
   return m;
 }
 
 Moment
-Music_sequence::first_start () const
+Music_sequence::first_start (SCM l) 
 {
   Moment m;
   
-  for (SCM s = music_list (); gh_pair_p (s);  s = gh_cdr (s))
+  for (SCM s = l; ly_c_pair_p (s);  s = ly_cdr (s))
     {
-      Music * mus = unsmob_music (gh_car (s));
-      Moment l = mus->length_mom ();
-
-      if (l.main_part_)
-	return mus->start_mom ();
-      else if (l.grace_mom_)
-	{
-	  m.grace_mom_ = - l.grace_mom_; 
-	  return m;
-	}
+      Music * mus = unsmob_music (ly_car (s));
+      Moment l = mus->get_length ();
+      Moment s = mus->start_mom ();
+      if (l.to_bool () || s.to_bool ())
+	return s;
     }
   return m;
 }