* lily/parser.yy (command_element): move clef stuff into Scheme.

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

diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc
index a8e9e76fa52a8f7088de2594b16974fad58093c1..0b38de2006e642705c4eab4dc4e47a37f819df05 100644 (file)
--- a/lily/music-sequence.cc
+++ b/lily/music-sequence.cc
@@ -3,37 +3,14 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 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 "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);
-}
-
 SCM
 Music_sequence::music_list ()const
 {
@@ -51,30 +28,33 @@ Music_sequence::append_music (Music *m)
   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)
 {
-  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::transpose_list (SCM l,  Pitch 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 cumulative;
-  
-  Moment last_len ; 
-  for (SCM s = music_list (); gh_pair_p (s);  s = gh_cdr (s))
+  Moment last_len; 
+
+  for (SCM s = l; gh_pair_p (s);  s = ly_cdr (s))
     {
-      Moment l = unsmob_music (gh_car (s))->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);
@@ -86,8 +66,6 @@ Music_sequence::cumulative_length () const
   last_len.grace_part_ = Rational (0);
   cumulative += last_len;
 
-  cumulative += - first_start ();
-  
   return  cumulative;
 }
 
@@ -99,25 +77,19 @@ Music_sequence::to_relative_octave (Pitch p)
 
 
 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))
+  for (SCM s = l; gh_pair_p (s);  s = ly_cdr (s))
     {
-      Music * m = unsmob_music (gh_car (s));
-      Moment l = m->length_mom () + m->start_mom ();
+      Music * m = unsmob_music (ly_car (s));
+      Moment l = m->get_length ();
       dur = dur >? l;
     }
 
-  dur -= minimum_start ();
-  
   return dur;
 }
-int
-Music_sequence::length_i () const
-{
-  return scm_ilength (music_list ());
-}
+
 
 Pitch
 Music_sequence::do_relative_octave (Pitch p, bool ret_first)
@@ -126,11 +98,19 @@ Music_sequence::do_relative_octave (Pitch p, bool ret_first)
   int count=0;
 
   Pitch last = p;
-  for (SCM s = music_list (); gh_pair_p (s);  s = gh_cdr (s))
+  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)
@@ -142,47 +122,42 @@ Music_sequence::do_relative_octave (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);
 }
 
-ADD_MUSIC (Music_sequence);
-
-Music_sequence::Music_sequence ()
-  : Music (SCM_EOL)
+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 () 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; gh_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; gh_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_part_)
-       {
-         m.grace_part_ = - l.grace_part_; 
-         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;
 }