X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-sequence.cc;h=e8493b8ada14ce36e54e593de9e2c30bff9e7fc5;hb=93d4e8aa80360c95696e065b9fd4744f269f4ea8;hp=70a2eaa862c9c246dac7bc183511fa45ec1a4f65;hpb=0e5d83a9ceb4a143f83d22406d7eb816314ff9f7;p=lilypond.git

diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc
index 70a2eaa862..e8493b8ada 100644
--- a/lily/music-sequence.cc
+++ b/lily/music-sequence.cc
@@ -1,9 +1,20 @@
 /*
-  music-sequence.cc -- implement Music_sequence
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1998--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1998--2009 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "music-sequence.hh"
@@ -30,7 +41,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,12 +60,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;
@@ -102,11 +113,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;
@@ -140,7 +151,7 @@ Music_sequence::first_start (SCM l)
       Moment l = mus->get_length ();
       Moment s = mus->start_mom ();
       if (l.to_bool () || s.to_bool ())
-	return s;
+        return s;
     }
   return m;
 }
@@ -164,7 +175,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;
     }
@@ -179,6 +190,61 @@ 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 ();
 }
 
+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;
+}