X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-sequence.cc;h=acaf88d389b2253769439c4efab2056001d5be1a;hb=3548eacf9da6dddfdd5a9ca2dc15d055a0a9a5e2;hp=60e6459a20f7e850ce1a4a4ca5186c239ff91694;hpb=339ea28cd7e4f8a1c1ca7c1d4dfe803a3f4c03e6;p=lilypond.git

diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc
index 60e6459a20..acaf88d389 100644
--- a/lily/music-sequence.cc
+++ b/lily/music-sequence.cc
@@ -3,78 +3,135 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--1999 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 "musical-pitch.hh"
+#include "warn.hh"
+#include "pitch.hh"
+#include "input.hh"
 
-Music_sequence::Music_sequence (Music_sequence const&s)
-  : Music (s)
+Music_sequence::Music_sequence ()
+  : Music ()
 {
-  music_p_list_p_ = new Music_list (*s.music_p_list_p_);
 }
 
-
-
-Music_sequence::Music_sequence(Music_list *mlist_p)
+SCM
+Music_sequence::music_list () const
 {
-  music_p_list_p_ = mlist_p;
+  return get_property ("elements");
 }
 
+/*
+  Ugh this sucks. Linear. do not use.
+ */
 void
-Music_sequence::transpose (Musical_pitch rq)
+Music_sequence::append_music (Music *m)
 {
-  for (Cons<Music> *i = music_p_list_p_->head_; i;  i = i->next_)
-    i->car_->transpose (rq);    
+  set_property ("elements",
+		ly_append2 (music_list (), scm_cons (m->self_scm (), SCM_EOL)));
+  scm_gc_unprotect_object (m->self_scm ());
 }
 
 void
-Music_sequence::do_print() const
+transpose_music_list (SCM lst, Pitch rq)
 {
-#ifndef NPRINT
-  for (Cons<Music> *i = music_p_list_p_->head_; i;  i = i->next_)  
-    i->car_->print();
-#endif 
+  for (SCM s = lst; scm_is_pair (s);  s = scm_cdr (s))
+    unsmob_music (scm_car (s))->transpose (rq);    
 }
 
-
-void
-Music_sequence::add_music (Music *m_p)
+Moment
+Music_sequence::cumulative_length (SCM l) 
 {
-  music_p_list_p_->add_music (m_p);
+  Moment cumulative;
+  Moment last_len; 
+
+  for (SCM s = l; scm_is_pair (s);  s = scm_cdr (s))
+    {
+      Moment l = unsmob_music (scm_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::cumulative_length () const
+Music_sequence::maximum_length (SCM l)
+{
+  Moment dur = 0;
+  for (SCM s = l; scm_is_pair (s);  s = scm_cdr (s))
+    {
+      Music * m = unsmob_music (scm_car (s));
+      Moment l = m->get_length ();
+      dur = dur >? l;
+    }
+
+  return dur;
+}
+
+Pitch
+music_list_to_relative (SCM l,Pitch p, bool ret_first)
 {
-  Moment last=0;
-  for (Cons<Music> *i = music_p_list_p_->head_; i;  i = i->next_)
+  Pitch first = p;
+  int count=0;
+
+  Pitch last = p;
+  for (SCM s = l; scm_is_pair (s);  s = scm_cdr (s))
     {
-      last += i->car_->length_mom ();
+      if (Music *m = unsmob_music (scm_car (s)))
+	{
+	  last = m->to_relative_octave (last);
+	  if (!count ++)
+	    first = last;
+	}
     }
-  return  last;
+
+  return  (ret_first)?  first : last;
 }
 
-Musical_pitch
-Music_sequence::to_relative_octave (Musical_pitch p)
+
+void
+compress_music_list (SCM l, Moment m)
 {
-  return do_relative_octave (p, false);
+  for (SCM s = l; scm_is_pair (s);  s = scm_cdr (s))
+    unsmob_music (scm_car (s))->compress (m);
 }
 
+ADD_MUSIC (Music_sequence);
 
 Moment
-Music_sequence::maximum_length () const
+Music_sequence::minimum_start (SCM l)
 {
-  Moment dur = 0;
-  for (Cons<Music> *i = music_p_list_p_->head_; i;  i = i->next_)
-    dur = dur >? i->car_->length_mom ();
-
-  return dur;
+  Moment m;
+  
+  for (SCM s = l; scm_is_pair (s);  s = scm_cdr (s))
+    {
+      m = m <? unsmob_music (scm_car (s))->start_mom ();
+    }
+  return m;
 }
-int
-Music_sequence::length_i () const
+
+Moment
+Music_sequence::first_start (SCM l) 
 {
-  return cons_list_size_i (music_p_list_p_->head_);
+  Moment m;
+  
+  for (SCM s = l; scm_is_pair (s);  s = scm_cdr (s))
+    {
+      Music * mus = unsmob_music (scm_car (s));
+      Moment l = mus->get_length ();
+      Moment s = mus->start_mom ();
+      if (l.to_bool () || s.to_bool ())
+	return s;
+    }
+  return m;
 }
+