* Documentation/user/refman.itely: remove superfluous -'s

[lilypond.git] / lily / music-sequence.cc

diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc
index d8089ad74de78e8a66318407c5de93d810ff0293..90e99ef8cd782e8be391ea43a610e7b57a3c29a3 100644 (file)
--- a/lily/music-sequence.cc
+++ b/lily/music-sequence.cc
@@ -3,36 +3,13 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "music-list.hh"
-#include "debug.hh"
-#include "musical-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 "warn.hh"
+#include "pitch.hh"
+#include "input.hh"
 
 SCM
 Music_sequence::music_list ()const
@@ -47,79 +24,114 @@ void
 Music_sequence::append_music (Music *m)
 {
   set_mus_property ("elements",
-                   gh_append2( music_list(), gh_cons (m->self_scm (), SCM_EOL)));
-  scm_unprotect_object (m->self_scm ());
+                   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 ("elements", h);
 }
 
 void
-Music_sequence::transpose (Musical_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; 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; 
 
-Musical_pitch
-Music_sequence::to_relative_octave (Musical_pitch p)
-{
-  return do_relative_octave (p, false);
-}
+  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;
+}
 
 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_list_to_relative (SCM l,Pitch p, bool ret_first)
 {
-  Musical_pitch retval;
+  Pitch first = p;
   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 = l; gh_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 = 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) 
 {
-  for (SCM s = music_list (); gh_pair_p (s);  s = gh_cdr (s))
-    unsmob_music (gh_car (s))->compress (m);
+  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;
 }
+