X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-sequence.cc;h=7a0d5863a09321e51bd0d019fc046339a50d21be;hb=7fb65fc23874860275fe337474edeb44166d45de;hp=9879da98e0bd3f6a9b896ffc3fe98fd04d7845ef;hpb=d3c50bb3e14b4ded57e6747ed5d122fabedebecb;p=lilypond.git

diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc
index 9879da98e0..7a0d5863a0 100644
--- a/lily/music-sequence.cc
+++ b/lily/music-sequence.cc
@@ -3,14 +3,15 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
+#include "music-sequence.hh"
+
 #include "warn.hh"
-#include "scm-option.hh"
-#include "pitch.hh"
+#include "program-option.hh"
+#include "music.hh"
 #include "input.hh"
-#include "music-sequence.hh"
 
 void
 transpose_music_list (SCM lst, Pitch rq)
@@ -29,9 +30,7 @@ Music_sequence::cumulative_length (SCM l)
     {
       Moment l = unsmob_music (scm_car (s))->get_length ();
       if (last_len.grace_part_ && l.main_part_)
-	{
-	  last_len.grace_part_ = Rational (0);
-	}
+	last_len.grace_part_ = Rational (0);
       cumulative += last_len;
       last_len = l;
     }
@@ -49,8 +48,13 @@ Music_sequence::maximum_length (SCM l)
   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 = max (dur, l);
+      if (!m)
+	programming_error ("Music sequence should have music elements");
+      else
+	{
+	  Moment l = m->get_length ();
+	  dur = max (dur, l);
+	}
     }
 
   return dur;
@@ -121,9 +125,7 @@ Music_sequence::minimum_start (SCM l)
   Moment m;
 
   for (SCM s = l; scm_is_pair (s); s = scm_cdr (s))
-    {
-      m = min (m, unsmob_music (scm_car (s))->start_mom ());
-    }
+    m = min (m, unsmob_music (scm_car (s))->start_mom ());
   return m;
 }