Release: bump Welcome versions.

[lilypond.git] / lily / relative-octave-music.cc

diff --git a/lily/relative-octave-music.cc b/lily/relative-octave-music.cc
index d2452280d07d0570bd1fdcc7eefa23e209b13ecb..52efa5098c51d7d2665cdae964518c3e3364af8b 100644 (file)
--- a/lily/relative-octave-music.cc
+++ b/lily/relative-octave-music.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2010 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
@@ -29,32 +29,18 @@ public:
 };
 
 MAKE_SCHEME_CALLBACK (Relative_octave_music, no_relative_callback, 2)
-  SCM
+SCM
 Relative_octave_music::no_relative_callback (SCM /* music */,
-                                            SCM pitch)
+                                             SCM pitch)
 {
   return pitch;
 }
 
 MAKE_SCHEME_CALLBACK (Relative_octave_music, relative_callback, 2)
-  SCM
-Relative_octave_music::relative_callback (SCM music, SCM pitch)
+SCM
+Relative_octave_music::relative_callback (SCM /* music */,
+                                          SCM pitch)
 {
-  Music *me = unsmob_music (music);
-  if (lily_1_8_relative)
-    {
-      lily_1_8_compatibility_used = true;
-      /*  last-pitch should be junked some time, when
-         we ditch 1.8 compat too.
-
-         When you do, B should start where A left off.
-
-         \relative { A \relative { ...} B }  */
-      SCM last_pitch = me->get_property ("last-pitch");
-      Pitch *ptr = unsmob_pitch (last_pitch);
-      return (ptr) ? last_pitch : pitch;
-    }
-  else
-    return pitch;
+  return pitch;
 }