X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frelative-octave-music.cc;h=52efa5098c51d7d2665cdae964518c3e3364af8b;hb=9468b77cb2ae93b992bfb9105016f3393d206b47;hp=6e9c337755960b114b0d45561969bbe877687b84;hpb=b7a0cffbf9d1069860368f289a5b50e9d1d90ba8;p=lilypond.git

diff --git a/lily/relative-octave-music.cc b/lily/relative-octave-music.cc
index 6e9c337755..52efa5098c 100644
--- 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--2009 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;
 }