X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-sequence.cc;h=0b38de2006e642705c4eab4dc4e47a37f819df05;hb=051d7e7cbdbbe5f5337ab2b477b0bd1e72eedd04;hp=32c386c323df7e3fcdcb41091ac8a6093f44564c;hpb=9c8bcb9a2a1fedb5459e593b18a8c550318e6800;p=lilypond.git

diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc
index 32c386c323..0b38de2006 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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "music-list.hh"
-#include "debug.hh"
-#include "musical-pitch.hh"
+#include "warn.hh"
+#include "pitch.hh"
 
 
-void
-Music_sequence::truncate (int k)
-{
-  SCM l = get_mus_property ("list");
-  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 ("list", l);
-}
-
 SCM
 Music_sequence::music_list ()const
 {
-  return get_mus_property ("list");
+  return get_mus_property ("elements");
 }
 
 /*
@@ -46,75 +23,94 @@ Music_sequence::music_list ()const
 void
 Music_sequence::append_music (Music *m)
 {
-  set_mus_property ("list",
-		    gh_append2( music_list(), gh_cons (m->self_scm (), SCM_EOL)));
+  set_mus_property ("elements",
+		    gh_append2 (music_list (), gh_cons (m->self_scm (), SCM_EOL)));
+  scm_gc_unprotect_object (m->self_scm ());
 }
-Music_sequence::Music_sequence(SCM h)
+
+Music_sequence::Music_sequence ( )
+  : Music ()
 {
-  set_mus_property ("list", h);
 }
 
 void
-Music_sequence::transpose (Musical_pitch rq)
+Music_sequence::transpose (Pitch rq)
 {
-  for (SCM s = music_list (); gh_pair_p (s);  s = gh_cdr (s))
-    unsmob_music (gh_car (s))->transpose (rq);    
+  transpose_list (music_list (), rq);
 }
 
 void
-Music_sequence::do_print() const
+Music_sequence::transpose_list (SCM l,  Pitch rq)
 {
-#ifndef NPRINT
-  for (SCM s = music_list (); gh_pair_p (s);  s = gh_cdr (s))
-    unsmob_music (gh_car (s))->print();
-#endif 
+  for (SCM s = l; gh_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 last=0;
-  for (SCM s = music_list (); gh_pair_p (s);  s = gh_cdr (s))
-    last += unsmob_music (gh_car (s))->length_mom ();
-  return  last;
+  Moment cumulative;
+  Moment last_len; 
+
+  for (SCM s = l; gh_pair_p (s);  s = ly_cdr (s))
+    {
+      Moment l = unsmob_music (ly_car (s))->get_length ();
+      if (last_len.grace_part_ && l.main_part_)
+	{
+	  last_len.grace_part_ = Rational (0);
+	}
+      cumulative += last_len;
+      last_len = l;
+    }
+
+  last_len.grace_part_ = Rational (0);
+  cumulative += last_len;
+
+  return  cumulative;
 }
 
-Musical_pitch
-Music_sequence::to_relative_octave (Musical_pitch p)
+Pitch
+Music_sequence::to_relative_octave (Pitch p)
 {
   return do_relative_octave (p, false);
 }
 
 
 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; gh_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 ());
-}
 
-Musical_pitch
-Music_sequence::do_relative_octave (Musical_pitch p, bool ret_first)
+
+Pitch
+Music_sequence::do_relative_octave (Pitch p, bool ret_first)
 {
-  Musical_pitch retval;
+  Pitch retval;
   int count=0;
 
-  Musical_pitch last = p;
-  for (SCM s = music_list (); gh_pair_p (s);  s = gh_cdr (s))
+  Pitch last = p;
+  for (SCM s = music_list (); gh_pair_p (s);  s = ly_cdr (s))
     {
-      last = unsmob_music (gh_car (s))->to_relative_octave (last);
-      if (!count ++ )
-	retval = last;
+      Music *m = unsmob_music (ly_car (s));
+      if (!m)
+	{
+	  programming_error ("Music_sequence should only contain music!");
+	}
+      else
+	{
+	  last = m->to_relative_octave (last);
+	  if (!count ++)
+	    retval = last;
+	}
     }
 
   if (!ret_first)
@@ -126,6 +122,43 @@ Music_sequence::do_relative_octave (Musical_pitch p, bool ret_first)
 void
 Music_sequence::compress (Moment m)
 {
-  for (SCM s = music_list (); gh_pair_p (s);  s = gh_cdr (s))
-    unsmob_music (gh_car (s))->compress (m);
+  compress_list (music_list (), m);
 }
+
+void
+Music_sequence::compress_list (SCM l, Moment m)
+{
+  for (SCM s = l; gh_pair_p (s);  s = ly_cdr (s))
+    unsmob_music (ly_car (s))->compress (m);
+}
+
+ADD_MUSIC (Music_sequence);
+
+Moment
+Music_sequence::minimum_start (SCM l)
+{
+  Moment m;
+  
+  for (SCM s = l; gh_pair_p (s);  s = ly_cdr (s))
+    {
+      m = m <? unsmob_music (ly_car (s))->start_mom ();
+    }
+  return m;
+}
+
+Moment
+Music_sequence::first_start (SCM l) 
+{
+  Moment m;
+  
+  for (SCM s = l; gh_pair_p (s);  s = ly_cdr (s))
+    {
+      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;
+}
+