*** empty log message ***

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

diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc
index 9d5801d2f2299cc04fc51d13734e139202521331..1c8e0a235299b297237ac0dc58381e778eacaeef 100644 (file)
--- a/lily/music-sequence.cc
+++ b/lily/music-sequence.cc
@@ -3,84 +3,162 @@
   
   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"
+#include "warn.hh"
+#include "pitch.hh"
 
-Music_sequence::Music_sequence (Music_sequence const&s)
-  : Music (s)
+
+SCM
+Music_sequence::music_list ()const
 {
-  music_p_list_p_ = new Music_list (*s.music_p_list_p_);
+  return get_mus_property ("elements");
 }
 
-
-
-Music_sequence::Music_sequence(Music_list *mlist_p)
+/*
+  Ugh this sucks. Linear. do not use.
+ */
+void
+Music_sequence::append_music (Music *m)
 {
-  music_p_list_p_ = mlist_p;
+  set_mus_property ("elements",
+                   gh_append2 (music_list (), gh_cons (m->self_scm (), SCM_EOL)));
+  scm_gc_unprotect_object (m->self_scm ());
 }
 
-void
-Music_sequence::transpose (Musical_pitch rq)
+Music_sequence::Music_sequence ( )
+  : Music ()
 {
-  for (Cons<Music> *i = music_p_list_p_->head_; i;  i = i->next_)
-    i->car_->transpose (rq);    
 }
 
 void
-Music_sequence::do_print() const
+Music_sequence::transpose (Pitch rq)
 {
-#ifndef NPRINT
-  for (Cons<Music> *i = music_p_list_p_->head_; i;  i = i->next_)  
-    i->car_->print();
-#endif 
+  transpose_list (music_list (), rq);
 }
 
-
 void
-Music_sequence::add_music (Music *m_p)
+Music_sequence::transpose_list (SCM l,  Pitch rq)
 {
-  music_p_list_p_->add_music (m_p);
+  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 (Cons<Music> *i = music_p_list_p_->head_; i;  i = i->next_)
+  Moment cumulative;
+  Moment last_len; 
+
+  for (SCM s = l; gh_pair_p (s);  s = ly_cdr (s))
     {
-      last += i->car_->length_mom ();
+      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;
     }
-  return  last;
+
+  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 (Cons<Music> *i = music_p_list_p_->head_; i;  i = i->next_)
-    dur = dur >? i->car_->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
+
+
+Pitch
+Music_sequence::do_relative_octave (Pitch p, bool ret_first)
+{
+  Pitch retval;
+  int count=0;
+
+  Pitch last = p;
+  for (SCM s = music_list (); gh_pair_p (s);  s = ly_cdr (s))
+    {
+      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)
+    retval = last;
+  
+  return retval;
+}
+
+void
+Music_sequence::compress (Moment 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)
 {
-  return cons_list_size_i (music_p_list_p_->head_);
+  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;
 }
 
-Musical_pitch
-Music_sequence::do_relative_octave (Musical_pitch p, bool b)
+Moment
+Music_sequence::first_start (SCM l) 
 {
-  return music_p_list_p_->do_relative_octave (p, b);  
+  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;
 }
+