resolve merge

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

diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc
index 70a2eaa862c9c246dac7bc183511fa45ec1a4f65..8c9642c8608568b11030f5c9ade4284c0c615736 100644 (file)
--- 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"
@@ -182,3 +193,58 @@ Music_sequence::event_chord_relative_callback (SCM music, SCM pitch)
                                 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;
+}