Imported Upstream version 2.16.0

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

diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc
index 8c9642c8608568b11030f5c9ade4284c0c615736..7ab62470b567bc5fad37a004329749d7fa7d00a2 100644 (file)
--- 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--2011 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,21 @@ 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 +130,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 +160,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 +190,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,61 +205,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 ();
-}
-
-MAKE_SCHEME_CALLBACK (Music_sequence, repeated_chord_relative_callback, 2);
-SCM
-Music_sequence::repeated_chord_relative_callback (SCM music, SCM pitch)
-{
-  Music *me = unsmob_music (music);
-  Music *repeated_chord = unsmob_music (me->get_property ("element"));
-  Music *original_chord = unsmob_music (me->get_property ("original-chord"));
-
-  /* A repeated chord octave is not computed from the previous pitch,
-   * (this function `pitch' argument), but from the original chord, so
-   * that repeated chords have the same octave have the original chord,
-   * even though other simple notes have been entered meanwhile.
-   */
-  assert (repeated_chord);
-  Pitch *p = 0;
-  /* Get the original chord first pitch */
-  if (original_chord)
-    {
-      for (SCM s = original_chord->get_property ("elements"); scm_is_pair (s); s = scm_cdr (s))
-       {
-         if (Music *m = unsmob_music (scm_car (s)))
-           {
-             p = unsmob_pitch (m->get_property ("pitch"));
-             if (p)
-               break;
-           }
-       }
-    }
-  /* Use the `pitch' argument if no pitch found in original chord. */
-  if (! p)
-    p = unsmob_pitch (pitch);
-
-  /* Change the first note pitch to -1, to avoid octaviation.  Indeed,
-   * the first pitch should be the same as the original chord first
-   * pitch. */
-  for (SCM s = repeated_chord->get_property ("elements"); scm_is_pair (s); s = scm_cdr (s))
-    {
-      if (Music *m = unsmob_music (scm_car (s)))
-       {
-         Pitch *first_pitch = unsmob_pitch (m->get_property ("pitch"));
-         if (first_pitch)
-           {
-             Pitch new_pitch = Pitch (-1,
-                                      first_pitch->get_notename (),
-                                      first_pitch->get_alteration ());
-             m->set_property ("pitch", new_pitch.smobbed_copy ());
-             break;
-           }
-       }
-    }
-  music_list_to_relative (repeated_chord->get_property ("elements"), *p, true).smobbed_copy ();
-  /* Return `pitch' instead of the repeated chord first pitch,
-   * because `pitch' is the last explicitly entered pitch */
-  return pitch;
+                                 p, true).smobbed_copy ();
 }