Merge remote-tracking branch 'origin/translation'

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

diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc
index dde9b653c9a3b6d84542b2de321f61e41b9c66ab..fea62f89d65f9499265c394526c59aaa0a4d9b7c 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--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1998--2014 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
@@ -88,10 +88,11 @@ 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 ();
-  }
+  if (d)
+    {
+      Moment mom = d->get_length ();
+      return mom.smobbed_copy ();
+    }
   return maximum_length (me->get_property ("elements")).smobbed_copy ();
 }
 
@@ -176,25 +177,8 @@ 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 ();
+  return music_list_to_relative (me->get_property ("elements"),
+                                 p, false).smobbed_copy ();
 }
 
 MAKE_SCHEME_CALLBACK (Music_sequence, event_chord_relative_callback, 2);