X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-sequence.cc;h=dde9b653c9a3b6d84542b2de321f61e41b9c66ab;hb=03f6b90453f1e4f5d794454c3a3f7f1f63eed0c0;hp=fbb01ab50346353388822eda88c17df66b0d00b5;hpb=b7a0cffbf9d1069860368f289a5b50e9d1d90ba8;p=lilypond.git

diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc
index fbb01ab503..dde9b653c9 100644
--- a/lily/music-sequence.cc
+++ b/lily/music-sequence.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1998--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -21,6 +21,8 @@
 
 #include "warn.hh"
 #include "program-option.hh"
+#include "duration.hh"
+#include "moment.hh"
 #include "music.hh"
 #include "input.hh"
 
@@ -41,7 +43,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;
     }
@@ -60,12 +62,12 @@ Music_sequence::maximum_length (SCM l)
     {
       Music *m = unsmob_music (scm_car (s));
       if (!m)
-	programming_error ("Music sequence should have music elements");
+        programming_error ("Music sequence should have music elements");
       else
-	{
-	  Moment l = m->get_length ();
-	  dur = max (dur, l);
-	}
+        {
+          Moment l = m->get_length ();
+          dur = max (dur, l);
+        }
     }
 
   return dur;
@@ -79,6 +81,20 @@ Music_sequence::maximum_length_callback (SCM m)
   return maximum_length (me->get_property ("elements")).smobbed_copy ();
 }
 
+MAKE_SCHEME_CALLBACK (Music_sequence, event_chord_length_callback, 1);
+SCM
+Music_sequence::event_chord_length_callback (SCM m)
+{
+  Music *me = unsmob_music (m);
+  Duration *d = unsmob_duration (me->get_property ("duration"));
+  // Preset duration is used in chord repetitions.
+  if (d) {
+    Moment mom = d->get_length ();
+    return mom.smobbed_copy ();
+  }
+  return maximum_length (me->get_property ("elements")).smobbed_copy ();
+}
+
 MAKE_SCHEME_CALLBACK (Music_sequence, cumulative_length_callback, 1);
 SCM
 Music_sequence::cumulative_length_callback (SCM m)
@@ -113,11 +129,11 @@ music_list_to_relative (SCM l, Pitch p, bool ret_first)
   for (SCM s = l; scm_is_pair (s); s = scm_cdr (s))
     {
       if (Music *m = unsmob_music (scm_car (s)))
-	{
-	  last = m->to_relative_octave (last);
-	  if (!count++)
-	    first = last;
-	}
+        {
+          last = m->to_relative_octave (last);
+          if (!count++)
+            first = last;
+        }
     }
 
   return (ret_first) ? first : last;
@@ -143,17 +159,15 @@ Music_sequence::minimum_start (SCM l)
 Moment
 Music_sequence::first_start (SCM l)
 {
-  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;
+      Moment start = mus->start_mom ();
+      if (mus->get_length ().to_bool () || start.to_bool ())
+        return start;
     }
-  return m;
+  return Moment ();
 }
 
 MAKE_SCHEME_CALLBACK (Music_sequence, simultaneous_relative_callback, 2);
@@ -175,7 +189,7 @@ Music_sequence::simultaneous_relative_callback (SCM music, SCM pitch)
 
       Pitch retval_1_8 = music_list_to_relative (copied, p, true);
       if (retval_1_8 != retval)
-	lily_1_8_compatibility_used = true;
+        lily_1_8_compatibility_used = true;
 
       retval = retval_1_8;
     }
@@ -190,6 +204,5 @@ Music_sequence::event_chord_relative_callback (SCM music, SCM pitch)
   Music *me = unsmob_music (music);
   Pitch p = *unsmob_pitch (pitch);
   return music_list_to_relative (me->get_property ("elements"),
-				 p, true).smobbed_copy ();
+                                 p, true).smobbed_copy ();
 }
-