* The grand 2005-2006 replace.

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

diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc
index 9879da98e0bd3f6a9b896ffc3fe98fd04d7845ef..69b9343650fd44612e92768939c3019acc312468 100644 (file)
--- a/lily/music-sequence.cc
+++ b/lily/music-sequence.cc
@@ -3,11 +3,11 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "warn.hh"
-#include "scm-option.hh"
+#include "program-option.hh"
 #include "pitch.hh"
 #include "input.hh"
 #include "music-sequence.hh"
@@ -29,9 +29,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;
     }
@@ -121,9 +119,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;
 }