X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-sequence.cc;h=38c384ab05c8b55e7862303f231e80ba995cf363;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=4e922eb88dfd044d5f32f342cd8207bb3b898b1e;hpb=c95a76f15bb0ab0960ed7783762611254cabbd91;p=lilypond.git

diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc
index 4e922eb88d..38c384ab05 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--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1998--2015 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"
 
@@ -28,7 +30,7 @@ void
 transpose_music_list (SCM lst, Pitch rq)
 {
   for (SCM s = lst; scm_is_pair (s); s = scm_cdr (s))
-    unsmob_music (scm_car (s))->transpose (rq);
+    Music::unsmob (scm_car (s))->transpose (rq);
 }
 
 Moment
@@ -39,7 +41,7 @@ Music_sequence::cumulative_length (SCM l)
 
   for (SCM s = l; scm_is_pair (s); s = scm_cdr (s))
     {
-      Moment l = unsmob_music (scm_car (s))->get_length ();
+      Moment l = Music::unsmob (scm_car (s))->get_length ();
       if (last_len.grace_part_ && l.main_part_)
         last_len.grace_part_ = Rational (0);
       cumulative += last_len;
@@ -58,7 +60,7 @@ Music_sequence::maximum_length (SCM l)
   Moment dur = 0;
   for (SCM s = l; scm_is_pair (s); s = scm_cdr (s))
     {
-      Music *m = unsmob_music (scm_car (s));
+      Music *m = Music::unsmob (scm_car (s));
       if (!m)
         programming_error ("Music sequence should have music elements");
       else
@@ -75,7 +77,22 @@ MAKE_SCHEME_CALLBACK (Music_sequence, maximum_length_callback, 1);
 SCM
 Music_sequence::maximum_length_callback (SCM m)
 {
-  Music *me = unsmob_music (m);
+  Music *me = Music::unsmob (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 = Music::unsmob (m);
+  Duration *d = Duration::unsmob (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 ();
 }
 
@@ -83,7 +100,7 @@ MAKE_SCHEME_CALLBACK (Music_sequence, cumulative_length_callback, 1);
 SCM
 Music_sequence::cumulative_length_callback (SCM m)
 {
-  Music *me = unsmob_music (m);
+  Music *me = Music::unsmob (m);
   return cumulative_length (me->get_property ("elements")).smobbed_copy ();
 }
 
@@ -91,7 +108,7 @@ MAKE_SCHEME_CALLBACK (Music_sequence, minimum_start_callback, 1);
 SCM
 Music_sequence::minimum_start_callback (SCM m)
 {
-  Music *me = unsmob_music (m);
+  Music *me = Music::unsmob (m);
   return minimum_start (me->get_property ("elements")).smobbed_copy ();
 }
 
@@ -99,7 +116,7 @@ MAKE_SCHEME_CALLBACK (Music_sequence, first_start_callback, 1);
 SCM
 Music_sequence::first_start_callback (SCM m)
 {
-  Music *me = unsmob_music (m);
+  Music *me = Music::unsmob (m);
   return first_start (me->get_property ("elements")).smobbed_copy ();
 }
 
@@ -112,7 +129,7 @@ music_list_to_relative (SCM l, Pitch p, bool ret_first)
   Pitch last = p;
   for (SCM s = l; scm_is_pair (s); s = scm_cdr (s))
     {
-      if (Music *m = unsmob_music (scm_car (s)))
+      if (Music *m = Music::unsmob (scm_car (s)))
         {
           last = m->to_relative_octave (last);
           if (!count++)
@@ -127,7 +144,7 @@ void
 compress_music_list (SCM l, Moment m)
 {
   for (SCM s = l; scm_is_pair (s); s = scm_cdr (s))
-    unsmob_music (scm_car (s))->compress (m);
+    Music::unsmob (scm_car (s))->compress (m);
 }
 
 Moment
@@ -136,7 +153,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, Music::unsmob (scm_car (s))->start_mom ());
   return m;
 }
 
@@ -146,7 +163,7 @@ Music_sequence::first_start (SCM l)
 
   for (SCM s = l; scm_is_pair (s); s = scm_cdr (s))
     {
-      Music *mus = unsmob_music (scm_car (s));
+      Music *mus = Music::unsmob (scm_car (s));
       Moment start = mus->start_mom ();
       if (mus->get_length ().to_bool () || start.to_bool ())
         return start;
@@ -158,91 +175,18 @@ MAKE_SCHEME_CALLBACK (Music_sequence, simultaneous_relative_callback, 2);
 SCM
 Music_sequence::simultaneous_relative_callback (SCM music, SCM pitch)
 {
-  Music *me = unsmob_music (music);
-  Pitch p = *unsmob_pitch (pitch);
-
-  SCM elts = me->get_property ("elements");
-  SCM copied = SCM_EOL;
-  if (lily_1_8_relative)
-    copied = ly_music_deep_copy (elts);
-
-  Pitch retval = music_list_to_relative (elts, p, false);
-
-  if (lily_1_8_relative)
-    {
-
-      Pitch retval_1_8 = music_list_to_relative (copied, p, true);
-      if (retval_1_8 != retval)
-        lily_1_8_compatibility_used = true;
-
-      retval = retval_1_8;
-    }
-
-  return retval.smobbed_copy ();
+  Music *me = Music::unsmob (music);
+  Pitch p = *Pitch::unsmob (pitch);
+  return music_list_to_relative (me->get_property ("elements"),
+                                 p, false).smobbed_copy ();
 }
 
 MAKE_SCHEME_CALLBACK (Music_sequence, event_chord_relative_callback, 2);
 SCM
 Music_sequence::event_chord_relative_callback (SCM music, SCM pitch)
 {
-  Music *me = unsmob_music (music);
-  Pitch p = *unsmob_pitch (pitch);
+  Music *me = Music::unsmob (music);
+  Pitch p = *Pitch::unsmob (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;
-}